diff --git a/ChangeLog.4 b/ChangeLog.4 index e2c6c9f9f26..6dd76dae86d 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -769,7 +769,7 @@ * src/treesit.c (Ftreesit_parser_included_ranges) (Ftreesit_query_capture, treesit_traverse_sibling_helper) - (treesit_traverse_match_predicate): Fix punctiation and documentation + (treesit_traverse_match_predicate): Fix punctuation and documentation style in comments and docstrings. 2024-07-21 Manuel Giraud @@ -1790,7 +1790,7 @@ 2024-07-01 Alan Mackenzie - Remove a reference to a non-existant variable from a doc-string + Remove a reference to a non-existent variable from a docstring * lisp/progmodes/cc-langs.el (c-opt-extra-label-key): Remove reference to c-nonlabel-decl-prefix-re from the doc string. @@ -1952,7 +1952,7 @@ tree, but the tree is already deleted. Commenting out the ts_tree_delete line in treesit_ensure_parsed can "fix" the crash. - What happended, I think, is this: + What happened, I think, is this: 1. Buffer modified, parser->need_reparse set to true, parser->timestamp incremented. @@ -2091,13 +2091,13 @@ 2024-06-28 Po Lu - Correct ommissions in rmc.el + Correct omissions in rmc.el * lisp/emacs-lisp/rmc.el (touch-screen-scroll) (touch-screen-pinch): Declare functions. (read-multiple-choice--short-answers): Call the same functions directly and prevent the on-screen keyboard from being - deactivated immedately before it is reopened. + deactivated immediately before it is reopened. 2024-06-28 Juri Linkov @@ -2639,7 +2639,7 @@ If the value of a property is text representing a CSS color, it will be fontified such that its background is the color itself. 'php-ts-mode-css-fontify-colors' can be used to - disable this behaviour. + disable this behavior. * lisp/progmodes/php-ts-mode.el (php-ts-mode-css-fontify-colors): New custom var. * lisp/progmodes/php-ts-mode.el (php-ts-mode--colorize-css-value): @@ -3464,7 +3464,7 @@ * Prepare v0.11.0 - * Update CHANGLOG for v0.11.0 + * Update CHANGELOG for v0.11.0 * 2024 @@ -3701,7 +3701,7 @@ chore: Place emacs dependency to the front (#285) - * chore: Place emacs dependency infront + * chore: Place emacs dependency in front * Update copyright year @@ -4116,8 +4116,6 @@ * Update - * Updat - commit c0789e2d537fb609af72a1edf51e1c5e4673ab2e Author: 10sr <8.slashes@gmail.com> Date: Fri May 22 23:13:55 2020 +0900 @@ -4715,7 +4713,7 @@ Author: 10sr <8.slashes@gmail.com> Date: Thu Jul 26 12:30:09 2018 +0900 - Remove numeric-range related vairables + Remove numeric-range related variables commit c687ecda080521c00ceaa8aec05a7dd8fb2be48a Author: 10sr <8.slashes@gmail.com> @@ -6782,7 +6780,7 @@ 2024-06-11 Visuwesh - Fix customisation buffer for dired group + Fix customization buffer for dired group * lisp/dired-aux.el (dired-create-destination-dirs-on-trailing-dirsep): Actually @@ -8095,7 +8093,7 @@ Provide additional Android metadata * java/AndroidManifest.xml.in: Enable preserving user data - beyond uninstallation, restarting activities without persiting + beyond uninstallation, restarting activities without persisting state, increase maximum number of simultaneously open activities, and provide a sensible category. @@ -8212,7 +8210,7 @@ Revert "Add support for Rust compilation messages" This reverts commit 2e862f81a355435fb7e837ffebee2f657c26ff23. - It had serveral problems; see bug#70794. + It had several problems; see bug#70794. 2024-06-03 Robert Pluim @@ -8337,9 +8335,9 @@ treesit-primary-parser. I also added code that makes Emacs guess the primary parser if that variable isn't set. - Documentation fot treesit-primary-parser will come later. + Documentation for treesit-primary-parser will come later. - For futher reference, the message id for the message that prompted + For further reference, the message id for the message that prompted this change is * lisp/treesit.el (treesit-primary-parser): New variable. @@ -8442,7 +8440,7 @@ * src/w32term.h (w32_bitmap_record): Add stipple value. * src/image.c (image_create_bitmap_from_data): Create stipple bitmap. - (image_create_bitmap_from_file): Add suuport for pixmap and + (image_create_bitmap_from_file): Add support for pixmap and create stipple bitmap. (free_bitmap_record): Release stipple. @@ -8824,7 +8822,7 @@ * etc/tutorials/TUTORIAL.cs: Update TUTORIAL.cs according to its English counterpart. - * etc/tutorials/TUTORIAL.translators: Update maintaner of + * etc/tutorials/TUTORIAL.translators: Update maintainer of TUTORIAL.cs. 2024-05-30 Jim Porter @@ -9870,7 +9868,7 @@ 2024-05-24 Andrea Corallo - * src/comp.c (check_comp_unit_relocs): Remove unneccesary double access. + * src/comp.c (check_comp_unit_relocs): Remove unnecessary double access. 2024-05-23 Eshel Yaron @@ -10900,7 +10898,7 @@ vc-git-root-log-format: Explicitly match periods - * lisp/vc/vc-git.el (vc-git-root-log-format): Explicity match + * lisp/vc/vc-git.el (vc-git-root-log-format): Explicitly match periods, rather than matching them only because '.' matches any chars. @@ -11781,7 +11779,7 @@ Fix #if defined directive fontification in c-ts-mode * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Fontify - each part separately so the identifier isn't overriden. + each part separately so the identifier isn't overridden. 2024-05-09 john muhl @@ -12266,7 +12264,7 @@ * lisp/international/mule.el (load-with-code-conversion): * lisp/startup.el (command-line--load-script): * etc/NEWS: - Revert all changes, except for the generalised + Revert all changes, except for the generalized `lisp_file_lexical_cookie` which may prove useful in the future. 2024-05-05 Alan Mackenzie @@ -12483,7 +12481,7 @@ (android_init_emacs_gc_class, android_init_emacs_cursor): Adjust to match signature changes in constructors. (android_init_emacs_handle): New function. - (initEmacs): Initialize the handle class, its fields and metods. + (initEmacs): Initialize the handle class, its fields and methods. (sendConfigureNotify, sendKeyPress, sendKeyRelease, sendFocusIn) (sendFocusOut, sendWindowAction, sendEnterNotify) (sendLeaveNotify, sendMotionNotify, sendButtonPress) @@ -13553,7 +13551,7 @@ 2024-04-27 Po Lu - Fix ommissions in window scrolling commands that ought to clear vscroll + Fix omissions in window scrolling commands that ought to clear vscroll * src/window.c (Fdelete_other_windows_internal) (window_scroll_for_long_lines, Frecenter, Fmove_to_window_line): @@ -14165,7 +14163,7 @@ * lisp/progmodes/rust-ts-mode.el (rust-ts-mode--font-lock-settings): Add font-locking for Rust - macro metavariables, fragment specifiers and repitition patterns. + macro metavariables, fragment specifiers and repetition patterns. 2024-04-22 Yuan Fu @@ -14600,7 +14598,7 @@ (erc-fill--wrap-massage-legacy-indicator-type): New function to warn of obsolete `erc-fill-wrap-merge-indicator' value and perform a migration for the current session. - (erc-fill-wrap, erc-fill-wrap-enable): Preform preflight compat check + (erc-fill-wrap, erc-fill-wrap-enable): Perform preflight compat check for obsolete `erc-fill-wrap-merge-indicator' value types. (erc-fill-wrap-disable): Don't bother killing nonexistent variable `erc-fill--wrap-merge-indicator-post'. @@ -15770,7 +15768,7 @@ 2024-04-08 Stefan Monnier - (cl--describe-class): Improve based on dicussion in bug#70077 + (cl--describe-class): Improve based on discussion in bug#70077 * lisp/emacs-lisp/cl-extra.el (cl--describe-class): Move docstring after the class' slots. @@ -16327,7 +16325,7 @@ json-insert doc fixes - * src/json.c (Fjson_insert): Precise the behaviour when the current + * src/json.c (Fjson_insert): Precise the behavior when the current buffer is multibyte and unibyte, respectively. * doc/lispref/text.texi (Parsing JSON): Refer to the right function. @@ -19121,7 +19119,7 @@ 2024-03-08 Stefan Monnier - EIEIO: Fix regession (bug#69631) + EIEIO: Fix regression (bug#69631) Not sure why earlier tests did not catch it, but there are more places where we bump into problems because `eieio--class-precedence-list` @@ -19485,7 +19483,7 @@ * doc/lispref/Makefile.in (auxfiles) ($(buildinfodir)/type_hierarchy.txt) ($(buildinfodir)/type_hierarchy.jpg): New targets. - ($(buildinfodir)/elisp.info): Add dependecy. + ($(buildinfodir)/elisp.info): Add dependency. 2024-03-05 Michael Albinus @@ -19605,7 +19603,7 @@ This reverts commit 4a0d430bdc3650ca3dfd8bdd14781764fbcbdc7e. - AFAICT that commit was made to accomodate regressions introduced + AFAICT that commit was made to accommodate regressions introduced in the new `cl-preloaded.el` code and these have been fixed. 2024-03-04 Michael Albinus @@ -19637,7 +19635,7 @@ Repair miscompilation of single-arg `apply` (bug#69533) * lisp/emacs-lisp/byte-opt.el (byte-optimize-apply): - Don't optimise single-argument `apply`; it's a legacy construct. + Don't optimize single-argument `apply`; it's a legacy construct. * test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--test-cases): Add test case. @@ -21259,7 +21257,7 @@ However, nstrftime now requires localename-unsafe-limited which pulls in some Gnulib-specific locale code, and it’s likely this needs to be replaced with Emacs-specific locale code. In the - meantime let’s continue to finess this by avoiding + meantime let’s continue to finesse this by avoiding localename-unsafe-limited. * admin/merge-gnulib (AVOIDED_MODULES): Avoid localename-unsafe-limited instead of localename. @@ -21456,7 +21454,7 @@ Properly record mtime after insert-file-contents on Android * src/fileio.c (write_region): Do not verify file identity after - retreiving file status for the second time if st_ino is 0. + retrieving file status for the second time if st_ino is 0. 2024-02-16 Po Lu @@ -21822,7 +21820,7 @@ (cl--generic-describe): Refactor to ease reuse * lisp/emacs-lisp/cl-generic.el (cl--map-methods-documentation): - New function, extrated from `cl--generic-describe`. + New function, extracted from `cl--generic-describe`. (cl--generic-describe): Use it. 2024-02-12 Juri Linkov @@ -22340,7 +22338,7 @@ 2024-02-09 Jeremy Bryant - * lisp/which-key.el: Add two spaces in docstrings and punctation + * lisp/which-key.el: Add two spaces in docstrings and punctuation (which-key-echo-keystrokes): (which-key-popup-type): @@ -23161,7 +23159,7 @@ `.elc` files. So this patch lifts the first restriction, using `print-number-table`. - The rest of the patch then simplifies and regularises the + The rest of the patch then simplifies and regularizes the bytecompiler's generation of dynamic docstrings, which can now also easily be done for "inner" defvars and other places. @@ -23338,7 +23336,7 @@ Bytecode engine fast-path streamlining of plain symbols * src/bytecode.c (exec_byte_code): - Only use fast-path optimisations for calls and dynamic variable + Only use fast-path optimizations for calls and dynamic variable reference and setting where the symbol is plain, which is much faster. 2024-01-31 Mattias Engdegård @@ -24130,7 +24128,7 @@ * etc/EGLOT-NEWS: Update. * lisp/progmodes/eglot.el (Version): Bump to 1.17 - (Package-Requires): Bump jsonrpc depedency to 1.24 + (Package-Requires): Bump jsonrpc dependency to 1.24 2024-01-25 João Távora @@ -25004,7 +25002,7 @@ * Update a comp test (bug#68523) * test/src/comp-tests.el (comp-tests-ret-type-spec-71): Update a test - due to new 'sxhash-equal' behaviour. + due to new 'sxhash-equal' behavior. 2024-01-17 Po Lu @@ -25027,7 +25025,7 @@ More efficient hash table thawing * src/fns.c (hash_table_thaw): Don't allocate anything for empty - tables. Don't initialise the next vector twice. + tables. Don't initialize the next vector twice. (maybe_resize_hash_table): Factor out min_size constant. 2024-01-16 Juri Linkov @@ -25072,7 +25070,7 @@ Jsonrpc: fix bug in jsonrpc--remove - * lisp/jsonrpc.el (jsonrpc--remove): Check timer before cancelling it. + * lisp/jsonrpc.el (jsonrpc--remove): Check timer before canceling it. (Version): Bump to 1.2.24 See https://github.com/joaotavora/eglot/issues/1342 @@ -25210,7 +25208,7 @@ * src/lisp.h (hash_unused): Remove. All uses adapted to calling hash_unused_entry_key_p on the key instead. The hash values for unused hash table entries are now undefined; all - initialisation and assignment to hash_unused has been removed. + initialization and assignment to hash_unused has been removed. 2024-01-13 Mattias Engdegård @@ -25289,7 +25287,7 @@ 2024-01-13 Mattias Engdegård - Inlined and specialised hash table look-up + Inlined and specialized hash table look-up This improves performance in several ways. Separate functions are used depending on whether the caller has a hash value computed or not. @@ -25353,7 +25351,7 @@ (allocate_hash_table): Allocate without automatically GCed slots. (alloc_larger_vector): Remove. (make_hash_table, copy_hash_table, maybe_resize_hash_table): - Adapt vector allocation and initialisation. + Adapt vector allocation and initialization. * src/pdumper.c (hash_table_freeze, hash_table_thaw, dump_hash_table) (dump_hash_table_contents): Adapt dumping and loading to field changes. @@ -25424,7 +25422,7 @@ Represent hash table weakness as an enum internally This takes less space (saves an entire word) and is more type-safe. - No change in behaviour. + No change in behavior. * src/lisp.h (hash_table_weakness_t): New. (struct Lisp_Hash_Table): Replace Lisp object `weak` with enum @@ -25877,7 +25875,7 @@ 2024-01-10 Michael Albinus - Fix file name completion with Tramp on MS Windoes + Fix file name completion with Tramp on MS Windows * doc/misc/trampver.texi: * lisp/net/trampver.el (tramp-version): Adapt Tramp versions. @@ -26236,7 +26234,7 @@ 466d1c98a9e Fix icons.el when icon does not exist as a file 2a861124e89 ; Improve documentation of 'buffer-match-p' dc9d02f8a01 * lisp/isearch.el (isearch-search-and-update): Let-bind '... - 9308d9a74ab * src/comp.c (Fcomp__compile_ctxt_to_file): Fix hash tabl... + 9308d9a74ab * src/comp.c (Fcomp__compile_ctxt_to_file): Fix hash table... a2a6619b282 Provide decent documentation for 'help-quick' ab66b749a27 ; * src/window.c (Fset_window_margins): Doc fix. 1a677d1429d treesit--pre-syntax-ppss: Fix args-out-of-range in intern... @@ -26720,7 +26718,7 @@ 2024-01-02 Richard Stallman - Fix non-permenent decryption to show up temperarily. + Fix non-permenent decryption to show up temporarily. In a decrypted mime part, replace CRLF with newline, @@ -26935,7 +26933,7 @@ 2024-01-01 Vincent Belaïche - Typoes in SES manual. + Typos in SES manual. Also @samp{...}-ify cell/row/column reference given as in-line examples. @@ -27366,7 +27364,7 @@ distortion to METRICS, and return the metrics as altered by compound glyphs in there. (sfnt_lookup_glyph_metrics): Trim away two unused parameters, - PIXEL_SIZE and HEAD, whose functionality has been superseeded by + PIXEL_SIZE and HEAD, whose functionality has been superseded by sfnt_scale_metrics and the implicit scaling the interpreter performs. (sfnt_interpret_compound_glyph_2): Save phantom points within @@ -27644,7 +27642,7 @@ * etc/EGLOT-NEWS: Update. * lisp/progmodes/eglot.el (Version): Bump to 1.15 - (Package-Requires): Bump jsonrpc depedency to 1.23 + (Package-Requires): Bump jsonrpc dependency to 1.23 2023-12-27 João Távora @@ -28210,7 +28208,7 @@ 2023-12-22 Mattias Engdegård - Slight funcall_subr optimisation + Slight funcall_subr optimization * src/eval.c (funcall_subr): Help the compiler by reducing aliasing problems, and compensate for a missed-optimisation bug in LLVM where @@ -28475,7 +28473,7 @@ Fix issue with register commands in kmacro Using post-command-hook in minibuffer-setup-hook instead of a timer - allow running exit-minibuffer without delay and ensure the serie of + allow running exit-minibuffer without delay and ensure the series of commands used in a kmacro run synchronously. * lisp/register.el (register-read-with-preview-fancy): Do it. @@ -29874,7 +29872,7 @@ values if exist. * doc/lispref/variables.texi (Applying Connection Local Variables): - Fix decription of connection-local-default-application. + Fix description of connection-local-default-application. * lisp/dired.el (dired-listing-switches): Adapt docstring. (dired-internal-noselect, dired-mode): @@ -30023,7 +30021,7 @@ * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Wait for all system operations to have been completed, before proceeding to remove - old package descriptors from 'package-alist'. This avoids loosing a + old package descriptors from 'package-alist'. This avoids losing a package if an error occurs during upgrades. 2023-12-09 john muhl @@ -30214,7 +30212,7 @@ M-x eldoc is ElDoc's interactive entry point for on-demand documentation for users that don't want the behind-the-scenes idle - timer behaviour. + timer behavior. However, eldoc-display-in-echo-area, a member of eldoc-display-functions, refused to do anything because it thought it @@ -30548,7 +30546,7 @@ Move malformed-function warning from byte-opt to cconv (bug#67483) - We shouldn't be warning inside the optimiser in the first place. + We shouldn't be warning inside the optimizer in the first place. * lisp/emacs-lisp/byte-opt.el (byte-optimize-form): Remove byte-compile-form-stack manipulation. @@ -30602,7 +30600,7 @@ (register-of-type-alist): New, filter register-alist according to type. (register-preview): Signature changed, use TYPES now. - (register-preview-get-defaults): New generic, compute defauts + (register-preview-get-defaults): New generic, compute defaults according to action. (register-read-with-preview): Now use read-from-minibuffer and minibuffer-setup-hook. @@ -30670,7 +30668,7 @@ Unbreak Eglot, Jsonrpc as EIEIO inches closer to CLOS (bug#67480) - EIEIO is an innacurate emulation of CLOS in many aspects and one of + EIEIO is an inaccurate emulation of CLOS in many aspects and one of them in accessor definition. Before this commit commit 6c47931a1ad4de4af3f147b9604169c2441100fe @@ -32301,7 +32299,7 @@ y)) would incorrectly substitute y->x in the body form despite x being - already modified at that point, which normally should have cancelled + already modified at that point, which normally should have canceled the aliasing. Bug reported by Alan Mackenzie. @@ -32633,7 +32631,7 @@ assumptions about implementation details. In others, like the ones about the completions-first-difference face, - minor parts of the actual user-visible behaviour were broken. + minor parts of the actual user-visible behavior were broken. * test/lisp/minibuffer-tests.el (completion-test1): Robustify test. (completion--pcm-score): Don't assume completion-score is stored @@ -33089,7 +33087,7 @@ Simplify 'project-remember-projects-under' * lisp/progmodes/project.el (project-remember-projects-under): Instead - of traversing the directories manually, re-use + of traversing the directories manually, reuse `directory-files-recursively' to reduce complexity. (Bug#66649) 2023-11-08 Juri Linkov @@ -34000,7 +33998,7 @@ (dnd-handle-multiple-urls): Prevent calling the same handler multiple times for a single URI. - * lisp/gnus/mml.el (mml-dnd-protocol-alist): Apply an anologous + * lisp/gnus/mml.el (mml-dnd-protocol-alist): Apply an analogous adjustment here. Delete now redundant redefinition of dnd-open-file. (mml-dnd-attach-file): Inquire whether to apply the default @@ -34786,7 +34784,7 @@ 2023-10-23 Mattias Engdegård - Modernise text about using dynamic variables + Modernize text about using dynamic variables * doc/lispref/variables.texi (Dynamic Binding Tips): Give more useful advice. @@ -34810,7 +34808,7 @@ Alter the presentation order from the point of view that lexical binding is the standard discipline (if not always the default) and dynamic binding an alternative, which corresponds better to Elisp - today. Modernise parts of the text. + today. Modernize parts of the text. * doc/lispref/elisp.texi (Top): Update menu. 2023-10-23 Mattias Engdegård @@ -35108,7 +35106,7 @@ (sleep-for): Make the `millisec` argument obsolete - * lisp/subr.el (sleep-for): Set new advertized calling convention. + * lisp/subr.el (sleep-for): Set new advertised calling convention. * src/dispnew.c (Fsleep_for): Adjust docstring. * doc/lispref/commands.texi (Waiting): Adjust doc. @@ -35298,7 +35296,7 @@ Repair detection of empty mailto URLs * java/org/gnu/emacs/EmacsOpenActivity.java (onCreate): - Additonally regard mailto:// as an empty URL, since Android does + Additionally regard mailto:// as an empty URL, since Android does interpret them as such. 2023-10-20 Gerd Möllmann @@ -35599,7 +35597,7 @@ 2023-10-16 Po Lu - Properly initialize argment list supplied to android_init_emacs + Properly initialize argument list supplied to android_init_emacs * src/android.c (initEmacs): NULL-terminate c_argv. @@ -37376,7 +37374,7 @@ Fix last change * src/search.c (Fre__describe_compiled): Correct typos and - pointer signedness missmatch. + pointer signedness mismatch. 2023-09-29 Stefan Monnier @@ -37775,7 +37773,7 @@ Instead of scanning vector_free_lists from the appropriate size until we find a nonempty bucket, start at the last bucket where we last put - something in. This may favour splitting larger vectors than necessary + something in. This may favor splitting larger vectors than necessary but in general saves a lot of time in the allocation of small vectors. Original patch by Ihor Radchenko. @@ -37870,7 +37868,7 @@ Flymake: unbreak tests - Flymake's normal behaviour implies catching the errors of misbehaving + Flymake's normal behavior implies catching the errors of misbehaving backends. This behavior is tested by Flymake's automated tests, built on top of ERT, which means that debug-on-error is always t in the bodies of said tests (I don't know the rationale for this, but it's @@ -38375,7 +38373,7 @@ pointer arithmetic in C. In particular, a null pointer can be neither an operand in nor the result of pointer arithmetic. - C compilers know this and would, prior to this change, optimise + C compilers know this and would, prior to this change, optimize XUNTAG(obj, Lisp_Int0, mytype) != NULL @@ -38424,16 +38422,16 @@ Offset ranges before applying embedded tree-sitter parser This feature would allow treesitter major modes to easily specify - offsets when using embeded parsers. A potential use case for this is + offsets when using embedded parsers. A potential use case for this is javascript template strings, when we want to apply a different parser to the string's contents, but do not want to include the template string's delimiters. * lisp/treesit.el - (treesit-query-range): Accept an optional offest arg, apply the offset + (treesit-query-range): Accept an optional offset arg, apply the offset to all returned ranges. (treesit-range-rules): Accept an optional :offset keyword arg to adjust - ranges an embded parser is applied to. + ranges an embedded parser is applied to. (treesit-update-ranges): Forward optional :offset setting from `treesit-range-rules' to `treesit-query-rang'. * test/src/treesit-tests.el @@ -38729,7 +38727,7 @@ pointer arithmetic in C. In particular, a null pointer can be neither an operand in nor the result of pointer arithmetic. - C compilers know this and would, prior to this change, optimise + C compilers know this and would, prior to this change, optimize XUNTAG(obj, Lisp_Int0, mytype) != NULL @@ -39227,7 +39225,7 @@ Make sure undefined tree-sitter thing doesn't raise an error - A previous change should've achived this, but that wasn't enough. + A previous change should've achieved this, but that wasn't enough. This one actually achieves the intended effect, namely, treesit-node-match-p doesn't raise an error if IGNORE-MISSING is non-nil, and traverse functions don't raise error by default. @@ -39776,7 +39774,7 @@ (say "goodbye")) because they are very much an indicator of a mistake (such as - misplaced brackets), and since they are deleted by the optimiser, any + misplaced brackets), and since they are deleted by the optimizer, any other warnings there are lost and the user wouldn't know that something is wrong otherwise. @@ -39994,7 +39992,7 @@ Fix treesit-thing-settings for c++-ts-mode (bug#65810) * lisp/progmodes/c-ts-mode.el: - (c-ts-mode--thing-settings): New varaible. + (c-ts-mode--thing-settings): New variable. (c-ts-base-mode): Use c-ts-mode--thing-settings. 2023-09-08 Yuan Fu @@ -40459,7 +40457,7 @@ (eglot-path-to-uri) (eglot-range-region) (eglot-server-capable) - (eglot-server-capable-or-lose): New functions and backward compability + (eglot-server-capable-or-lose): New functions and backward compatibility aliases. 2023-09-04 Stefan Kangas @@ -40648,7 +40646,7 @@ (eglot-path-to-uri) (eglot-range-region) (eglot-server-capable) - (eglot-server-capable-or-lose): New functions and backward compability + (eglot-server-capable-or-lose): New functions and backward compatibility aliases. 2023-09-03 Jonas Bernoulli @@ -40853,7 +40851,7 @@ * lisp/eshell/em-prompt.el (eshell-next-prompt): Make N optional. When navigating, first move to the end of the prompt. This makes the subsequent navigation more predictable. - (eshell-previous-prompt): Mane N optional. + (eshell-previous-prompt): Make N optional. * test/lisp/eshell/em-prompt-tests.el (em-prompt-test--with-multiline): Move to "Code" section. @@ -41184,7 +41182,7 @@ 2023-09-01 Eli Zaretskii - Fix VC mode-line indication for registerd but ignored files + Fix VC mode-line indication for registered but ignored files * lisp/vc/vc-hooks.el (vc-ignored-state): New face. (vc-default-mode-line-string): Add special indication and tooltip @@ -42061,11 +42059,11 @@ Properly parse format 4 cmap tables * src/sfnt.c (sfnt_read_cmap_format_4): Read range_shift field - propery. Prior to this, it would be inadvertently treated as an + property. Prior to this, it would be inadvertently treated as an entry within the segment end code array, which only functioned by happenstance. (sfnt_lookup_glyph_4): Remove workaround grounded upon an - erroneous interpretation of the bug fixed by the aformentioned + erroneous interpretation of the bug fixed by the aforementioned change. * src/sfnt.h (struct sfnt_cmap_format_4): Introduce previously @@ -42990,7 +42988,7 @@ 2023-08-16 Mattias Engdegård - tibetan.el: compute constants at compile time, optimise regexps + tibetan.el: compute constants at compile time, optimize regexps * lisp/language/tibetan.el (tibetan-subjoined-transcription-alist) (tibetan-regexp, tibetan-precomposed-regexp) @@ -43894,7 +43892,7 @@ * lisp/eshell/esh-cmd.el (eshell-parse-command): Do all modifications to each command in a single pass. - (eshell-parse-pipeline): Remove unncessary reversing of parsed + (eshell-parse-pipeline): Remove unnecessary reversing of parsed results. 2023-08-10 Po Lu @@ -44229,7 +44227,7 @@ Teach byte-compiler about Aristotelian identity * lisp/emacs-lisp/byte-opt.el (byte-optimize-equal, byte-optimize-eq): - Optimise (eq X X) -> t where X is a variable; idem for eql and equal. + Optimize (eq X X) -> t where X is a variable; idem for eql and equal. * test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--test-cases): Add test case. @@ -44683,7 +44681,7 @@ platform-specific file descriptor replacement is possible, place one there. (build_load_history): Fix typos in comments. - (skip_lazy_string): Implement in terms of the aformentioned + (skip_lazy_string): Implement in terms of the aforementioned macros. * src/lisp.h: Add declarations for new functions. @@ -45563,7 +45561,7 @@ * test/lisp/align-resources/c-mode.erts: Make test agree with Emacs This eliminates a failure in align-tests. There doesn't seem to be - anything obviously wrong with Emacs's behaviour in this case. + anything obviously wrong with Emacs's behavior in this case. 2023-08-05 Michael Albinus @@ -45692,7 +45690,7 @@ Don't allow the `eq` and `unbind` byte-ops to commute (bug#65017) * lisp/emacs-lisp/byte-opt.el (byte-after-unwind-ops): - Cease sinking `eq` past `unwind`, because that optimised away the + Cease sinking `eq` past `unwind`, because that optimized away the let-binding in (let ((symbols-with-pos-enabled nil)) @@ -46286,7 +46284,7 @@ Merge from origin/emacs-29 - a9b28224af0 ; Last-minute changes befor releasing 29.1 + a9b28224af0 ; Last-minute changes before releasing 29.1 7da1cee56b3 Update CMake support due to upstream changes (bug#64922) c2d95dd00e6 Remove nullptr named node from c++-ts-mode (bug#64818) 4e977136d31 Make compat check also check typescript @@ -46795,7 +46793,7 @@ Implement char-before, backward-char and backward-word as compiler macros instead of byte-compile handlers so that the source-level - optimiser gets to simplify the result. In particular, this removes + optimizer gets to simplify the result. In particular, this removes some branches. * lisp/emacs-lisp/bytecomp.el (byte-compile-char-before) @@ -47746,7 +47744,7 @@ (python-shell-interpreter-interactive-arg): Improve documentation. (python--list-imports, python--do-isort) - (python-fix-imports): Make process use customisable + (python-fix-imports): Make process use customizable arguments. 2023-07-20 Mauro Aranda @@ -47801,7 +47799,7 @@ 4bd8e8c6d2b ; * src/xdisp.c: Fix wording in commentary. 3af27a4b815 Improve commentary in nsfns.m - 5de5e4b4d0a Fix typos and ommissions in cus-edit.el + 5de5e4b4d0a Fix typos and omissions in cus-edit.el 9d93c6ba14a ; * src/xdisp.c: Fix typos in the commentary. 86f2d6d62fc ; * src/xdisp.c: Improve commentary. (Bug#64596) ac075176bf0 ; * admin/notes/bugtracker: Fix punctuation. @@ -48034,7 +48032,7 @@ (build-counter.c): New target. Generate this file using makecounter.sh upon changes to lisp.mk or shortlisp. (lisp.mk): Make and load relative to abs_top_builddir. - (emacs$(EXEEXT)): Adjust acordingly. + (emacs$(EXEEXT)): Adjust accordingly. (mostlyclean): Remove build-counter.c. 2023-07-19 Po Lu @@ -48137,7 +48135,7 @@ * java/org/gnu/emacs/EmacsNative.java (EmacsNative): Update JNI prototypes. * java/org/gnu/emacs/EmacsWindow.java (motionEvent): Set - cancelation flag in events sent where appropriate. + cancellation flag in events sent where appropriate. * lisp/touch-screen.el (touch-screen-handle-point-update): Improve treatment of horizontal scrolling near window edges. (touch-screen-handle-touch): Don't handle point up if the touch @@ -48147,7 +48145,7 @@ * src/androidgui.h (enum android_touch_event_flags): New enum. (struct android_touch_event): New field `flags'. * src/androidterm.c (handle_one_android_event): Report - cancelation in TOUCHSCREEN_END_EVENTs. + cancellation in TOUCHSCREEN_END_EVENTs. * src/keyboard.c (make_lispy_event): Fix botched merge. 2023-07-18 Po Lu @@ -48212,7 +48210,7 @@ To make rx produce a translation that works as intended, split ranges that that go from ordinary characters to raw bytes. Such ranges may - appear from set manipulation and regexp optimisation. + appear from set manipulation and regexp optimization. * lisp/emacs-lisp/rx.el (rx--generate-alt): Split intervals that straddle the char-raw boundary when rendering a string regexp from an @@ -49254,7 +49252,7 @@ Autodetect coding system when yanking media - Some browers send eg 'text/html' selections formatted as UTF-8, but + Some browsers send eg 'text/html' selections formatted as UTF-8, but with a type of STRING, which actually means iso-latin-1. Autodetect the correct coding system to use by calling 'gui-get-selection'. @@ -49421,7 +49419,7 @@ onGenericMotionEvent. * java/org/gnu/emacs/EmacsWindow.java (Coordinate): New fields `button' and `id'. - (): Add new arguments to the construtor. + (): Add new arguments to the constructor. (whatButtonWasIt): Return 0 if the button state has not changed. (buttonForEvent): New function. (figureChange): Return the Coordinate object associated to @@ -50210,7 +50208,7 @@ (cperl-mode): Add "ADJUST" to defun-prompt-regexp. (cperl-after-block-p): Add new keywords for Perl 5.36 and 5.38. (cperl-indent-exp): Add "field" to expression starters. - (cperl-imenu--create-perl-index): Rename variables refering to + (cperl-imenu--create-perl-index): Rename variables referring to "package", because they also contain classes. (cperl-init-faces): Add new keywords for Perl 5.36 and 5.38. (cperl-find-tags): Add support for "class". @@ -51317,7 +51315,7 @@ Use prefix syntax for ,@ to avoid the @ becoming part of a symbol that follows. * test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-with-normal-env): - Propertise inserted Lisp code to keep the test working. + Propertize inserted Lisp code to keep the test working. 2023-06-21 Mattias Engdegård @@ -52752,10 +52750,10 @@ 2023-06-04 Mattias Engdegård - Better internal-make-closure optimisation + Better internal-make-closure optimization * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): - Optimise closed-over values in closure creation like any other, which + Optimize closed-over values in closure creation like any other, which can lead to stack variables being eliminated. 2023-06-04 Andrea Corallo @@ -52845,7 +52843,7 @@ dc7acb1aafe Avoid errors in 'delete-forward-char' deleting static com... 2f94f6de9d6 Make VS-15 and VS-16 compositions work correctly 753f8aa1f14 Fix project-name for vc-aware backend in non-file buffers - 17c7915ab94 ; Fix 'package-install-upgrade-built-in' check for packag... + 17c7915ab94 ; Fix 'package-install-upgrade-built-in' check for package... e252ce26eab Add type_predicate 'is' as keyword in typescript-ts-mode ... 0a354d65784 Fix infloop in info-look.el 83b22139e4c Fix several todo-mode.el item editing bugs (bug#63811) @@ -54022,7 +54020,7 @@ 2023-05-20 Mattias Engdegård - Minor optimisation of string-trim-left and string-trim-right + Minor optimization of string-trim-left and string-trim-right * lisp/subr.el (string-trim-left, string-trim-right): Use a constant string when no REGEXP argument is given. @@ -54052,7 +54050,7 @@ Use `ansi-color-control-seq-regexp'. (Bug#63539) * test/lisp/net/tramp-tests.el (tramp-display-escape-sequence-regexp): - Dont't declare. + Don't declare. (tramp-test28-process-file, tramp-test32-shell-command): Use `ansi-color-control-seq-regexp'. (tramp-test45-asynchronous-requests): Adapt test. @@ -55027,7 +55025,7 @@ d2e82817a3f Add two typescript-ts-mode faces (bug#62429) 10918fc9d24 Fix scrolling window when point moves up 9b32bc134c4 Improve documentation of 'defcustom's :set keyword - ab4273056e0 Comp fix calls to redefined primtives with op-bytecode (b... + ab4273056e0 Comp fix calls to redefined primitives with op-bytecode (b... c98929c7e18 ; Fix last change a14c3f62a67 ; Fix last change 09fece5722f Fix duplicate defcustom in eww.el @@ -55053,7 +55051,7 @@ (nreverse [1 2 3]) (put-text-property 0 3 'face 'highlight "moo") - Such code can result in surprising behaviour and problems that + Such code can result in surprising behavior and problems that are difficult to debug. * lisp/emacs-lisp/bytecomp.el (byte-compile-form, mutating-fns): @@ -55843,7 +55841,7 @@ 2023-05-05 Mattias Engdegård - Remove useless handling of erroneous code in Lisp optimiser + Remove useless handling of erroneous code in Lisp optimizer * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): ((closure ...) ...) is a malformed function call; treat it as such. @@ -56578,7 +56576,7 @@ * lisp/ls-lisp.el (ls-lisp-ignore-case): * lisp/mail/binhex.el (binhex-use-external): * lisp/progmodes/cperl-mode.el (cperl-electric-parens-mark): - Normalise default values to nil or t. + Normalize default values to nil or t. 2023-04-28 Po Lu @@ -56627,7 +56625,7 @@ 2023-04-27 Mattias Engdegård - Clarify `nconc` behaviour for dotted lists (bug#63103) + Clarify `nconc` behavior for dotted lists (bug#63103) * doc/lispref/lists.texi (Rearrangement): Explicitly say that dotted lists are valid args to `nconc` and give an example. @@ -56950,7 +56948,7 @@ 2023-04-22 Mattias Engdegård - Improved nconc and append compiler optimisations + Improved nconc and append compiler optimizations Add the transforms: @@ -56964,7 +56962,7 @@ (list X) Y -> (cons X Y) * lisp/emacs-lisp/byte-opt.el (byte-optimize-nconc): New. - (byte-optimize-append): Fix minor flaws and generalise. + (byte-optimize-append): Fix minor flaws and generalize. 2023-04-22 Po Lu @@ -57511,7 +57509,7 @@ * lisp/progmodes/cc-engine.el (c-forward-over-compound-identifier): Don't move forward over whitespace following the identifier. (c-forward-primary-expression): Add parameter stop-at-end meaning don't move - forward over whitespace after the construct when non-nil. Don't recognise a + forward over whitespace after the construct when non-nil. Don't recognize a primary expression when an open brace follows a parenthesized expression. (c-forward-constraint-clause): Extracted from c-forward-c++-requires-clause. Add parameter stop-at-end as above. @@ -57873,7 +57871,7 @@ 2023-04-12 João Távora - Flymake: futher enhance echo-area appearance of diagnostics + Flymake: further enhance echo-area appearance of diagnostics Also describe new 'echo-face' property in the Flymake manual, and fix it's mistaken mention of a non-existing 'flymake-severity' property. @@ -59065,7 +59063,7 @@ Consolidate existing warnings about unused return values Move the warning about unused return values from calls to - side-effect-free functions from the source-level optimiser to the code + side-effect-free functions from the source-level optimizer to the code generator, where it can be unified with the special-purpose warning about unused values from `mapcar`. This change also cures spurious duplicate warnings about the same code, makes the warnings amenable to @@ -59584,7 +59582,7 @@ d2e82817a3f Add two typescript-ts-mode faces (bug#62429) 10918fc9d24 Fix scrolling window when point moves up 9b32bc134c4 Improve documentation of 'defcustom's :set keyword - ab4273056e0 Comp fix calls to redefined primtives with op-bytecode (b... + ab4273056e0 Comp fix calls to redefined primitives with op-bytecode (b... c98929c7e18 ; Fix last change a14c3f62a67 ; Fix last change 09fece5722f Fix duplicate defcustom in eww.el @@ -59851,15 +59849,15 @@ 2023-03-31 Mattias Engdegård - Make string-lessp vectorisation safer + Make string-lessp vectorization safer Use memcpy for loading unaligned words on platforms where this can be done efficiently. This guards against problems arising from future compiler autovectorisation improvements that might cause instructions that require aligned addresses to be emitted, and should also work - with an address sanitiser enabled. + with an address sanitizer enabled. - * src/fns.c (HAVE_FAST_UNALIGNED_ACCESS): Only define when optimising. + * src/fns.c (HAVE_FAST_UNALIGNED_ACCESS): Only define when optimizing. (load_unaligned_size_t): New. (Fstring_lessp): Use load_unaligned_size_t. * src/lisp.h (UNALIGNED_LOAD_SIZE): Remove now unused macro. @@ -60016,7 +60014,7 @@ Update Android port * src/sfntfont.c (sfntfont_setup_interpreter): Don't create - interpreter for blatently broken fonts. + interpreter for blatantly broken fonts. 2023-03-29 Stefan Kangas @@ -60024,7 +60022,7 @@ 3965c65d5e2 ; * lisp/subr.el (read-char-choice): Fix last change. c1eac5b6586 Improve documentation of 'read-choice' and related symbols - a8c9283e170 Revert "Comp fix calls to redefined primtives with op-byt... + a8c9283e170 Revert "Comp fix calls to redefined primitives with op-byt... 8b66d8abd01 Revert "* lisp/emacs-lisp/comp.el (comp-emit-set-call-sub... 4ec4f614c71 ; Fix incompatibility in 'display-buffer-assq-regexp' ba3ade58f3b Skip ruby-ts-imenu-index test if needed @@ -60067,7 +60065,7 @@ subcommands). For globbing, we want to pass the literal glob to Pcomplete so it can use the glob for selecting completion candidates. For subcommands (including Lisp forms), we especially want to avoid - evaluation, since they can produce arbitary side effects! (Bug#50470) + evaluation, since they can produce arbitrary side effects! (Bug#50470) * lisp/eshell/esh-cmd.el (eshell-allow-commands): New variable... (eshell-commands-forbidden): New error... @@ -60537,7 +60535,7 @@ 2023-03-25 Mattias Engdegård - Generalise a LAP optimisation rule + Generalize a LAP optimization rule * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Accept (stack-set 1) as equivalent to (discardN-preserve-tos 1) in a @@ -60821,7 +60819,7 @@ 4a7a0c9a9f5 * lisp/emacs-lisp/comp.el (comp-emit-set-call-subr): Impr... 4a6eefb93a5 Expand defvar-keymap documentation 7a1272168af * lisp/treesit.el (treesit-end-of-defun): Guard arg again... - 263d6c38539 Comp fix calls to redefined primtives with op-bytecode (b... + 263d6c38539 Comp fix calls to redefined primitives with op-bytecode (b... 6bf441ff115 Warn package authors away from keymap-unset with REMOVE 786de66ec3c Comment out jobs on EMBA eed240bc022 Improve defvar-keymap docstring. @@ -61095,7 +61093,7 @@ CC Mode: Eliminate duplicate function c-list-of-strings Replace it with the existing c-string-list-p. Also put an autoload cookie in - front of c-string-list-p so that it will not be signalled as undefined by + front of c-string-list-p so that it will not be signaled as undefined by loaddefs.el. lisp/progmodes/cc-vars.el (c-string-list-p): Make this autoload. @@ -61503,14 +61501,14 @@ Better jsonrpc.el workaround for debug-on-error check Some extensions, notably ert.el, set `debug-on-error' to non-nil, - which makes it hard to test the behaviour catching of the Elisp + which makes it hard to test the behavior catching of the Elisp error when processing a request and replying to the endpoint with an JSONRPC-error. The previous workaround relied on requiring lisp/emacs-lisp/ert.el in lisp/jsonrpc.el, which really doesn't make sense. - This is better. For the single test of that behaviour, set a new + This is better. For the single test of that behavior, set a new variable, jsonrpc-inhibit-debug-on-error. Not only is this cleaner, it allows us to use ert.el's useful @@ -61558,7 +61556,7 @@ 1de513a29fa Fix enums and unions appearing as structs in c-ts-base-mo... ecdfd584a52 ruby-ts-mode: Fine-tune s-p-f on symbols (bug#62086) 29228e24f20 python-info-dedenter-opening-block-positions: Fix to supp... - 01b65d442ad Autoload Eglot helper funtion eglot--debbugs-or-github-bu... + 01b65d442ad Autoload Eglot helper function eglot--debbugs-or-github-bu... 50a3559c5a7 Add chapter on advanced server configuration to Eglot manual 2e7460c2315 ; * lisp/progmodes/java-ts-mode.el (treesit-query-capture... 255eeee0e06 java-ts-mode: detect if text_block is supported. @@ -61655,7 +61653,7 @@ (c-font-lock-extra-types, c++-font-lock-extra-types) (objc-font-lock-extra-types, java-font-lock-extra-types) (idl-font-lock-extra-types, pike-font-lock-extra-types): Add a :safe entry - into each of thes defcustoms for c-list-of-string. + into each of these defcustoms for c-list-of-string. (Top level): Add an autoload entry for each of the above. 2023-03-13 Po Lu @@ -62908,7 +62906,7 @@ * lisp/progmodes/ruby-mode.el (ruby-add-log-current-method): Eliminate uses of condition-case without handlers. These seem to have been there for quite a long time. This change does not affect the - behaviour of the code and makes some warnings go away. + behavior of the code and makes some warnings go away. 2023-03-03 Po Lu @@ -62981,11 +62979,11 @@ 2023-03-02 Mattias Engdegård - Small unwind-protect optimisation improvement + Small unwind-protect optimization improvement * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): - Use the current for-effect mode when optimising the body form, - instead of always optimising it for value. + Use the current for-effect mode when optimizing the body form, + instead of always optimizing it for value. 2023-03-02 Michael Albinus @@ -63193,7 +63191,7 @@ .:(src/verbose.mk): Depend on verbose.mk.android in srcdir. (lib/Makefile): Edit srcdir and VPATH to LIB_SRCDIR. (src/Makefile): Edit -I$$(top_srcdir) to -I../$(srcdir)/lib, - instead of ommitting it. + instead of omitting it. (clean): Allow ndk-build clean to fail. * java/Makefile.in (builddir): New variable. @@ -63895,7 +63893,7 @@ Make android_select more robust * src/android.c (android_run_select_thread): Lock select_mutex - before signalling condition variable. + before signaling condition variable. (android_select): Unlock event queue mutex prior to waiting for it. @@ -64605,7 +64603,7 @@ 83af806ab7c Rename 'emacs-news-toggle-tag' to 'emacs-news-cycle-tag' 5bc88b3b175 Add menu to news-mode 40f4bc4e0aa ; Avoid installing VC package dependencies multiple times - 1c9d81a2b42 Attempt to recognise if a VC package has no Elisp files + 1c9d81a2b42 Attempt to recognize if a VC package has no Elisp files 2550e8bb0b0 Fix mule-tests under en_US.UTF-8 locale 32795309939 Move block closer above declaration_list rule (bug#61531) b18754bb179 Minor improvements in c-ts-mode and docs @@ -64876,7 +64874,7 @@ 83af806ab7c Rename 'emacs-news-toggle-tag' to 'emacs-news-cycle-tag' 5bc88b3b175 Add menu to news-mode 40f4bc4e0aa ; Avoid installing VC package dependencies multiple times - 1c9d81a2b42 Attempt to recognise if a VC package has no Elisp files + 1c9d81a2b42 Attempt to recognize if a VC package has no Elisp files 2023-02-16 Po Lu @@ -65356,7 +65354,7 @@ 2023-02-14 Mattias Engdegård - Fix recent LAP optimiser error + Fix recent LAP optimizer error * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Fix a flaw in the @@ -65364,7 +65362,7 @@ dup (varset|varbind|stack-set) discard -> (varset|varbind|stack-set) rule: don't match stack-set(1) which is dealt with elsewhere, and - generalise to discard(N). + generalize to discard(N). 2023-02-14 Andrea Corallo @@ -65415,7 +65413,7 @@ 2023-02-13 Mattias Engdegård - LAP optimiser: more stack reduction hoisting + LAP optimizer: more stack reduction hoisting Hoisting stack reduction ops allows them to coalesce and/or cancel out pushing ops, and for useful operations to sink and combine, such as @@ -65428,7 +65426,7 @@ where UNARY pops and pushes one value. - Generalise the rule + Generalize the rule const discardN-preserve-tos --> discardN const @@ -65619,7 +65617,7 @@ 2023-02-11 Mattias Engdegård - LAP peephole optimiser improvementsa + LAP peephole optimizer improvementsa * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Make the improvements: @@ -65650,7 +65648,7 @@ where OP is a unary operation such as `not` or `car`. - - Generalise a previous rule to + - Generalize a previous rule to NOEFFECT PRODUCER return --> PRODUCER return @@ -65939,7 +65937,7 @@ * doc/lispref/frames.texi (On-Screen Keyboards): Describe return value of `frame-toggle-on-screen-keyboard'. * java/org/gnu/emacs/EmacsSurfaceView.java (surfaceChanged) - (surfaceCreated, EmacsSurfaceView): Remove unuseful + (surfaceCreated, EmacsSurfaceView): Remove useless synchronization code. The framework doesn't seem to look at this at all. @@ -65983,7 +65981,7 @@ 2023-02-08 Mattias Engdegård - Simplify and speed up parts of elisp optimiser + Simplify and speed up parts of elisp optimizer * lisp/emacs-lisp/byte-opt.el (byte-optimize-constant-args): Simplify. (byte-optimize--constant-symbol-p): Speed up. @@ -66300,7 +66298,7 @@ Update Android port * java/AndroidManifest.xml.in: Prevent the Emacs activity from - being overlayed by the emacsclient wrapper. + being overlaid by the emacsclient wrapper. * java/org/gnu/emacs/EmacsOpenActivity.java (run): Likewise. (onCreate): Set an appropriate theme on ICS and up. @@ -66350,7 +66348,7 @@ 2023-02-05 Mattias Engdegård - Fix misleading LAP optimiser debug log message + Fix misleading LAP optimizer debug log message * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Correct message in a conditional jump threading rule. @@ -66361,11 +66359,11 @@ * lisp/emacs-lisp/byte-opt.el (byte-after-unbind-ops): Add discardN and discardN-preserve-tos, both of which - commute with unbind. This enables subsequent optimisations. + commute with unbind. This enables subsequent optimizations. 2023-02-05 Mattias Engdegård - Remove compatibility hacks in LAP optimiser + Remove compatibility hacks in LAP optimizer * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Remove code forcing forward motion after applying certain @@ -66374,9 +66372,9 @@ 2023-02-05 Mattias Engdegård - LAP optimiser: bind local variables instead of mutating them + LAP optimizer: bind local variables instead of mutating them - This is a refactoring step: there is no change in how the optimiser + This is a refactoring step: there is no change in how the optimizer works. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): @@ -66389,7 +66387,7 @@ 2023-02-05 Mattias Engdegård - Get rid of delq in LAP optimiser + Get rid of delq in LAP optimizer * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Instead of using the O(n) `delq' to remove single instructions, use @@ -66675,7 +66673,7 @@ 2023-02-02 Mattias Engdegård - LAP peephole optimisation improvements + LAP peephole optimization improvements - Since discardN-preserve-tos(1) and stack-set(1) have the same effect, treat them as equivalent in all transformations. @@ -66686,7 +66684,7 @@ --> discardN-preserve-tos(X+Y) from the final pass to the main iteration since it may enable - further optimisations. + further optimizations. - Don't apply the rule @@ -66700,7 +66698,7 @@ where OP is effect-free. - - Generalise the push-pop annihilation rule to + - Generalize the push-pop annihilation rule to PUSH(K) discard(N) -> discard(N-K), N>K PUSH(K) discard(N) -> , N=K @@ -67148,8 +67146,8 @@ Better compilation of n-ary comparisons Transform n-ary comparisons to a chain of binary comparisons in the - Lisp optimiser instead of in codegen, to allow for subsequent - optimisations. This generalises the transform, so that + Lisp optimizer instead of in codegen, to allow for subsequent + optimizations. This generalizes the transform, so that (< 1 X 10) -> (let ((x X)) (and (< 1 x) (< x 10))) @@ -67448,7 +67446,7 @@ Repair hideif regexp problems * lisp/progmodes/hideif.el (hif-white-regexp, hif-tokenize): - Avoid superlinear backtracking behaviour by rewriting regexps + Avoid superlinear backtracking behavior by rewriting regexps to avoid nested repetitions and make positive progress each time. Use lazy matching of the innards of /*...*/ comments to avoid matching too much. @@ -67459,7 +67457,7 @@ * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Allow removal of unreachable basic blocks in the LAP peephole - optimiser even when switch ops are present. The origins of + optimizer even when switch ops are present. The origins of this apparently unnecessary condition are unclear. 2023-01-27 Stefan Kangas @@ -67581,7 +67579,7 @@ * java/org/gnu/emacs/EmacsThread.java (run): Pass API level. * m4/ndk-build.m4 (ndk_package_mape): Add package mapping for sqlite3. - * src/Makefile.in (SQLITE3_CFLAGS): New substition. + * src/Makefile.in (SQLITE3_CFLAGS): New substitution. (EMACS_CFLAGS): Add that variable. * src/android.c (android_api_level): New variable. @@ -67754,7 +67752,7 @@ Import gnulib modules printf-posix and vasprintf-posix - These are neccessary because Android's printf is missing basic format + These are necessary because Android's printf is missing basic format modifiers such as t. * admin/merge-gnulib (GNULIB_MODULES): Add printf-posix and @@ -68185,7 +68183,7 @@ (touch-screen-precision-scroll): New user option. (touch-screen-handle-scroll): Use traditional scrolling by default. - (touch-screen-handle-touch): Adust format of + (touch-screen-handle-touch): Adjust format of touch-screen-current-tool. (touch-screen-track-tap): Don't print waiting for events. (touch-screen-track-drag): Likewise. Also, don't call UPDATE @@ -68216,7 +68214,7 @@ * lisp/loadup.el (featurep): Load ls-lisp on Android. * lisp/ls-lisp.el (ls-lisp-use-insert-directory-program): Default to off on Android. - * src/android.c (android_is_directory): New fucntion. + * src/android.c (android_is_directory): New function. (android_fstatat): Handle directories created by `android_opendir'. (android_open): Return meaningful file mode. @@ -68266,7 +68264,7 @@ Fix typo in c-ts-mode (bug#60932) * lisp/progmodes/c-ts-mode.el (c-ts-mode-indent-block-type-regexp): - enumerator, not enumeratior. + Fix typo for "enumerator". 2023-01-20 Theodor Thornhill @@ -68870,7 +68868,7 @@ 2023-01-16 Mattias Engdegård - Optimise `apply` with `cons` in tail argument + Optimize `apply` with `cons` in tail argument * lisp/emacs-lisp/byte-opt.el (byte-optimize-apply): Transform @@ -69328,7 +69326,7 @@ The old code scanned for #@ in .elc files, assuming they're docstrings and then looking around them to try and guess to which definition that docstring belongs, making many assumptions about how - the code happens to be layed out by bytecomp. + the code happens to be laid out by bytecomp. Replace that with code which relies on the (FILE . POS) info to extract the docstring knowing already where they are and what def they belong to. @@ -69704,7 +69702,7 @@ and `detectMouse'. (struct android_event_queue, android_init_events) (android_next_event, android_write_event): Remove write limit. - (android_file_access_p): Handle directories correcty. + (android_file_access_p): Handle directories correctly. (android_close): Fix coding style. (android_fclose): New function. (android_init_emacs_service): Initialize new methods. @@ -71470,7 +71468,7 @@ 'newsticker--decode-rfc822-date' has the regex pattern for North American timezones but the actual timezone conversion - for them was not implmented. Now cond cases are added to + for them was not implemented. Now cond cases are added to handle them as specified in RFC822. 2022-12-29 Theodor Thornhill @@ -71779,7 +71777,7 @@ if the entire form is in for-effect context. * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): - Don't optimise the condition-case body form for effect (potentially + Don't optimize the condition-case body form for effect (potentially discarding its value) if there is a success handler and a variable. * test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--test-cases): Add test cases. @@ -71795,7 +71793,7 @@ (make-directory): Assume the make-directory handler follows the new API where it yields non-nil if DIR already exists. This reverts some of the recent changes in this area, and simplifies - this funciton. + this function. 2022-12-24 Florian Weimer @@ -71973,7 +71971,7 @@ Merge from origin/emacs-29 - e59216d3be8 * Invoke spawed Emacs processes with '-Q' when native com... + e59216d3be8 * Invoke spawned Emacs processes with '-Q' when native com... 777b383dd0f Fix Eshell electric slash when used from the root directo... c088cdad9e9 Fix the --without-all build with tree-sitter ec9fbad908d Fix write-region to null device on MS-Windows @@ -72189,7 +72187,7 @@ 2022-12-19 Mattias Engdegård - Elide broken but unnecessary `if` optimisations + Elide broken but unnecessary `if` optimizations * lisp/emacs-lisp/byte-opt.el (byte-optimize-if): Remove explicit clauses purposing to simplify @@ -72236,7 +72234,7 @@ Merge from origin/emacs-29 - 12e26cc0c1b ; * admin/git-bisect-start: Add mistakenly ommitted commi... + 12e26cc0c1b ; * admin/git-bisect-start: Add mistakenly omitted commi... 9a751e0a38b ruby-mode: Support endless singleton method definitions too ce7b7e5af3d Remove comment-start-skip preset in tree-sitter indentati... c1e015ae320 Fix recent change in tramp-smb.el @@ -72245,8 +72243,8 @@ 3941cc29df3 ; Improve documentation of 'setopt' 6f88de109c8 ruby-mode: Support endless methods (bug#54702) 91dd893e343 ; * lisp/progmodes/sql.el (sql-product-interactive): Doc ... - 138d9dc4cb0 * lisp/cus-edit.el (setopt--set): Warn instead of rasing ... - d1e0542f336 Allow customising windmove user options with an empty prefix + 138d9dc4cb0 * lisp/cus-edit.el (setopt--set): Warn instead of raising ... + d1e0542f336 Allow customizing windmove user options with an empty prefix c2375e77914 Improve and extend admin/git-bisect-start 7cc2313eb0a Make 'rmail-summary-by-thread' faster 88e59b16cbe ; Improve documentation of installing tree-sitter and gra... @@ -72293,7 +72291,7 @@ Merge from origin/emacs-29 de2239a584a Revert "alist-get testfn argument evaluation correction" - 856d889f3a8 Revert "Elide broken but unnecessary `if` optimisations" + 856d889f3a8 Revert "Elide broken but unnecessary `if` optimizations" 8e42e20ed7f Revert "Use equal and member instead of eq and memq" 2022-12-19 Stefan Kangas @@ -72438,7 +72436,7 @@ 2022-12-16 Mattias Engdegård - Elide broken but unnecessary `if` optimisations + Elide broken but unnecessary `if` optimizations * lisp/emacs-lisp/byte-opt.el (byte-optimize-if): Remove explicit clauses purposing to simplify @@ -72747,7 +72745,7 @@ proced-process-alist in the case it is non-nil. The result is that refinements are not immediately cleared when a proced buffer is updated with proced-auto-update-flag non-nil. proced-revert - maintains its current behaviour of clearing any active refinements. + maintains its current behavior of clearing any active refinements. * lisp/proced.el (proced-refinements): New buffer local variable which tracks the current refinements. @@ -73639,7 +73637,7 @@ ac47f783da Move :ensure option from macro expansion phase to runtime ... ff8bdfcdca Bump version to 2.1 5dffc8c7cf Merge pull request from waymondo/extend-bind-handler - 6298e7e477 pass in symbol of bind macro, for more extensible re-use o... + 6298e7e477 pass in symbol of bind macro, for more extensible reuse o... 3e2747f174 Revert "Merge pull request from edvorg/master" 9c1156dbf8 error handling for use-package 2276ed7607 Merge pull request from matklad/master @@ -74016,7 +74014,7 @@ ed4734405df Avoid crashes in a build --without-modules 70a2eb4a0b3 Fix 'add-display-text-property' when OBJECT is non-nil d58d1dd48ac Do not run slow tests on EMBA - 9b9b39a2d89 Lisp reader undefined behaviour excision + 9b9b39a2d89 Lisp reader undefined behavior excision # Conflicts: # etc/NEWS @@ -74163,7 +74161,7 @@ 520a4e12f8e ; * lisp/treesit.el (treesit-end-of-defun): Guard against... 2c4d92d30f6 ; * lisp/subr.el (posn-col-row): Revert inadvertent change. 6fb9a03cbdf ; Remove debugging leftover message - c5ba47c889e Speed up Unicode normalisation tests by a factor of 5 + c5ba47c889e Speed up Unicode normalization tests by a factor of 5 afa4fcb95b4 Fix "C-h k" when clicking on another frame f6e2f30f394 ; Fix typos bd58dcedfb9 Fix and expand tests broken by commit 2772ebe366 of 2022-... @@ -74830,7 +74828,7 @@ Fix detection of named prefix bindings - Fix menu-item bidning retrieval + Fix menu-item binding retrieval Fix prefix sorting @@ -74960,7 +74958,7 @@ 2020-11-13 BlaCk_Void - REAMDE code's Number of parentheses pairs (#270) + README code's Number of parentheses pairs (#270) 2020-10-19 Justin Burkett @@ -75376,7 +75374,7 @@ 2018-02-26 Justin Burkett - Fix which-key--show-keymap when no bidnings found + Fix which-key--show-keymap when no bindings found which-key--get-formatted-key-bindings takes a nil argument to mean look for global bindings which is not what we want here. @@ -76516,7 +76514,7 @@ Allows to recover from accidentally pressing C-h. - This commit also fixes some echo area problems that become apprent after + This commit also fixes some echo area problems that become apparent after introducing the C-h-map stuff 2015-12-03 Justin Burkett @@ -77774,7 +77772,7 @@ Add config setup functions and more - Fix a problem where the frame-height was not accouting for the + Fix a problem where the frame-height was not accounting for the minibuffer. Also, set the buffer to hidden-mode-line-mode to hide the mode-line for now (#16). diff --git a/admin/authors.el b/admin/authors.el index 9043b5f3840..75843e259ae 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -910,8 +910,11 @@ Changes to files in this list are not listed.") ("Garrett Wollman" :changed "sendmail.el") ("Dale R. Worley" :changed "mail-extr.el") ("Jamie Zawinski" :changed "bytecode.c" :wrote "tar-mode.el" - :cowrote "disass.el")) - "Actions taken from the original, manually (un)maintained AUTHORS file.") + :cowrote "disass.el") + ("Andrea Corallo" :wrote "comp.c")) + "Manual fixes to the list of actions taken. +These are mostly taken from the original, manually (un)maintained +AUTHORS file. There are also some more recent manual additions.") (defconst authors-valid-file-names diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude index 02b7c84c2f4..1dc4fb8f014 100644 --- a/admin/codespell/codespell.exclude +++ b/admin/codespell/codespell.exclude @@ -1685,3 +1685,62 @@ argument \\='general-category, is Decimal_Numbers (Nd). It returns ("ro" :default "Continuare de pe pagina precedentă") ("ro" :default "Continuare pe pagina următoare") ;; avk@rtsg.mot.com (Andrew V. Klein) for a Dired tip. +Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Sch@"afer, +Fran@,{c}ois Pinard, Greg McGary, and Bruno Haible wrote @file{po.el}, +Pieri, Fred Pierresteguy, Fran@,{c}ois Pinard, Daniel Pittman, Christian +Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph + f9832e80b89 ; * lisp/textmodes/ispell.el (ispell-message): Add commen... + 0bebd0e5f09 ; Remove 'build-module' and 'html-manual' directories fro... + 1014bcc8e32 Fix fontification of method-invocations in js-ts-mode (bu... + 1b9812af80b ; * etc/PROBLEMS: Document problem with GnuPG 2.4.1. (Bu... + 1fb2fb501f3 typescript-ts-mode, tsx-ts-mode: Fix syntax properties fo... + 399433cc2b9 * lisp/progmodes/project.el: Filter out empty strings fro... + 46fe7a17f53 Fix dragging mode line on text terminals with a mouse (bu... + 4bf7cb71edc Fix go-ts-mode indentation and set indent offset to 8 (Bu... + 527eb11de20 * lisp/minibuffer.el (completions-group-separator): Rever... + 5b34fc07085 * lisp/treesit.el (treesit-node-at): Update docstring (bu... + 5cf1de683b2 Fix python-fill-paragraph problems on filling strings (bu... + 7678b7e46f2 Eglot: check server capability before sending didSave (bu... + 7678b7e46f2 Eglot: check server capability before sending didSave (bu... + 9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu... + 9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu... + 9e105d483fa Fix c-ts-mode indentation for statement after preproc (bu... + When running emacs in a terminal (or at least, in iTerm), keys are not + b464e6c490b Make last change of w32 GUI dialogs conditional and rever... + b916ec88b2f Make eglot-ensure's post-command-hook run a bit later (bu... + e551dd72f79 * etc/PROBLEMS: Add entry about pinentry with gpgsm. (Bu... + ed4cd3eddf7 dockerfile-ts-mode: Prevent empty categories in imenu (Bu... + edd36786e1e ; * lisp/bookmark.el (bookmark-bmenu-locate): Doc fix (bu... + f102145d381 ; * etc/PROBLEMS: Describe problems with MuPDF 1.21. (Bu... + f49fe936abd * etc/NEWS: Note dotimes loop variable scoping change (bu... + performance reasons. Fix a bug that could cause ghost (mis)matches +2023-03-02 Sebastian Tennant (tiny change) +2023-03-26 Andrew G Cohen +2023-04-01 Andrew G Cohen +2023-04-09 Andrew G Cohen +2023-04-11 Andrew G Cohen +2023-04-12 Andrew G Cohen +2023-04-14 Andrew G Cohen +2023-04-15 Andrew G Cohen +2023-04-17 Andrew G Cohen +2023-04-18 Andrew G Cohen +2023-04-30 Andrew G Cohen +2023-05-06 Andrew G Cohen +2023-06-20 Andrew G Cohen +2023-07-05 Andrew G Cohen +2024-05-10 Andrew G Cohen + ce0ebb91f25 Improve documentation of read syntax and printed represen... + e110312ad95 ; * doc/lispref/minibuf.texi (Text from Minibuffer): Ment... +2023-07-08 Vladimir Sedach + 90fc6b987ad * lisp/savehist.el (savehist-save): Preserve shared struc... + ed3bab3cc72 Revert 'forward-sentence-default-function' to return poin... + b3e930d328e Revert inadvertent change to lisp/icomplete.el in previou... + 973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid... + 973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid... + e444115d026 Improve keymap-global-set and keymap-local-set interactiv... + 8e9783b4ce4 Rebind in read-regexp-map ‘M-c’ to ‘M-s c’ compatible wit... + f12f72b0e09 ; * lisp/simple.el (primitive-undo): Clarify error messag... + cf327766226 ; * doc/lispref/parsing.texi (Using Parser): Remove delet... + b211a63455c Make tab-bar-tab-group-format-function also handle curren... + a3c310c11a Create new "use-package" themse and use it for :custom wit... + 2a85d81c47 Add support for gathering statistics on use-package declar... diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore index 4f145c290f7..befa845e9d8 100644 --- a/admin/codespell/codespell.ignore +++ b/admin/codespell/codespell.ignore @@ -1,4 +1,5 @@ acknowledgements +adviced advices afile ake @@ -9,6 +10,8 @@ blocs callint checkin clen +clos +configury debbugs dedented dependant diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 1b6d9744ecc..85a8ef2624d 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -210,7 +210,10 @@ General steps (for each step, check for possible errors): should be committed separately, as described in step 3 above, to avoid them being merged to master. The lisp/ldefs-boot.el file should not be merged to master either, so it could be added to the - same commit or committed separately. + same commit or committed separately. To make sure the changes to + ChangeLog.N and etc/AUTHORS are _not_ skipped, do NOT describe their + updates as "regenerate" or "re-generate", since gitmerge.el by + default skips such commits; instead, use "update" or some such. The easiest way of doing that is "C-x v d ROOT-DIR RET", then go to the first modified file, press 'M' to mark all modified files, diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index d33f49a1aca..d873cac4269 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow @@ -138,6 +138,20 @@ When everything's done, look hard at the resulting merge. Skipping commits requires separate merges, so don't be surprised to see more than one merge commit. If you're happy, push. + +Long-lived feature branches +=========================== + +The conventions for formatting commit log messages set out in CONTRIBUTE +don't apply to commits made to feature branches. +Thus, feel free to commit little and often, with short and simple commit +messages. This practice can ease development by making 'git bisect' and +'git revert' more effective. + +The commit merging the feature branch to master, on the other hand, +should follow the usual commit log message conventions. + + Warnings about X11 forwarding ============================= diff --git a/configure.ac b/configure.ac index d1a5b63b924..3612cb8de78 100644 --- a/configure.ac +++ b/configure.ac @@ -7655,8 +7655,7 @@ send your change to bug-gnu-emacs@gnu.org])])]) AH_TOP([/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021 - Free Software Foundation, Inc. +Copyright (C) 1988-2024 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index dc0679ed3a1..e3d695b2347 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1057,7 +1057,7 @@ explains these conventions, starting with an example: @group ;;; foo.el --- Support for the Foo programming language -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2021 Your Name +;; Copyright (C) 2010-2024 Your Name @end group ;; Author: Your Name diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index dbe4da29d54..71d548f3cee 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -22355,7 +22355,7 @@ calling @code{nnmairix-search} with @samp{f:From}. @item G G o @kindex G G o @r{(Summary)} @findex nnmairix-goto-original-article -(Only in @code{nnmairix} groups!) Tries determine the group this article +(Only in @code{nnmairix} groups!) Tries to determine the group this article originally came from and displays the article in this group, so that, e.g., replying to this article the correct posting styles/group parameters are applied (@code{nnmairix-goto-original-article}). This diff --git a/etc/images/gud/README b/etc/images/gud/README index 6cdcce35fba..a3d083bf674 100644 --- a/etc/images/gud/README +++ b/etc/images/gud/README @@ -31,7 +31,7 @@ their copyright assignment included the icons. The following icons are converted from the Insight Windows style icon set in src/gdb/gdbtk/library/images2. -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2024 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) cont.pbm and cont.xpm were converted from continue.gif @@ -47,7 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING) The following icons are created from the Insight Windows style icon set in src/gdb/gdbtk/library/images2. -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2024 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) rcont.xpm rfinish.xpm diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 59d9c346424..82e99a2c920 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -3253,7 +3253,7 @@ for which LSP on-type-formatting should be requested." (try-completion pattern (funcall proxies))) ((eq action t) ; all-completions (let ((comps (funcall proxies))) - (dolist (c comps) (eglot--dumb-flex pattern c t)) + (dolist (c comps) (eglot--dumb-flex pattern c completion-ignore-case)) (all-completions "" comps diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index be5884604da..87ebe81ca4c 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -504,7 +504,7 @@ not be enclosed in { } or ( )." ;; ------------------------------------------------------------ ;; The following configurable variables are used in the -;; up-to-date overview . +;; up-to-date overview. ;; The standard configuration assumes that your `make' program ;; can be run in question/query mode using the `-q' option, this ;; means that the command @@ -514,12 +514,12 @@ not be enclosed in { } or ( )." ;; should return an exit status of zero if the target `foo' is ;; up to date and a nonzero exit status otherwise. ;; Many makes can do this although the docs/manpages do not mention -;; it. Try it with your favorite one. GNU make, System V make, and +;; it. Try it with your favorite one. GNU make, System V make, and ;; Dennis Vadura's DMake have no problems. ;; Set the variable `makefile-brave-make' to the name of the ;; make utility that does this on your system. ;; To understand what this is all about see the function definition -;; of `makefile-query-by-make-minus-q' . +;; of `makefile-query-by-make-minus-q'. ;; ------------------------------------------------------------ (defcustom makefile-brave-make "make" @@ -787,7 +787,7 @@ Makefile mode can be configured by modifying the following variables: to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\". `makefile-special-targets-list': - List of special targets. You will be offered to complete + List of special targets. You will be offered to complete on one of those in the minibuffer whenever you enter a `.'. at the beginning of a line in Makefile mode." (add-hook 'completion-at-point-functions @@ -1583,7 +1583,7 @@ and generates the overview, one line per target name." (goto-char (point-min)) (if (re-search-forward "^\\(\t+$\\| +\t\\)" nil t) (not (y-or-n-p - (format "Suspicious line %d. Save anyway? " + (format "Suspicious line %d. Save anyway?" (count-lines (point-min) (point))))))))) (defun makefile-warn-continuations () @@ -1592,7 +1592,7 @@ and generates the overview, one line per target name." (goto-char (point-min)) (if (re-search-forward "\\\\[ \t]+$" nil t) (not (y-or-n-p - (format "Suspicious continuation in line %d. Save anyway? " + (format "Suspicious continuation in line %d. Save anyway?" (count-lines (point-min) (point))))))))) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 89444f0208e..3f89de14075 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -83,7 +83,7 @@ ;;; Install treesitter language parsers (defvar php-ts-mode--language-source-alist - '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.5")) + '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.8" "php/src")) (phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc")) (html . ("https://github.com/tree-sitter/tree-sitter-html" "v0.20.3")) (javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.21.2")) @@ -509,7 +509,7 @@ characters of the current line." (if (search-forward "" end-html t 1) 0 (+ (point) php-ts-mode-indent-offset)))) - ;; Maybe it's better to use bol, read the documentation!!! + ;; Maybe it's better to use bol? (treesit-node-start parent)))) (defun php-ts-mode--array-element-heuristic (_node parent _bol &rest _) @@ -728,7 +728,7 @@ characters of the current line." '("abstract" "and" "array" "as" "break" "callable" "case" "catch" "class" "clone" "const" "continue" "declare" "default" "do" "echo" "else" "elseif" "enddeclare" "endfor" "endforeach" "endif" - "endswitch" "endwhile" "enum" "extends" "final" "finally" "fn" + "endswitch" "endwhile" "enum" "exit" "extends" "final" "finally" "fn" "for" "foreach" "from" "function" "global" "goto" "if" "implements" "include" "include_once" "instanceof" "insteadof" "interface" "list" "match" "namespace" "new" "null" "or" "print" "private" @@ -762,6 +762,12 @@ characters of the current line." "E_COMPILE_WARNING" "E_USER_ERROR" "E_USER_WARNING" "E_USER_NOTICE" "E_DEPRECATED" "E_USER_DEPRECATED" "E_ALL" "E_STRICT" + ;; math constant + "M_PI" "M_E" "M_LOG2E" "M_LOG10E" "M_LN2" "M_LN10" "M_PI_2" + "M_PI_4" "M_1_PI" "M_2_PI" "M_SQRTPI" "M_2_SQRTPI" "M_SQRT2" + "M_SQRT3" "M_SQRT1_2" "M_LNPI" "M_EULER" "PHP_ROUND_HALF_UP" + "PHP_ROUND_HALF_DOWN" "PHP_ROUND_HALF_EVEN" "PHP_ROUND_HALF_ODD" + "NAN" "INF" ;; magic constant "__COMPILER_HALT_OFFSET__" "__CLASS__" "__DIR__" "__FILE__" "__FUNCTION__" "__LINE__" "__METHOD__" "__NAMESPACE__" "__TRAIT__") @@ -785,26 +791,23 @@ characters of the current line." :feature 'constant `((boolean) @font-lock-constant-face (null) @font-lock-constant-face - ;; predefined constant or built in constant + ;; predefined constant or built in constant (part of PHP core) ((name) @font-lock-builtin-face (:match ,(rx-to-string `(: bos (or ,@php-ts-mode--predefined-constant) eos)) @font-lock-builtin-face)) ;; user defined constant ((name) @font-lock-constant-face - (:match "\\`_?[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face)) + (:match "\\`_*[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face)) (const_declaration (const_element (name) @font-lock-constant-face)) - (relative_scope "self") @font-lock-builtin-face ;; declare directive (declare_directive ["strict_types" "encoding" "ticks"] @font-lock-constant-face)) :language 'php :feature 'name - `((goto_statement (name) @font-lock-constant-face) - (named_label_statement (name) @font-lock-constant-face) - (expression_statement (name) @font-lock-keyword-face - (:equal "exit" @font-lock-keyword-face))) + '((goto_statement (name) @font-lock-constant-face) + (named_label_statement (name) @font-lock-constant-face)) :language 'php ;;:override t @@ -813,19 +816,21 @@ characters of the current line." :language 'php :feature 'operator - `([,@php-ts-mode--operators] @font-lock-operator-face) + `((error_suppression_expression "@" @font-lock-keyword-face) + [,@php-ts-mode--operators] @font-lock-operator-face) :language 'php :feature 'variable-name :override t - `(((name) @font-lock-keyword-face (:equal "this" @font-lock-keyword-face)) + '(((name) @font-lock-keyword-face (:equal "this" @font-lock-keyword-face)) (variable_name (name) @font-lock-variable-name-face) + (relative_scope ["parent" "self" "static"] @font-lock-builtin-face) + (relative_scope) @font-lock-constant-face (dynamic_variable_name (name) @font-lock-variable-name-face) (member_access_expression name: (_) @font-lock-variable-name-face) (scoped_property_access_expression - scope: (name) @font-lock-constant-face) - (error_suppression_expression (name) @font-lock-variable-name-face)) + scope: (name) @font-lock-constant-face)) :language 'php :feature 'string @@ -850,7 +855,8 @@ characters of the current line." :language 'php :feature 'type :override t - '((union_type) @font-lock-type-face + '((union_type "|" @font-lock-operator-face) + (union_type) @font-lock-type-face (bottom_type) @font-lock-type-face (primitive_type) @font-lock-type-face (cast_type) @font-lock-type-face @@ -883,17 +889,18 @@ characters of the current line." ("=>") @font-lock-keyword-face (object_creation_expression (name) @font-lock-type-face) + (namespace_name_as_prefix "\\" @font-lock-delimiter-face) (namespace_name_as_prefix (namespace_name (name)) @font-lock-type-face) (namespace_use_clause (name) @font-lock-property-use-face) (namespace_aliasing_clause (name) @font-lock-type-face) + (namespace_name "\\" @font-lock-delimiter-face) (namespace_name (name) @font-lock-type-face) (use_declaration (name) @font-lock-property-use-face)) :language 'php :feature 'function-scope :override t - '((relative_scope) @font-lock-constant-face - (scoped_call_expression + '((scoped_call_expression scope: (name) @font-lock-constant-face) (class_constant_access_expression (name) @font-lock-constant-face)) diff --git a/lisp/treesit.el b/lisp/treesit.el index 86dc4733d37..234ef9159de 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -689,32 +689,55 @@ PARSER." (push (if with-host (cons parser host-parser) parser) res)))) (nreverse res))) +(defun treesit--cleanup-local-range-overlays (modified-tick beg end) + "Cleanup overlays used to mark local parsers between BEG and END. + +For every local parser overlay between BEG and END, if its +`treesit-parser-ov-timestamp' is smaller than MODIFIED-TICK, delete +it." + (dolist (ov (overlays-in beg end)) + (when-let ((ov-timestamp + (overlay-get ov 'treesit-parser-ov-timestamp))) + (when (< ov-timestamp modified-tick) + (when-let ((local-parser (overlay-get ov 'treesit-parser))) + (treesit-parser-delete local-parser)) + (delete-overlay ov))))) + (defun treesit--update-ranges-local - (query embedded-lang &optional beg end) + (query embedded-lang modified-tick &optional beg end) "Update range for local parsers between BEG and END. Use QUERY to get the ranges, and make sure each range has a local -parser for EMBEDDED-LANG." - ;; Clean up. - (dolist (ov (overlays-in (or beg (point-min)) (or end (point-max)))) - (when-let ((parser (overlay-get ov 'treesit-parser))) - (when (eq (overlay-start ov) (overlay-end ov)) - (delete-overlay ov) - (treesit-parser-delete parser)))) +parser for EMBEDDED-LANG. + +The local parser is stored in an overlay, in the `treesit-parser' +property, the host parser is stored in the `treesit-host-parser' +property. + +When this function touches an overlay, it sets the +`treesit-parser-ov-timestamp' property of the overlay to +MODIFIED-TICK. This will help Emacs garbage-collect overlays that +aren't in use anymore." ;; Update range. (let* ((host-lang (treesit-query-language query)) (host-parser (treesit-parser-create host-lang)) (ranges (treesit-query-range host-parser query beg end))) (pcase-dolist (`(,beg . ,end) ranges) (let ((has-parser nil)) - (dolist (ov (overlays-in beg end)) - ;; Update range of local parser. - (let ((embedded-parser (overlay-get ov 'treesit-parser))) - (when (and (treesit-parser-p embedded-parser) - (eq (treesit-parser-language embedded-parser) - embedded-lang)) - (treesit-parser-set-included-ranges - embedded-parser `((,beg . ,end))) - (setq has-parser t)))) + (setq + has-parser + (catch 'done + (dolist (ov (overlays-in beg end) nil) + ;; Update range of local parser. + (when-let* ((embedded-parser (overlay-get ov 'treesit-parser)) + (parser-lang (treesit-parser-language + embedded-parser))) + (when (eq parser-lang embedded-lang) + (treesit-parser-set-included-ranges + embedded-parser `((,beg . ,end))) + (move-overlay ov beg end) + (overlay-put ov 'treesit-parser-ov-timestamp + modified-tick) + (throw 'done t)))))) ;; Create overlay and local parser. (when (not has-parser) (let ((embedded-parser (treesit-parser-create @@ -722,6 +745,8 @@ parser for EMBEDDED-LANG." (ov (make-overlay beg end nil nil t))) (overlay-put ov 'treesit-parser embedded-parser) (overlay-put ov 'treesit-host-parser host-parser) + (overlay-put ov 'treesit-parser-ov-timestamp + modified-tick) (treesit-parser-set-included-ranges embedded-parser `((,beg . ,end))))))))) @@ -729,40 +754,44 @@ parser for EMBEDDED-LANG." "Update the ranges for each language in the current buffer. If BEG and END are non-nil, only update parser ranges in that region." - ;; When updating ranges, we want to avoid querying the whole buffer - ;; which could be slow in very large buffers. Instead, we only - ;; query for nodes that intersect with the region between BEG and - ;; END. Also, we only update the ranges intersecting BEG and END; - ;; outside of that region we inherit old ranges. - (dolist (setting treesit-range-settings) - (let ((query (nth 0 setting)) - (language (nth 1 setting)) - (local (nth 2 setting)) - (offset (nth 3 setting)) - (beg (or beg (point-min))) - (end (or end (point-max)))) - (cond - ((functionp query) (funcall query beg end)) - (local - (treesit--update-ranges-local query language beg end)) - (t - (let* ((host-lang (treesit-query-language query)) - (parser (treesit-parser-create language)) - (old-ranges (treesit-parser-included-ranges parser)) - (new-ranges (treesit-query-range - host-lang query beg end offset)) - (set-ranges (treesit--clip-ranges - (treesit--merge-ranges - old-ranges new-ranges beg end) - (point-min) (point-max)))) - (dolist (parser (treesit-parser-list nil language)) + (let ((modified-tick (buffer-chars-modified-tick)) + (beg (or beg (point-min))) + (end (or end (point-max)))) + ;; When updating ranges, we want to avoid querying the whole buffer + ;; which could be slow in very large buffers. Instead, we only + ;; query for nodes that intersect with the region between BEG and + ;; END. Also, we only update the ranges intersecting BEG and END; + ;; outside of that region we inherit old ranges. + (dolist (setting treesit-range-settings) + (let ((query (nth 0 setting)) + (language (nth 1 setting)) + (local (nth 2 setting)) + (offset (nth 3 setting))) + (cond + ((functionp query) (funcall query beg end)) + (local + (treesit--update-ranges-local + query language modified-tick beg end)) + (t + (let* ((host-lang (treesit-query-language query)) + (parser (treesit-parser-create language)) + (old-ranges (treesit-parser-included-ranges parser)) + (new-ranges (treesit-query-range + host-lang query beg end offset)) + (set-ranges (treesit--clip-ranges + (treesit--merge-ranges + old-ranges new-ranges beg end) + (point-min) (point-max)))) + (dolist (parser (treesit-parser-list nil language)) (treesit-parser-set-included-ranges parser (or set-ranges ;; When there's no range for the embedded ;; language, set it's range to a dummy (1 ;; . 1), otherwise it would be set to the ;; whole buffer, which is not what we want. - `((,(point-min) . ,(point-min)))))))))))) + `((,(point-min) . ,(point-min))))))))))) + + (treesit--cleanup-local-range-overlays modified-tick beg end))) (defun treesit-parser-range-on (parser beg &optional end) "Check if PARSER's range covers the portion between BEG and END. @@ -2214,8 +2243,15 @@ What constitutes as text and source code sexp is determined by `text' and `sexp' in `treesit-thing-settings'." (interactive "^p") (let ((arg (or arg 1)) - (pred (or treesit-sexp-type-regexp 'sexp))) - (or (when (treesit-node-match-p (treesit-node-at (point)) 'text t) + (pred (or treesit-sexp-type-regexp 'sexp)) + (node-at-point + (treesit-node-at (point) (treesit-language-at (point))))) + (or (when (and node-at-point + ;; Make sure point is strictly inside node. + (< (treesit-node-start node-at-point) + (point) + (treesit-node-end node-at-point)) + (treesit-node-match-p node-at-point 'text t)) (forward-sexp-default-function arg) t) (if (> arg 0) diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in index 18403250875..4225cc72bcc 100644 --- a/msdos/autogen/Makefile.in +++ b/msdos/autogen/Makefile.in @@ -13,7 +13,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ # Generated by gnulib-tool. # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in index ed217887c5d..5ef3da1c537 100644 --- a/nt/emacs.rc.in +++ b/nt/emacs.rc.in @@ -31,7 +31,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2024\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in index c061f06528e..b5f865c6092 100644 --- a/nt/emacsclient.rc.in +++ b/nt/emacsclient.rc.in @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "EmacsClient\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2024\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/test/lisp/which-key-tests.el b/test/lisp/which-key-tests.el index 3b42a7bd504..27081bc5565 100644 --- a/test/lisp/which-key-tests.el +++ b/test/lisp/which-key-tests.el @@ -1,6 +1,6 @@ ;;; which-key-tests.el --- Tests for which-key.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2021 Free Software Foundation, Inc. +;; Copyright (C) 2017-2024 Free Software Foundation, Inc. ;; Author: Justin Burkett ;; Maintainer: Justin Burkett