From 481ad70d5cb5ef68a456152a6bab88e27f9bd319 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 26 Dec 2025 10:20:45 -0800 Subject: [PATCH] December 2025 spelling fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of the fixes are to continue to use American rather than British spelling. * doc/misc/modus-themes.org (my-modus-themes-engraved-faces): Fix misspelled ‘:foreground’s. * etc/themes/modus-themes.el (modus-themes-faces): Fix misspelled ‘modus-themes-bold’. * lisp/emacs-lisp/rx.el (rx--normalize-char-pattern): Rename from rx--normalise-char-pattern. (rx--optimize-or-args): Rename from rx--optimise-or-args. * lisp/frame.el (frame--special-parameters): Fix misspelled "right-divider-width". * lisp/net/tramp.el (tramp-fingerprint-prompt-regexp): Use American spelling “centered”, to match current libfprintf. * lisp/org/org-fold-core.el (org-fold-core--optimize-for-huge-buffers): Rename from org-fold-core--optimise-for-huge-buffers. (org-fold-core-update-optimization): Rename from org-fold-core-update-optimisation, leaving an alias behind. (org-fold-core-remove-optimization): Rename from org-fold-core-remove-optimisation, leaving an alias behind. * lisp/org/org.el (org-advertized-archive-subtree): This alias is now obsolete. * lisp/play/zone.el (zone-ignored-buffers): Fix misspelling of ‘zone--buffer-encrypted-p’. * lisp/progmodes/csharp-mode.el (csharp-ts-mode-faces): Fix misspelling of ‘csharp’ group. * lisp/vc/vc.el (vc-clonable-backends-custom-type): Rename from vc-cloneable-backends-custom-type, leaving an alias behind. * test/lisp/emacs-lisp/bytecomp-tests.el: (bytecomp-tests--warn-arity-non-compiled-callee): Rename from bytecomp-tests--warn-arity-noncompiled-callee. (bytecomp-test-defface-spec): Reword a deliberate misspelling of “default” that is so common I don’t want it to pollute the spelling dictionary. * test/lisp/emacs-lisp/package-vc-tests.el: (package-vc-tests-preserve-artifacts): Rename from package-vc-tests-preserve-artifacts. * test/lisp/eshell/em-prompt-tests.el: (em-prompt-test/forward-backward-paragraph-1): Reword a deliberate misspelling of “goodbye” that is so common I don’t want it to pollute the spelling dictionary. --- ChangeLog.3 | 8 +-- ChangeLog.4 | 36 ++++++------- admin/notes/java | 2 +- doc/emacs/maintaining.texi | 2 +- doc/emacs/modes.texi | 2 +- doc/emacs/vc1-xtra.texi | 4 +- doc/misc/cc-mode.texi | 4 +- doc/misc/cl.texi | 2 +- doc/misc/erc.texi | 2 +- doc/misc/ert.texi | 2 +- doc/misc/eww.texi | 2 +- doc/misc/modus-themes.org | 8 +-- doc/misc/transient.texi | 4 +- etc/EGLOT-NEWS | 2 +- etc/ERC-NEWS | 4 +- etc/NEWS | 12 ++--- etc/NEWS.30 | 2 +- etc/ORG-NEWS | 2 +- etc/images/symbols/README | 2 +- etc/themes/modus-themes.el | 6 +-- lisp/ChangeLog.12 | 2 +- lisp/battery.el | 2 +- lisp/dired.el | 2 +- lisp/doc-view.el | 2 +- lisp/editorconfig-fnmatch.el | 4 +- lisp/elec-pair.el | 10 ++-- lisp/emacs-lisp/byte-opt.el | 4 +- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/emacs-lisp/cl-seq.el | 2 +- lisp/emacs-lisp/comp-cstr.el | 4 +- lisp/emacs-lisp/elisp-scope.el | 6 +-- lisp/emacs-lisp/package-vc.el | 4 +- lisp/emacs-lisp/rx.el | 44 ++++++++-------- lisp/erc/erc.el | 2 +- lisp/eshell/eshell.el | 2 +- lisp/ffap.el | 2 +- lisp/frame.el | 2 +- lisp/international/characters.el | 2 +- lisp/jsonrpc.el | 4 +- lisp/leim/quail/burmese.el | 2 +- lisp/leim/quail/greek.el | 2 +- lisp/minibuffer.el | 4 +- lisp/net/nsm.el | 4 +- lisp/net/tramp-sh.el | 2 +- lisp/net/tramp-smb.el | 2 +- lisp/net/tramp.el | 8 +-- lisp/org/ChangeLog.1 | 2 +- lisp/org/oc-basic.el | 2 +- lisp/org/ol.el | 2 +- lisp/org/org-fold-core.el | 50 +++++++++++-------- lisp/org/org-plot.el | 8 +-- lisp/org/org.el | 19 +++---- lisp/org/ox.el | 2 +- lisp/play/zone.el | 2 +- lisp/progmodes/antlr-mode.el | 8 +-- lisp/progmodes/c-ts-common.el | 4 +- lisp/progmodes/c-ts-mode.el | 2 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/csharp-mode.el | 4 +- lisp/progmodes/eglot.el | 6 +-- lisp/progmodes/elisp-mode.el | 2 +- lisp/progmodes/flymake.el | 4 +- lisp/progmodes/hideshow.el | 2 +- lisp/progmodes/lua-mode.el | 6 +-- lisp/pulse.el | 4 +- lisp/replace.el | 2 +- lisp/simple.el | 2 +- lisp/so-long.el | 16 +++--- lisp/system-taskbar.el | 2 +- lisp/textmodes/markdown-ts-mode.el | 2 +- lisp/transient.el | 2 +- lisp/treesit.el | 10 ++-- lisp/url/url-http.el | 2 +- lisp/vc/diff-mode.el | 2 +- lisp/vc/vc-dispatcher.el | 2 +- lisp/vc/vc-hooks.el | 2 +- lisp/vc/vc.el | 9 ++-- lisp/windmove.el | 8 +-- src/dispnew.c | 2 +- src/editfns.c | 4 +- src/frame.c | 2 +- src/lread.c | 2 +- src/nsterm.m | 4 +- src/print.c | 2 +- src/regex-emacs.c | 2 +- src/treesit.c | 16 +++--- src/treesit.h | 2 +- src/w32fns.c | 2 +- src/window.c | 2 +- src/xdisp.c | 6 +-- test/lisp/calendar/todo-mode-tests.el | 2 +- test/lisp/completion-preview-tests.el | 2 +- test/lisp/emacs-lisp/bytecomp-tests.el | 10 ++-- test/lisp/emacs-lisp/package-vc-tests.el | 18 +++---- .../resources/base/modes/speaker-status.eld | 2 +- .../resources/services/regain/taken-ghost.eld | 2 +- .../services/regain/taken-regain.eld | 2 +- test/lisp/eshell/em-prompt-tests.el | 4 +- test/lisp/net/tramp-tests.el | 2 +- test/lisp/progmodes/cperl-mode-tests.el | 2 +- .../elixir-ts-mode-resources/indent.erts | 2 +- .../textmodes/ispell-tests/ispell-tests.el | 36 ++++++------- test/lisp/vc/diff-mode-tests.el | 4 +- test/lisp/vc/log-edit-tests.el | 2 +- test/manual/etags/merc-src/accumulator.m | 2 +- test/src/editfns-tests.el | 2 +- test/src/treesit-tests.el | 2 +- 107 files changed, 289 insertions(+), 279 deletions(-) diff --git a/ChangeLog.3 b/ChangeLog.3 index 7bf40eca0c0..9dfcffd3cb0 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -5864,7 +5864,7 @@ * doc/lispref/symbols.texi (Shorthand, Exceptions): New subsubsection. - * src/lread.c (read1): Exempt punctionation-only symbols from + * src/lread.c (read1): Exempt punctuation-only symbols from oblookup_considering_shorthand. * test/lisp/progmodes/elisp-mode-tests.el @@ -74080,7 +74080,7 @@ * lisp/emacs-lisp/bytecomp.el (byte-compile-associative): Rename to... (byte-compile-variadic-numeric): ...this function and simplify, fixing incorrect comments. The 3-arg strength reduction is now - always done in the optimisers and is no longer needed here. + always done in the optimizers and is no longer needed here. (byte-compile-min-max): New function. (byte-compile-minus): Simplify, remove incorrect comment, and use byte-compile-variadic-numeric. @@ -115589,7 +115589,7 @@ * lisp/progmodes/hideif.el (hide-ifdef-mode-prefix-key): Make into a defcustom since it seems like this is something that should be - user-customisable (bug#8922). + user-customizable (bug#8922). 2019-08-21 Lars Ingebrigtsen @@ -131651,7 +131651,7 @@ cache. (c-parse-ps-state-below): Use the new function c-state-semi-trim-cache. (c-before-change-check-<>-operators): Check simply for < or > in the - neighbourhood before doing more expensive processing. + neighborhood before doing more expensive processing. (c-maybe-re-mark-raw-string): Give a backward search limit to an operation which was needlessly lacking one. diff --git a/ChangeLog.4 b/ChangeLog.4 index 0271c67981a..1892ed78d1f 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -4161,7 +4161,7 @@ 2024-07-15 Michael Albinus - Adapt tressitter tests on EMBA + Adapt treesitter tests on EMBA * test/infra/Makefile.in (TREE-SITTER-FILES): Simplify. @@ -31670,7 +31670,7 @@ 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 + problems, and compensate for a missed-optimization bug in LLVM where switches sometimes forget to use variable range information (reported in https://github.com/llvm/llvm-project/issues/76085). @@ -41085,7 +41085,7 @@ 2023-09-27 Wilhelm H Kirschbaum - Fix treesit-langauge-at-point for elixir-ts-mode. + Fix treesit-language-at-point for elixir-ts-mode. The treesit-language-at-point function is only suppose to query the host language. @@ -63312,7 +63312,7 @@ 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 + compiler autovectorization improvements that might cause instructions that require aligned addresses to be emitted, and should also work with an address sanitizer enabled. @@ -75655,7 +75655,7 @@ but never did so because of a coding mistake (eq instead of equal), found by a recently added warning. They weren't actually needed - thanks to the optimiser's fixpoint iteration: we eventually get the + thanks to the optimizer's fixpoint iteration: we eventually get the same results through (if X nil t) -> (if (not X) t nil) -> (if (not X) t) -> (not X) @@ -75904,7 +75904,7 @@ but never did so because of a coding mistake (eq instead of equal), found by a recently added warning. They weren't actually needed - thanks to the optimiser's fixpoint iteration: we eventually get the + thanks to the optimizer's fixpoint iteration: we eventually get the same results through (if X nil t) -> (if (not X) t nil) -> (if (not X) t) -> (not X) @@ -98166,7 +98166,7 @@ but never did so because of a coding mistake (eq instead of equal), found by a recently added warning. They weren't actually needed - thanks to the optimiser's fixpoint iteration: we eventually get the + thanks to the optimizer's fixpoint iteration: we eventually get the same results through (if X nil t) -> (if (not X) t nil) -> (if (not X) t) -> (not X) @@ -99787,7 +99787,7 @@ Replace `|` with `||` to explicitly introduce sequence points since the variables, `length` and `nskip`, are mutated more than once. - The `|` was just a weak attempt at micro-optimisation in any case; + The `|` was just a weak attempt at micro-optimization in any case; sorry about that. 2022-12-05 Yuan Fu @@ -105719,7 +105719,7 @@ * src/treesit.c (treesit_find_override_name) (treesit_load_language_push_for_each_suffix, treesit_load_language) - (Ftreesit_langauge_available_p, treesit_record_change) + (Ftreesit_language_available_p, treesit_record_change) (make_treesit_parser, make_treesit_node, make_treesit_query) (Ftreesit_parser_create, Ftreesit_parser_delete, Ftreesit_parser_list) (treesit_check_range_argument, Ftreesit_parser_included_ranges) @@ -110037,7 +110037,7 @@ Better signal data for treesit-load-language-error * src/treesit.c (ts_load_language): Better formatted signal data, - (Ftreesit_langauge_available_p): Optionally return the signal data if + (Ftreesit_language_available_p): Optionally return the signal data if language not available. * doc/lispref/parsing.texi: Document the signal data in detail. @@ -110153,7 +110153,7 @@ * src/treesit.h (struct Lisp_TS_Query): Add two new field. * src/treesit.c (ts_load_language): Return signal symbol and data rather than signaling itself. - (Ftreesit_langauge_available_p) + (Ftreesit_language_available_p) (Ftreesit_parser_create): Update usage of ts_load_language (make_ts_query): Now returns a lisp object. @@ -140625,7 +140625,7 @@ Fix drag-and-drop of files with multibyte filenames - * lisp/dired.el (dired-mouse-drag): Fix re-signalling of errors. + * lisp/dired.el (dired-mouse-drag): Fix re-signaling of errors. * lisp/select.el (xselect-convert-to-filename): (xselect-convert-to-text-uri-list): @@ -154980,7 +154980,7 @@ * doc/misc/ses.texi (The Basics): Document that ses-jump may be customized. - (Customizing @acronym{SES}): Document new customisations for ses-jump. + (Customizing @acronym{SES}): Document new customizations for ses-jump. * lisp/ses.el (ses-jump-cell-name-function) (ses-jump-prefix-function): New defcustoms. @@ -157179,7 +157179,7 @@ Make eshell link faces more distinctive on 8-color displays * lisp/eshell/em-ls.el (eshell-ls-directory): - (eshell-ls-symlink): Make the faces be distinctive on 8-colour + (eshell-ls-symlink): Make the faces be distinctive on 8-color displays (bug#43615). 2022-03-22 dickmao @@ -167362,7 +167362,7 @@ 2022-01-24 Mattias Engdegård - Byte code arity check micro-optimisation + Byte code arity check micro-optimization * src/bytecode.c (exec_byte_code): Slight simplification. @@ -185159,7 +185159,7 @@ (gen-clean): Delete it. * admin/unidata/README (https): Note the source for the Unicode - file that has emoji categorisations. + file that has emoji categorizations. * admin/unidata/emoji-test.txt: Import another Unicode file. @@ -193726,7 +193726,7 @@ use-package--foo--pre-config-hook use-package--foo--post-config-hook - This should make config customisations more predictable (for example, spacemacs + This should make config customizations more predictable (for example, spacemacs uses these hooks extensively to allow 'layers' to be customized). I got rid of the "special" default value for :config, because it doesn't seem to @@ -199850,7 +199850,7 @@ Instead of testing the length of each form passed to :custom-face, the sanity check would test the number of forms passed to :custom-face, - causing it to fail when more than 2 face customisations are used. + causing it to fail when more than 2 face customizations are used. Fixes https://github.com/jwiegley/use-package/issues/600. diff --git a/admin/notes/java b/admin/notes/java index 9a7c925e123..6895632be32 100644 --- a/admin/notes/java +++ b/admin/notes/java @@ -453,7 +453,7 @@ See http://docs.oracle.com/en/java/javase/19/docs/specs/jni/intro.html for more details. Java does not support `goto' statements, which it defines as reserved -identifiers but does not assign any syntatic role. If you are in a +identifiers but does not assign any syntactic role. If you are in a position where you must exercise `goto' to exit a block prematurely, you may define the block and exit it with a named `break' statement, thus: diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 29e05ba17e5..52ed05c443d 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -573,7 +573,7 @@ after popping up the @file{*vc-log*} buffer to allow you to type a suitable commit log message. Once you type @kbd{C-x v v}, the fileset or patches cannot be changed -without first cancelling the commit by typing @kbd{C-c C-k} in the +without first canceling the commit by typing @kbd{C-c C-k} in the @file{*vc-log*} buffer. For example, if you change which files are marked in the @file{*vc-dir*} buffer after Emacs has already popped up the @file{*vc-log*} buffer, the old fileset will remain in effect for diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index b5049ccbd01..57ede2fe760 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -520,7 +520,7 @@ remapping from @code{c-mode} to @code{c-ts-mode} (if you enable the latter). By default, this option's value is @code{nil}, so no tree-sitter based modes are enabled. -Enabling a tree-stter based mode means that visiting files in the +Enabling a tree-sitter based mode means that visiting files in the corresponding programming language will automatically turn on that mode, instead of any non-tree-sitter based modes for the same language. For example, if you enable @code{c-ts-mode}, visiting C source files will diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 6f1face7f40..48c06743195 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -246,7 +246,7 @@ another (@code{vc-log-mergebase}). @c This definition is possibly dVCS-specific -- can revisions exist on @c more than one branch for older VCS? This needs thinking through if -@c any of our centalized VCS gain support for these commands. +@c any of our centralized VCS gain support for these commands. The @dfn{merge base} of two branches is the most recent revision that exists on both branches. If neither of the branches was ever merged into the other (@pxref{Merging}), then the merge base is the revision @@ -412,7 +412,7 @@ Ordinary VC commands like @kbd{C-x v v} (@pxref{Basic VC Editing}) and when there exist other working trees, except that the commits, branches and other VC artifacts they create will be visible from all working trees. Another way to put this is that any action taken in any working -tree which creates new artefacts in the VCS backing store will be +tree which creates new artifacts in the VCS backing store will be visible from other working trees, but actions which only affect workfiles won't be. So if you apply a patch to some workfiles in one working tree, that only affects that working tree. But if you commit diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index fe93bc759b2..af365cd9ad3 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -6217,7 +6217,7 @@ to perform indentation. @defun c-lineup-item-after-paren-at-boi @findex lineup-item-after-paren-at-boi (c-) Line up under the first entry on the same line as an open parenthesis -when that parenthesis is the lefmost non-space character in its line. +when that parenthesis is the leftmost non-space character in its line. For example: @example @@ -6996,7 +6996,7 @@ the_larch, @hereFn{c-lineup-topmost-intro-cont} @defun c-lineup-class-field-cont @findex lineup-class-field-cont (c-) -Indent continutation lines zero or one @code{c-basic-offset} steps. +Indent continuation lines zero or one @code{c-basic-offset} steps. This is intended for continuation lines within a class/struct etc. construct. For a declaration following a template specification, zero steps are used. Other constructs are indented one step. diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 6400fc6ece4..5e4caac59f6 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -3985,7 +3985,7 @@ the specified slots, such as @code{:first-name}, @code{:age}, and @code{:sex}. These keyword arguments specify the initial values for the respective slots in the new object. If a keyword argument is not provided, the slot is initialized to @code{nil}.@footnote{This behavior -differs from Common Lisp, where an unitialized slot would be left as +differs from Common Lisp, where an uninitialized slot would be left as ``undefined''.} In the example below, we create a new instance of the @code{person} diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 8ef027c8f04..32a0820a0b9 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -663,7 +663,7 @@ its mode variable has a local binding in all affected buffers @end enumerate In keeping with this, all built-in local modules disable themselves in -nonapplicable buffers rather than remain no-ops. Some also take strides +inapplicable buffers rather than remain no-ops. Some also take strides to enable themselves elsewhere when needed or at least emit a helpful error. For example, the @samp{nicks} module does both in server buffers, where it shares resources among the target buffers it primarily diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 4007fb0d882..4826cd66778 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -52,7 +52,7 @@ just like the code under test, making it easy to write expressive and concise test cases. ERT has unique features that take advantage of the dynamic and -interactive nature of Emacs. It is unopinionated about when or how +interactive nature of Emacs. It has no opinion about when or how tests are written: you can use it to verify newly written code, reproduce known bugs, prevent regressions, or explore the behavior of complex systems. It can be used for both unit tests and larger diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi index b527e84f182..fbc4a4871bc 100644 --- a/doc/misc/eww.texi +++ b/doc/misc/eww.texi @@ -378,7 +378,7 @@ customizing @code{shr-blocked-images}. the ``ALT'' text of images instead. @vindex shr-sliced-image-height - To make scrolling up/down past images more intuititve, EWW splits + To make scrolling up/down past images more intuitive, EWW splits large images into several rows. This way, you can scroll individually past each slice, instead of jumping past the entire image. EWW slices images that take up more than @code{shr-sliced-image-height} of the diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 43983505576..d82dee6a46e 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -1634,12 +1634,12 @@ switch to another theme in the collection ([[#h:d87673fe-2ce1-4c80-a4b8-be36ca9f (ansi-color-magenta :short "ansi-magenta" :slug "anm" :foreground ,fg-term-magenta) (ansi-color-bright-yellow :short "ansi-bright-yellow" :slug "ANy" :foreground ,fg-term-yellow-bright) (ansi-color-bright-red :short "ansi-bright-red" :slug "ANr" :foreground ,fg-term-red-bright) - (ansi-color-bright-black :short "ansi-bright-black" :slug "ANb" :foregroun ,fg-term-black-bright) + (ansi-color-bright-black :short "ansi-bright-black" :slug "ANb" :foreground ,fg-term-black-bright) (ansi-color-bright-green :short "ansi-bright-green" :slug "ANg" :foreground ,fg-term-green-bright) (ansi-color-bright-blue :short "ansi-bright-blue" :slug "ANB" :foreground ,fg-term-blue-bright) (ansi-color-bright-cyan :short "ansi-bright-cyan" :slug "ANc" :foreground ,fg-term-cyan-bright) - (ansi-color-bright-white :short "ansi-bright-white" :slug "ANw" :foregroun ,fg-term-white-bright) - (ansi-color-bright-magenta :short "ansi-bright-magenta" :slug "ANm" :foregroun ,fg-term-magenta-bright))))))) + (ansi-color-bright-white :short "ansi-bright-white" :slug "ANw" :foreground ,fg-term-white-bright) + (ansi-color-bright-magenta :short "ansi-bright-magenta" :slug "ANm" :foreground ,fg-term-magenta-bright))))))) (add-hook 'enable-theme-functions #'my-modus-themes-engraved-faces) #+end_src @@ -5621,7 +5621,7 @@ more effective than trying to do the same with either red or blue (the latter is the least effective in that regard). When we need to work with several colors, it is always better to have -sufficient manoeuvring space, especially since we cannot pick arbitrary +sufficient maneuvering space, especially since we cannot pick arbitrary colors but only those that satisfy the accessibility objectives of the themes. diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi index d55244d0579..efd0d2cd3e9 100644 --- a/doc/misc/transient.texi +++ b/doc/misc/transient.texi @@ -879,7 +879,7 @@ This option controls whether key bindings of infix commands that do not match the respective command-line argument should be highlighted. For other infix commands this option has no effect. -This is mostly indended for autors of transient menus and disabled +This is mostly intended for authors of transient menus and disabled by default. When this option is non-@code{nil}, the key binding for an infix argument @@ -1702,7 +1702,7 @@ should be used. @end defun @defun transient-get-value -This function returns the value of the erant prefix. +This function returns the value of the current prefix. This function is intended to be used when setting up a menu and its suffixes. It is not intended to be used when a suffix command is diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS index b3edd77cacd..ce364254809 100644 --- a/etc/EGLOT-NEWS +++ b/etc/EGLOT-NEWS @@ -155,7 +155,7 @@ use this. ** Eglot uses an internal 'track-changes.el' library (bug#70077) -This should in theory help smoothen the Eglot's handling of events that +This should in theory help smooth the Eglot's handling of events that change the buffer. The library has been problematic in the past, let's hope we're past that phase. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 932b7a58aa7..5556e220d2d 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -68,8 +68,8 @@ ERC buffers as having been read. ** An arguably less distracting 'erc-nicks-track-faces' variant. Setting this option to t tells the 'track' module to have the mode-line indicator stick with the most recent speaker's face, even when they're -monologuing, instead of alternating between it and the highest ranked -'erc-track-faces-normal-list' member in a given message. +the only speaker, instead of alternating between it and the highest +ranked 'erc-track-faces-normal-list' member in a given message. ** Module 'querypoll' has left 'goodies' and moved in with 'notify'. The 'querypoll' module was initially placed in 'erc-goodies' even though diff --git a/etc/NEWS b/etc/NEWS index 22fe6a9d33f..f5d8a0a3c56 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -306,7 +306,7 @@ to extend the boundaries of the active region by dragging the mouse pointer. --- *** 'context-menu-mode' now includes a "Send to..." menu item. The menu item enables sending current file(s) or region text to external -(non-Emacs) applications or services. See send-to.el for customisations. +(non-Emacs) applications or services. See send-to.el for customizations. --- *** The mouse now drags lines in character increments again. @@ -315,7 +315,7 @@ dividing side-by-side windows now by default happens in increments of the corresponding frame's character size again. This is the behavior described in the manual and was the default behavior before 'window-resize-pixelwise' was added for Emacs 24.1. To drag in pixel -increments as with Emcas 24 through Emacs 30 you now have to set +increments as with Emacs 24 through Emacs 30 you now have to set 'window-resize-pixelwise' to t. ** Windows @@ -1539,7 +1539,7 @@ If 'page-delimiters' is set in 'whitespace-style', or the new minor mode 'whitespace-page-delimiters-mode' is on, the page delimiter characters ('^L') are displayed as a pretty horizontal line that spans the entire width of the window. The new 'whitespace-page-delimiter' face can be -used to customize the appearence. +used to customize the appearance. ** Bookmark @@ -2373,7 +2373,7 @@ The hardcoded '^' shortcut gets you back to the previous menu. --- *** New user option 'tmm-shortcut-inside-entry'. When non-nil, highlight the character shortcut in the menu entry's -string instead of preprending it and 'tmm-mid-prompt' to said entry. +string instead of prepending it and 'tmm-mid-prompt' to said entry. ** Foldout @@ -2827,7 +2827,7 @@ used to write notes. --- *** New handler that appends remember data in directory. The 'remember-append-in-data-directory' handler appends remember data in -a file, that file being choosen by the user through the minibuffer. +a file, that file being chosen by the user through the minibuffer. --- *** New prefix map for remember commands. @@ -3438,7 +3438,7 @@ on GNU/Linux systems. The display optimization where the combination 'TAB' characters + 'BACKSPACE' is used to move to a position on a TTY frame is now disabled by default and controlled by this variable; it can be set to non-nil -to keep the old behavior. This change is to accomodate screen +to keep the old behavior. This change is to accommodate screen readers. --- diff --git a/etc/NEWS.30 b/etc/NEWS.30 index dfe6c5cafe6..202ee030eb0 100644 --- a/etc/NEWS.30 +++ b/etc/NEWS.30 @@ -2807,7 +2807,7 @@ parsers with that tag. Note that passing nil as tag doesn't mean return all parsers, but rather "all parsers with no tags". *** New variable 'treesit-primary-parser'. -This variable should be set by multi-langauge major modes before calling +This variable should be set by multi-language major modes before calling 'treesit-major-mode-setup', in order for tree-sitter integration functionalities to operate correctly. diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 1a73eea5c91..445f01d9848 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -323,7 +323,7 @@ This is no longer the case. ~display-buffer-alist~ is fully obeyed. ~org-switch-to-buffer-other-window~ and ~org-no-popups~ are now deprecated. -*** Asynchronous code evaluatation in ~ob-shell~ +*** Asynchronous code evaluation in ~ob-shell~ Running shell blocks with the ~:session~ header freezes Emacs until execution completes. The new ~:async~ header allows users to continue diff --git a/etc/images/symbols/README b/etc/images/symbols/README index bcce6fc1f98..5914a8e48f9 100644 --- a/etc/images/symbols/README +++ b/etc/images/symbols/README @@ -44,7 +44,7 @@ Emacsen that cannot display SVG images. -The behaviour described above for setting the foreground color to match +The behavior described above for setting the foreground color to match the text has changed. It must now be set to `currentcolor', so the above sed commands are now: diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index 3bcc190b174..aead7859cb7 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el @@ -4386,7 +4386,7 @@ color that is combined with FG-FOR-BG." :foreground fg :weight ;; If we have `bold' specifically, we inherit the face of - ;; the same name. This allows the user to customise that + ;; the same name. This allows the user to customize that ;; face, such as to change its font family. (if (and weight (not (eq weight 'bold))) weight @@ -4682,7 +4682,7 @@ FG and BG are the main colors." `(font-latex-math-face ((,c :foreground ,constant))) `(font-latex-script-char-face ((,c :inherit modus-themes-bold :foreground ,builtin))) `(font-latex-sectioning-5-face ((,c :inherit modus-themes-bold :foreground ,fg-alt))) - `(font-latex-sedate-face ((,c :inherit mouds-themes-bold :foreground ,keyword))) + `(font-latex-sedate-face ((,c :inherit modus-themes-bold :foreground ,keyword))) `(font-latex-slide-title-face ((,c :inherit modus-themes-heading-1))) `(font-latex-string-face ((,c :foreground ,string))) `(font-latex-subscript-face ((,c :height 0.9))) @@ -7264,7 +7264,7 @@ are symbols of variables which define palettes commensurate with The optional CUSTOM-FACES and CUSTOM-VARIABLES are joined together with the `modus-themes-faces' and `modus-themes-custom-variables', respectively. A derivative theme defining those is thus overriding what -the Modus themess have by default. +the Modus themes have by default. Consult the manual for details on how to build a theme on top of the `modus-themes': Info node `(modus-themes) Build on top of the Modus themes'." diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 90eb8da691f..b5106f7b980 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -16027,7 +16027,7 @@ `c-backward-subword'. * progmodes/cc-subword.el: New functions and minor mode to handle - SillyCapsedStyleIndentifiers, contributed by Masatake YAMATO: + SillyCapsedStyleIdentifiers, contributed by Masatake YAMATO: (c-forward-subword, c-backward-subword, c-mark-subword) (c-kill-subword, c-backward-kill-subword, c-transpose-subwords) diff --git a/lisp/battery.el b/lisp/battery.el index a7962e046a0..7be01c7ebec 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -952,7 +952,7 @@ The following %-sequences are provided: %t Remaining time (to charge or discharge) in the form `h:min'" (let* ((os-name (car (split-string ;; We cannot use `system-type' because some BSD - ;; systems fall under the 'berkley-unix umbrella + ;; systems fall under the 'berkeley-unix umbrella ;; and we're trying to make the distinction ;; among them here. (battery--call-process-to-string "uname")))) diff --git a/lisp/dired.el b/lisp/dired.el index e400bccebd1..2a8b23b69b6 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -980,7 +980,7 @@ No guarantee is made about the position on the marked line. BODY must ensure this itself if it depends on this. Search starts at the beginning of the buffer, thus the car of the -returnede list corresponds to the line nearest to the buffer's bottom. +returned list corresponds to the line nearest to the buffer's bottom. This is also true for (positive and negative) integer values of ARG. diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 30536cb4c6c..811acf44dad 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -2114,7 +2114,7 @@ If FILE-NAME is nil, use the current file instead." (doc-view--pdf-outline file-name))))) (when outline (imenu-add-to-menubar "Outline")) ;; When the outline could not be made due to unavailability of the - ;; required program, or its absency from the document, return + ;; required program, or its absence from the document, return ;; 'unavailable'. (or outline 'unavailable))) diff --git a/lisp/editorconfig-fnmatch.el b/lisp/editorconfig-fnmatch.el index 7664ce23d17..ef2baebcf1a 100644 --- a/lisp/editorconfig-fnmatch.el +++ b/lisp/editorconfig-fnmatch.el @@ -36,7 +36,7 @@ ;; Test whether NAME match PATTERN. -;; PATTERN should be a shell glob pattern, and some zsh-like wildcard matchings +;; PATTERN should be a shell glob pattern, and some zsh-like wildcard matching ;; can be used: ;; * Matches any string of characters, except path separators (/) @@ -86,7 +86,7 @@ Matching ignores case if `case-fold-search' is non-nil. -PATTERN should be a shell glob pattern, and some zsh-like wildcard matchings can +PATTERN should be a shell glob pattern, and some zsh-like wildcard matching can be used: * Matches any string of characters, except path separators (/) diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 7c32e2521c5..11b0650962b 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -58,8 +58,8 @@ ignored and will not be inserted. In both string pairs forms, the first string pair must be a regular expression. -In comparation to character pairs, string pairs does not support -inserting pairs in regions and can not be deleted with +Unlike character pairs, string pairs do not support +inserting pairs in regions and cannot be deleted with `electric-pair-delete-pair', thus string pairs should be used only for multi-character pairs. @@ -97,8 +97,8 @@ ignored and will not be inserted. In both string pairs forms, the first string pair must be a regular expression. -In comparation to character pairs, string pairs does not support -inserting pairs in regions and can not be deleted with +Unlike character pairs, string pairs do not support +inserting pairs in regions and cannot be deleted with `electric-pair-delete-pair', thus string pairs should be used only for multi-character pairs. @@ -203,7 +203,7 @@ If non-nil and point is separated from a closing delimiter only by whitespace, then typing a closing delimiter of the same type does not insert that character but instead moves point to immediately after the already present closing delimiter. If the value of this variable is set -tothe symbol `chomp', then the whitespace moved over is deleted. If the +to the symbol `chomp', then the whitespace moved over is deleted. If the value is nil, typing a closing delimiter simply inserts it at point. The specific kind of whitespace skipped is given by the variable diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index d6686952aca..b8965d78615 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -2294,7 +2294,7 @@ If FOR-EFFECT is non-nil, the return value is assumed to be of no importance." ((and (eq 'byte-varref (car lap2)) (eq (cdr lap1) (cdr lap2)) (memq (car lap1) '(byte-varset byte-varbind)) - ;; Can't optimise away varref for DEFVAR_BOOL vars + ;; Can't optimize away varref for DEFVAR_BOOL vars ;; because what we put in might not be what we get out. (let ((tmp (memq (car (cdr lap2)) byte-boolean-vars))) (and @@ -2721,7 +2721,7 @@ If FOR-EFFECT is non-nil, the return value is assumed to be of no importance." (and (eq (car (car tmp)) 'byte-varref) (eq (cdr (car tmp)) (cdr lap1)) - ;; Can't optimise away varref for DEFVAR_BOOL vars + ;; Can't optimize away varref for DEFVAR_BOOL vars ;; because what we put in might not be what we get out. (not (memq (car (cdr lap1)) byte-boolean-vars)) (let ((newtag (byte-compile-make-tag))) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index dcf3fc66feb..f284bad46af 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -4078,7 +4078,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (defun byte-compile-cmp (form) "Compile calls to numeric comparisons such as `<', `=' etc." ;; Lisp-level transforms should already have reduced valid calls to 2 args, - ;; but optimisations may have been disabled. + ;; but optimizations may have been disabled. (let ((l (length form))) (cond ((= l 3) diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index e58f73109a4..f8f5332daea 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -134,7 +134,7 @@ the result of calling FUNCTION with zero arguments. This is the only case where FUNCTION is called with fewer than two arguments. If SEQ contains exactly one element and no :INITIAL-VALUE is -specified, then just return that element wihout calling FUNCTION. +specified, then just return that element without calling FUNCTION. If :FROM-END is non-nil, the reduction occurs from the back of the SEQ moving forward, and the order of arguments to the diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index 9c0dabb5bf0..03260157446 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -988,8 +988,8 @@ Non memoized version of `comp-cstr-intersection-no-mem'." (defun comp-cstr-= (dst op1 op2 nm-objs-h) "Constraint OP1 being = OP2 setting the result into DST. -NM-OBJS-H is an hash with all the immediates generated at compile time -which should not be rendered into compiled code." +NM-OBJS-H is an hash with all the immediate values generated at compile +time which should not be rendered into compiled code." (with-comp-cstr-accessors (cl-flet ((relax-cstr (cstr) (setf cstr (copy-sequence cstr)) diff --git a/lisp/emacs-lisp/elisp-scope.el b/lisp/emacs-lisp/elisp-scope.el index 81d19af983c..7224502710b 100644 --- a/lisp/emacs-lisp/elisp-scope.el +++ b/lisp/emacs-lisp/elisp-scope.el @@ -2277,7 +2277,7 @@ ARGS bound to the analyzed arguments." (elisp-scope-n statements))) (elisp-scope-define-macro-analyzer go (label) - ;; TODO: Change to a local macro defintion induced by `cl-tagbody'. + ;; TODO: Change to a local macro definition induced by `cl-tagbody'. (when-let* ((bare (elisp-scope--sym-bare label)) (pos (alist-get bare elisp-scope-label-alist)) (beg (elisp-scope--sym-pos label))) @@ -2818,12 +2818,12 @@ This function recursively analyzes Lisp forms (HEAD . TAIL), usually starting with a top-level form, by inspecting HEAD at each level: - If HEAD is a symbol with a non-nil `elisp-scope-analyzer' symbol - property, then the value of that property specifies a bespoke analzyer + property, then the value of that property specifies a bespoke analyzer function, AF, that is called as (AF HEAD . TAIL) to analyze the form. See more details about writing analyzer functions below. - If HEAD satisfies `functionp', which means it is a function in the - running Emacs session, analzye the form as a function call. + running Emacs session, analyze the form as a function call. - If HEAD is a safe macro (see `elisp-scope-safe-macro-p'), expand it and analyze the resulting form. diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 7cb4bfde51a..9093b9c21c3 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -74,7 +74,7 @@ the backend nor a repository URL that's recognized via The value must be a member of `vc-handled-backends' that supports the `clone' VC function." - :type vc-cloneable-backends-custom-type + :type vc-clonable-backends-custom-type :version "29.1") (defcustom package-vc-register-as-project t @@ -352,7 +352,7 @@ asynchronously." (when-let* (((null (alist-get :maintainer extras))) (main-file) (maintainers (lm-maintainers main-file))) - ;; Like in `pakcage-buffer-info', for backward + ;; Like in `package-buffer-info', for backward ;; compatibility, use a single cons-cell if there's ;; only one maintainer. (setf (alist-get :maintainer extras) diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 46311b5af02..a4a602b108d 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -289,23 +289,23 @@ Left-fold the list L, starting with X, by the binary function F." ;; (or "a" space (or "b" (+ nonl) word) "c") ;; -> (or (in "ab" space) (+ nonl) (in "c" word)) -;; FIXME: normalise `seq', both the construct and implicit sequences, +;; FIXME: normalize `seq', both the construct and implicit sequences, ;; so that they are flattened, adjacent strings concatenated, and ;; empty strings removed. That would give more opportunities for regexp-opt: ;; (or "a" (seq "ab" (seq "c" "d") "")) -> (or "a" "abcd") -;; FIXME: Since `rx--normalise-char-pattern' recurses through `or', `not' and +;; FIXME: Since `rx--normalize-char-pattern' recurses through `or', `not' and ;; `intersection', we may end up normalising subtrees multiple times ;; which wastes time (but should be idempotent). -;; One way to avoid this is to aggressively normalise the entire tree +;; One way to avoid this is to aggressively normalize the entire tree ;; before translating anything at all, but we must then recurse through ;; all constructs and probably copy them. -;; Such normalisation could normalise synonyms, eliminate `minimal-match' +;; Such normalization could normalize synonyms, eliminate `minimal-match' ;; and `maximal-match' and convert affected `1+' to either `+' or `+?' etc. ;; We would also consolidate the user-def lookup, both modern and legacy, ;; in one place. -(defun rx--normalise-char-pattern (form) +(defun rx--normalize-char-pattern (form) "Normalize FORM as a pattern matching a single-character. Characters become strings, `any' forms and character classes become `rx--char-alt' forms, user-definitions and `eval' forms are expanded, @@ -314,27 +314,27 @@ and `or', `not' and `intersection' forms are normalized recursively. A `rx--char-alt' form is shaped (rx--char-alt INTERVALS . CLASSES) where INTERVALS is a sorted list of disjoint nonadjacent intervals, each a cons of characters, and CLASSES an unordered list of unique -name-normalised character classes." +name-normalized character classes." (defvar rx--builtin-forms) (defvar rx--builtin-symbols) (cond ((consp form) (let ((op (car form)) (body (cdr form))) (cond ((memq op '(or |)) - ;; Normalise the constructor to `or' and the args recursively. - (cons 'or (mapcar #'rx--normalise-char-pattern body))) + ;; Normalize the constructor to `or' and the args recursively. + (cons 'or (mapcar #'rx--normalize-char-pattern body))) ;; Convert `any' forms and char classes now so that we ;; don't need to do it later on. ((memq op '(any in char)) (cons 'rx--char-alt (rx--parse-any body))) ((memq op '(not intersection)) - (cons op (mapcar #'rx--normalise-char-pattern body))) + (cons op (mapcar #'rx--normalize-char-pattern body))) ((eq op 'eval) - (rx--normalise-char-pattern (rx--expand-eval body))) + (rx--normalize-char-pattern (rx--expand-eval body))) ((memq op rx--builtin-forms) form) ((let ((expanded (rx--expand-def-form form))) (and expanded - (rx--normalise-char-pattern expanded)))) + (rx--normalize-char-pattern expanded)))) (t form)))) ;; FIXME: Should we expand legacy definitions from ;; `rx-constituents' here as well? @@ -345,7 +345,7 @@ name-normalised character classes." ((memq form rx--builtin-symbols) form) ((let ((expanded (rx--expand-def-symbol form))) (and expanded - (rx--normalise-char-pattern expanded)))) + (rx--normalize-char-pattern expanded)))) (t form))) ((characterp form) (char-to-string form)) @@ -365,7 +365,7 @@ name-normalised character classes." (cons (rx--interval-set-union (car a) (car b)) classes))) (defun rx--intersection-intervals (forms) - "Intersection of the normalised FORMS, as an interval set." + "Intersection of the normalized FORMS, as an interval set." (rx--foldl #'rx--interval-set-intersection '((0 . #x3fffff)) (mapcar (lambda (x) (let ((char (rx--reduce-to-char-alt x))) @@ -378,7 +378,7 @@ name-normalised character classes." (defun rx--reduce-to-char-alt (form) "Transform FORM into (INTERVALS . CLASSES) or nil if not possible. Process `or', `intersection' and `not'. -FORM must be normalised (from `rx--normalise-char-pattern')." +FORM must be normalized (from `rx--normalize-char-pattern')." (cond ((stringp form) (and (= (length form) 1) @@ -422,10 +422,10 @@ FORM must be normalised (from `rx--normalise-char-pattern')." '(nil)) )) -(defun rx--optimise-or-args (args) - "Optimise `or' arguments. Return a new rx form. -Each element of ARGS should have been normalised using -`rx--normalise-char-pattern'." +(defun rx--optimize-or-args (args) + "Optimize `or' arguments. Return a new rx form. +Each element of ARGS should have been normalized using +`rx--normalize-char-pattern'." (if (null args) ;; No arguments. '(rx--char-alt nil . nil) ; FIXME: not `unmatchable'? @@ -487,12 +487,12 @@ Return (REGEXP . PRECEDENCE)." ((null (cdr body)) ; Single item. (rx--translate (car body))) (t - (let ((args (mapcar #'rx--normalise-char-pattern body))) + (let ((args (mapcar #'rx--normalize-char-pattern body))) (if (rx--all-string-branches-p args) ;; All branches are strings: use `regexp-opt'. (cons (list (regexp-opt (rx--collect-or-strings args) nil)) t) - (let ((form (rx--optimise-or-args args))) + (let ((form (rx--optimize-or-args args))) (if (eq (car-safe form) 'or) (let ((branches (cdr form))) (cons (append (car (rx--translate (car branches))) @@ -716,7 +716,7 @@ If NEGATED, negate the sense." If NEGATED, negate the sense (thus making it positive)." (unless (and body (null (cdr body))) (error "rx `not' form takes exactly one argument")) - (let ((arg (rx--normalise-char-pattern (car body)))) + (let ((arg (rx--normalize-char-pattern (car body)))) (pcase arg (`(not . ,args) (rx--translate-not (not negated) args)) @@ -850,7 +850,7 @@ If NEGATED, negate the sense (thus making it positive)." "Translate an (intersection ...) construct. Return (REGEXP . PRECEDENCE). If NEGATED, negate the sense." (rx--generate-alt negated (rx--intersection-intervals - (mapcar #'rx--normalise-char-pattern body)) + (mapcar #'rx--normalize-char-pattern body)) nil)) (defun rx--atomic-regexp (item) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 271c5d5fcf8..8eb28e646d5 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -685,7 +685,7 @@ Also remove members from the server table if this was their only buffer." (erc-remove-channel-users))) (defvar erc-channel-user-signal-if-status-unknown nil - "If non-nil ERC signals before setting an unadvertized status prefix. + "If non-nil ERC signals before setting an unadvertised status prefix. But only in ERC buffers. Otherwise, if nil, accessors like `erc-channel-user-halfop' ignore such attempts and return nil.") diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 2e4b0b87a00..841f1ad4444 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -288,7 +288,7 @@ information on Eshell, see Info node `(eshell)Top'." (declare-function eshell--save-history "em-hist" ()) (defun eshell-command-mode-exit () - "Exit the `eshell-commad-mode' minibuffer and save Eshell history." + "Exit the `eshell-command-mode' minibuffer and save Eshell history." (interactive) (when (eshell-using-module 'eshell-hist) (eshell-add-input-to-history diff --git a/lisp/ffap.el b/lisp/ffap.el index 4cf2dfebc0f..8f1ed868711 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -905,7 +905,7 @@ to extract substrings.") (append base (split-string (buffer-substring-no-properties (point-min) (point-max))))) - ;; Fallback for whedn the compiler is not available. + ;; Fallback for when the compiler is not available. (list (expand-file-name "/usr/include") (expand-file-name "/usr/local/include"))))) ;; Prefer GCC. diff --git a/lisp/frame.el b/lisp/frame.el index d521d49c175..ad9e4d50b82 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -85,7 +85,7 @@ handles the corresponding kind of display.") "mouse-wheel-frame" "name" "no-accept-focus" "no-focus-on-map" "no-other-frame" "no-special-glyphs" "ns-appearance" "ns-transparent-titlebar" "outer-window-id" "override-redirect" - "parent-frame" "right-fringe" "rigth-divider-width" "screen-gamma" + "parent-frame" "right-fringe" "right-divider-width" "screen-gamma" "scroll-bar-background" "scroll-bar-foreground" "scroll-bar-height" "scroll-bar-width" "shaded" "skip-taskbar" "snap-width" "sticky" "tab-bar-lines" "title" "tool-bar-lines" "tool-bar-position" "top" diff --git a/lisp/international/characters.el b/lisp/international/characters.el index 6a9f957b150..cac7e3551e9 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -1672,7 +1672,7 @@ these characters are displayed as full-width. This setting is most important for text-mode frames, because there Emacs cannot access the metrics of the fonts used by the console or the terminal emulator. You should configure the terminal emulator to behave consistently -with the value of this option, by making sure it dispays ambiguous-width +with the value of this option, by making sure it displays ambiguous-width characters as half-width or full-width, depending on the value of this option. diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index ca2647971fd..c104d93a0d5 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el @@ -379,7 +379,7 @@ a new request with identical DEFERRED and for the same buffer. However, in that situation, the original timeout is kept. PARAMS can also be the keyword `:jsonrpc-omit', in which case the -JSONRPC request object is formed witout a `params' entry. +JSONRPC request object is formed without a `params' entry. Returns a list whose first element is an integer identifying the request as specified in the JSONRPC 2.0 spec." @@ -1008,7 +1008,7 @@ Do nothing if MAX-SIZE is nil." (delete-region (point-min) (save-excursion - ;; Remove 1/4, so that the cost is O(1) amortised, since each + ;; Remove 1/4, so that the cost is O(1) amortized, since each ;; call to `delete-region' will move the buffer contents twice. (goto-char (+ (point-min) (/ (buffer-size) 4))) (forward-line) diff --git a/lisp/leim/quail/burmese.el b/lisp/leim/quail/burmese.el index c1a655e55f4..9905b0f53b9 100644 --- a/lisp/leim/quail/burmese.el +++ b/lisp/leim/quail/burmese.el @@ -124,7 +124,7 @@ (quail-define-package "burmese-visual" "Burmese" "MYV" nil "Burmese input method (in visual order). -A more common way to input Burmese, which allows inputing the vowel ေ in visual order. +A more common way to input Burmese, which allows inputting the vowel ေ in visual order. " nil t t t t nil nil nil nil nil t) (quail-define-rules diff --git a/lisp/leim/quail/greek.el b/lisp/leim/quail/greek.el index d1300326e7e..eb35ebaa3d4 100644 --- a/lisp/leim/quail/greek.el +++ b/lisp/leim/quail/greek.el @@ -1454,7 +1454,7 @@ Greek letters." ("=" ?=) ("[" ?\[) ("]" ?\]) - ;; Changed punction from greek.el + ;; Changed punctuation from greek.el ("`" ?·) ("~" ?:) ;; tonoi diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 5727cf9f479..f9880ef2dbd 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -188,9 +188,9 @@ This function consults `completion-category-overrides' and If no value is found in these variables, then this function goes over the parent categories of CAT (specified in the definition of CAT with `define-completion-category', which see), and chooses the first value -any of them specify (directly or via inheriance), if any. +any of them specify (directly or via inheritance), if any. -If this fucntion finds a value VAL for PROP, it returns a cons cell with +If this function finds a value VAL for PROP, it returns a cons cell with VAL at the `cdr'. Otherwise, this function returns nil." (seq-some (lambda (c) (completion--category-override c prop)) (completion--all-reachable-categories cat))) diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 1f910242666..88791bffb07 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -353,8 +353,8 @@ method that offers perfect forward secrecy, such as ephemeral Diffie-Hellman key exchange[1]. There is a long history of attacks against static RSA key exchange in -TLS, dating back to Bleichenbacher's attack in 1998, and mitigations -that have subsequently themselves been broken. In 2017, it was +TLS, dating back to Bleichenbacher's attack in 1998, and mitigation +that has subsequently itself been broken. In 2017, it was discovered that an attacker can decrypt ciphertexts or sign messages with the server's private key[2]. The poor security of this key exchange protocol was confirmed by new attacks discovered in 2018[3]. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 0f709b69323..488f7e49196 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -5230,7 +5230,7 @@ If there is a modified buffer, retry it after 60 seconds." (and-let* (((or (buffer-modified-p buf) (with-current-buffer buf ;; We don't know whether autorevert.el has - ;; been loaded alreaddy. + ;; been loaded already. (tramp-compat-funcall 'auto-revert-active-p)))) (bfn (buffer-file-name buf)) (v (tramp-ensure-dissected-file-name bfn)) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index a82eaae886d..2013c3980dc 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -2074,7 +2074,7 @@ If ARGUMENT is non-nil, use it as argument for (let* (coding-system-for-read (process-connection-type tramp-process-connection-type) - ;; There might be some unfortune values of + ;; There might be some unfortunate values of ;; `tramp-smb-connection-local-default-system-variables'. ;(path-separator (default-value 'path-separator)) ;(null-device (default-value 'null-device)) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1c035f0ef27..206a09377f3 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -785,7 +785,7 @@ The regexp should match at end of buffer." "Place your finger on the reader again" "Swipe your finger again" "Swipe was too short, try again" - "Your finger was not centred, try swiping your finger again" + "Your finger was not centered, try swiping your finger again" "Remove your finger, and try swiping your finger again") (* nonl) (* (any "\r\n"))) "Regexp matching fingerprint prompts. @@ -2545,7 +2545,7 @@ Must be handled by the callers." res))) (defun tramp-add-external-operation (operation function backend) - "Add FUNTION to Tramp BACKEND as handler for OPERATION. + "Add FUNCTION to Tramp BACKEND as handler for OPERATION. OPERATION must not be one of the magic operations listed in Info node `(elisp) Magic File Names'. FUNCTION must have the same argument list as OPERATION. BACKEND, a symbol, must be one of the Tramp backend @@ -3823,8 +3823,8 @@ BODY is the backend specific code." (defmacro tramp-skeleton-make-process (args null-command stderr-file &rest body) "Skeleton for `tramp-*-handle-make-process'. -NULL-COMMAND indicates a possible empty command. STDERR-FILE means, -that a stederr file is supported. BODY is the backend specific code." +NULL-COMMAND indicates a possible empty command. STDERR-FILE means +that a stderr file is supported. BODY is the backend specific code." (declare (indent 3) (debug t)) `(when ,args (with-parsed-tramp-file-name (expand-file-name default-directory) nil diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index a2f9ff6e162..4547877a034 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -4002,7 +4002,7 @@ (org-agenda-prepare-buffers): Honor `org-agenda-ignore-drawer-properties'. - * org-clock.el (org-clock-goto): Recenter to thrd line + * org-clock.el (org-clock-goto): Recenter to third line * org-table.el (orgtbl-send-replace-tbl): Allow multiple spaces between keywords in RECEIVE ORGTBL lines. diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el index 32a99e98709..cda9328fb75 100644 --- a/lisp/org/oc-basic.el +++ b/lisp/org/oc-basic.el @@ -370,7 +370,7 @@ Throw an error if the field value is non-string and non-nil." "Return a list of family names from a list of full NAMES. NAMES can be a string or raw string object. -To better accomomodate corporate names, this will only shorten +To better accommodate corporate names, this will only shorten personal names of the form \"family, given\"." (let (names-string raw-p) (cond diff --git a/lisp/org/ol.el b/lisp/org/ol.el index 603dc26d416..e06f59b4f1c 100644 --- a/lisp/org/ol.el +++ b/lisp/org/ol.el @@ -1160,7 +1160,7 @@ Abbreviations are defined in `org-link-abbrev-alist'." ((string-match "%(\\([^)]+\\))" rpl) (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl)))) ;; Using `unsafep-function' is not quite enough because - ;; Emacs considers functions like `genenv' safe, while + ;; Emacs considers functions like `getenv' safe, while ;; they can potentially be used to expose private system ;; data to attacker if abbreviated link is clicked. (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe)) diff --git a/lisp/org/org-fold-core.el b/lisp/org/org-fold-core.el index a2e84f73c0e..d9a9d04ea8d 100644 --- a/lisp/org/org-fold-core.el +++ b/lisp/org/org-fold-core.el @@ -236,12 +236,12 @@ ;; recommended to minimize the number of folding specs used in the ;; same buffer at a time. -;; Alternatively, the library provides `org-fold-core--optimise-for-huge-buffers' +;; Alternatively, the library provides `org-fold-core--optimize-for-huge-buffers' ;; for additional speedup. This can be used as a file-local variable ;; in huge buffers. The variable can be set to enable various levels ;; of extra optimization. See the docstring for detailed information. -;; It is worth noting that when using `org-fold-core--optimise-for-huge-buffers' +;; It is worth noting that when using `org-fold-core--optimize-for-huge-buffers' ;; with `grab-invisible' option, folded regions copied to other ;; buffers (including buffers that do not use this library) will ;; remain invisible. org-fold-core provides functions to work around @@ -300,7 +300,7 @@ Important: This variable must be set before loading Org." The function is called with a single argument - point where text is to be revealed.") -(defvar-local org-fold-core--optimise-for-huge-buffers nil +(defvar-local org-fold-core--optimize-for-huge-buffers nil "Non-nil turns on extra speedup on huge buffers (Mbs of folded text). This setting is risky and may cause various artifacts and degraded @@ -340,7 +340,7 @@ following symbols: - `merge-folds': Do not distinguish between different types of folding specs. This is the most aggressive optimization with unforeseen and potentially drastic effects.") -(put 'org-fold-core--optimise-for-huge-buffers 'safe-local-variable 'listp) +(put 'org-fold-core--optimize-for-huge-buffers 'safe-local-variable 'listp) ;;; Core functionality @@ -445,10 +445,10 @@ Return nil when there is no matching folding spec." "Get PROPERTY of a folding SPEC-OR-ALIAS. Possible properties can be found in `org-fold-core--specs' docstring." (org-fold-core--check-spec spec-or-alias) - (if (and (memql 'ignore-indirect org-fold-core--optimise-for-huge-buffers) + (if (and (memql 'ignore-indirect org-fold-core--optimize-for-huge-buffers) (eq property :global)) t - (if (and (memql 'merge-folds org-fold-core--optimise-for-huge-buffers) + (if (and (memql 'merge-folds org-fold-core--optimize-for-huge-buffers) (eq property :visible)) nil (cdr (assq property (assq (org-fold-core-get-folding-spec-from-alias spec-or-alias) org-fold-core--specs)))))) @@ -459,7 +459,7 @@ Possible properties can be found in `org-fold-core--specs' docstring." (defsubst org-fold-core-get-folding-property-symbol (spec &optional buffer global) "Get folding text property using to store SPEC in current buffer or BUFFER. If GLOBAL is non-nil, do not make the property unique in the BUFFER." - (if (memql 'merge-folds org-fold-core--optimise-for-huge-buffers) + (if (memql 'merge-folds org-fold-core--optimize-for-huge-buffers) (intern (format "%s-global" org-fold-core--spec-property-prefix)) (intern (format (concat org-fold-core--spec-property-prefix "%s-%S") (symbol-name spec) @@ -468,7 +468,7 @@ If GLOBAL is non-nil, do not make the property unique in the BUFFER." ;; buffer-local text property actually matters is an indirect ;; buffer, where the name cannot be same anyway. (if (or global - (memql 'ignore-indirect org-fold-core--optimise-for-huge-buffers)) + (memql 'ignore-indirect org-fold-core--optimize-for-huge-buffers)) 'global (sxhash (buffer-name (or buffer (current-buffer))))))))) @@ -538,7 +538,7 @@ hanging around." ;; This is the core function used to fold text in buffers. We use ;; text properties to hide folded text, however 'invisible property is -;; not directly used (unless risky `org-fold-core--optimise-for-huge-buffers' is +;; not directly used (unless risky `org-fold-core--optimize-for-huge-buffers' is ;; enabled). Instead, we define unique text property (folding ;; property) for every possible folding spec and add the resulting ;; text properties into `char-property-alias-alist', so that @@ -651,7 +651,7 @@ This function is mostly intended to be used in (delete-dups bufs)))))) (when (and (buffer-base-buffer) (eq org-fold-core-style 'text-properties) - (not (memql 'ignore-indirect org-fold-core--optimise-for-huge-buffers))) + (not (memql 'ignore-indirect org-fold-core--optimize-for-huge-buffers))) (org-fold-core--update-buffer-folds))) ;;; API @@ -669,7 +669,7 @@ Do not check previous value when FORCE is non-nil." (unless (org-fold-core-get-folding-spec-property spec :visible) (add-to-invisibility-spec (cons spec value))))) (:visible - (unless (or (memql 'merge-folds org-fold-core--optimise-for-huge-buffers) + (unless (or (memql 'merge-folds org-fold-core--optimize-for-huge-buffers) (and (not force) (equal value (org-fold-core-get-folding-spec-property spec :visible)))) (if value (remove-from-invisibility-spec (cons spec (org-fold-core-get-folding-spec-property spec :ellipsis))) @@ -1099,7 +1099,7 @@ If SPEC-OR-ALIAS is omitted and FLAG is nil, unfold everything in the region." (put-text-property from to (org-fold-core--property-symbol-get-create spec) spec) (put-text-property from to 'isearch-open-invisible #'org-fold-core--isearch-show) (put-text-property from to 'isearch-open-invisible-temporary #'org-fold-core--isearch-show-temporary) - (when (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers) + (when (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers) ;; If the SPEC has highest priority, assign it directly ;; to 'invisible property as well. This is done to speed ;; up Emacs redisplay on huge (Mbs) folded regions where @@ -1108,7 +1108,7 @@ If SPEC-OR-ALIAS is omitted and FLAG is nil, unfold everything in the region." (when (eq spec (caar org-fold-core--specs)) (put-text-property from to 'invisible spec))))) (if (not spec) (mapc (lambda (spec) (org-fold-core-region from to nil spec)) (org-fold-core-folding-spec-list)) - (when (and (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers) + (when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers) (eq org-fold-core-style 'text-properties)) (when (eq spec (caar org-fold-core--specs)) (let ((pos from)) @@ -1394,7 +1394,7 @@ property, unfold the region if the :fragile function returns non-nil." ;; If no insertions or deletions in buffer, skip all the checks. (unless (or org-fold-core--ignore-modifications (eq org-fold-core--last-buffer-chars-modified-tick (buffer-chars-modified-tick)) - (memql 'ignore-modification-checks org-fold-core--optimise-for-huge-buffers)) + (memql 'ignore-modification-checks org-fold-core--optimize-for-huge-buffers)) ;; Store the new buffer modification state. (setq org-fold-core--last-buffer-chars-modified-tick (buffer-chars-modified-tick)) (save-match-data @@ -1454,7 +1454,7 @@ property, unfold the region if the :fragile function returns non-nil." ;; multiple times in indirect buffers that have exactly same ;; text anyway. (unless (or org-fold-core--ignore-fragility-checks - (memql 'ignore-fragility-checks org-fold-core--optimise-for-huge-buffers)) + (memql 'ignore-fragility-checks org-fold-core--optimize-for-huge-buffers)) (dolist (func org-fold-core-extend-changed-region-functions) (let ((new-region (funcall func from to))) (setq from (car new-region)) @@ -1587,7 +1587,7 @@ The arguments and return value are as specified for `filter-buffer-substring'." (let* ((prop (car plist)) (prop-name (symbol-name prop))) ;; Reveal hard-hidden text. See - ;; `org-fold-core--optimise-for-huge-buffers'. + ;; `org-fold-core--optimize-for-huge-buffers'. (when (and (eq prop 'invisible) (member (cadr plist) (org-fold-core-folding-spec-list))) (remove-text-properties start fin '(invisible t) return-string)) @@ -1602,10 +1602,10 @@ The arguments and return value are as specified for `filter-buffer-substring'." (remove-text-properties 0 (length return-string) props-list return-string)) return-string)) -(defun org-fold-core-update-optimisation (beg end) +(defun org-fold-core-update-optimization (beg end) "Update huge buffer optimization between BEG and END. -See `org-fold-core--optimise-for-huge-buffers'." - (when (and (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers) +See `org-fold-core--optimize-for-huge-buffers'." + (when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers) (eq org-fold-core-style 'text-properties)) (let ((pos beg)) (while (< pos end) @@ -1614,11 +1614,14 @@ See `org-fold-core--optimise-for-huge-buffers'." (put-text-property pos (org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end) 'invisible (caar org-fold-core--specs))) (setq pos (org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end)))))) +(define-obsolete-function-alias + 'org-fold-core-update-optimisation + #'org-fold-core-update-optimization "9.8") -(defun org-fold-core-remove-optimisation (beg end) +(defun org-fold-core-remove-optimization (beg end) "Remove huge buffer optimization between BEG and END. -See `org-fold-core--optimise-for-huge-buffers'." - (when (and (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers) +See `org-fold-core--optimize-for-huge-buffers'." + (when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers) (eq org-fold-core-style 'text-properties)) (let ((pos beg)) (while (< pos end) @@ -1627,6 +1630,9 @@ See `org-fold-core--optimise-for-huge-buffers'." (remove-text-properties pos (org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end) '(invisible t))) (setq pos (org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end)))))) +(define-obsolete-function-alias + 'org-fold-core-remove-optimisation + #'org-fold-core-remove-optimization "9.8") (provide 'org-fold-core) diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el index ac608bb40e8..a945b572919 100644 --- a/lisp/org/org-plot.el +++ b/lisp/org/org-plot.el @@ -218,13 +218,13 @@ If HARD-MIN and HARD-MAX can be used to fix the ends of the axis." (mapcar #'string-to-number (cdr row)) hard-min hard-max)) table)) - (row-normalised-ranges (mapcar (lambda (r-data) + (row-normalized-ranges (mapcar (lambda (r-data) (let ((val (round (* (plist-get r-data :range-factor) (plist-get r-data :nice-range))))) (if (= (% val 10) 0) (/ val 10) val))) row-data)) - (range-prime-decomposition (mapcar #'org--plot/prime-factors row-normalised-ranges)) + (range-prime-decomposition (mapcar #'org--plot/prime-factors row-normalized-ranges)) (weighted-factors (sort (apply #'org--plot/merge-alists #'+ 0 (mapcar (lambda (factors) (org--plot/item-frequencies factors t)) range-prime-decomposition)) @@ -278,9 +278,9 @@ argument for the FUNCTION." (defun org--plot/item-frequencies (values &optional normalize) "Return an alist indicating the frequency of values in VALUES list. When NORMALIZE is non-nil, the count is divided by the number of values." - (let ((normaliser (if normalize (float (length values)) 1))) + (let ((normalizer (if normalize (float (length values)) 1))) (cl-loop for (n . m) in (seq-group-by #'identity values) - collect (cons n (/ (length m) normaliser))))) + collect (cons n (/ (length m) normalizer))))) (defun org--plot/prime-factors (value) "Return the prime decomposition of VALUE, e.g. for 12, (3 2 2)." diff --git a/lisp/org/org.el b/lisp/org/org.el index 9e220b2d3df..7f91cb1bf83 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -4029,7 +4029,8 @@ Otherwise, these types are allowed: :package-version '(Org . "8.3") :group 'org-sparse-trees) -(defalias 'org-advertized-archive-subtree 'org-archive-subtree) +(define-obsolete-function-alias 'org-advertized-archive-subtree + #'org-archive-subtree "9.8") ;; Declare Column View Code @@ -5898,7 +5899,7 @@ needs to be inserted at a specific position in the font-lock sequence.") (list org-radio-target-regexp '(0 'org-target prepend)) (list org-target-regexp '(0 'org-target prepend)) ;; Macro - '(org-fontify-macros) ; `org-fontify-macro' pepends faces + '(org-fontify-macros) ; `org-fontify-macro' prepends faces ;; TODO keyword (list (format org-heading-keyword-regexp-format org-todo-regexp) @@ -6160,7 +6161,7 @@ If TAG is a number, get the corresponding match group." '(mouse-face t keymap t org-linked-text t invisible t intangible t org-emphasis t)) - (org-fold-core-update-optimisation beg end) + (org-fold-core-update-optimization beg end) (org-remove-font-lock-display-properties beg end))) (defconst org-script-display '(((raise -0.3) (height 0.7)) @@ -6567,10 +6568,10 @@ Return nil before first heading." (org-back-to-heading t) (let ((case-fold-search nil)) (looking-at org-complex-heading-regexp) - ;; When using `org-fold-core--optimise-for-huge-buffers', + ;; When using `org-fold-core--optimize-for-huge-buffers', ;; returned text will be invisible. Clear it up. (save-match-data - (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0))) + (org-fold-core-remove-optimization (match-beginning 0) (match-end 0))) (let ((todo (and (not no-todo) (match-string 2))) (priority (and (not no-priority) (match-string 3))) (headline (pcase (match-string 4) @@ -6583,7 +6584,7 @@ Return nil before first heading." (h h))) (tags (and (not no-tags) (match-string 5)))) ;; Restore cleared optimization. - (org-fold-core-update-optimisation (match-beginning 0) (match-end 0)) + (org-fold-core-update-optimization (match-beginning 0) (match-end 0)) (mapconcat #'identity (delq nil (list todo priority headline tags)) " ")))))) @@ -6600,7 +6601,7 @@ This is a list with the following elements: (save-excursion (org-back-to-heading t) (when (let (case-fold-search) (looking-at org-complex-heading-regexp)) - (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0)) + (org-fold-core-remove-optimization (match-beginning 0) (match-end 0)) (prog1 (list (length (match-string 1)) (org-reduced-level (length (match-string 1))) @@ -6608,7 +6609,7 @@ This is a list with the following elements: (and (match-end 3) (aref (match-string 3) 2)) (match-string-no-properties 4) (match-string-no-properties 5)) - (org-fold-core-update-optimisation (match-beginning 0) (match-end 0)))))) + (org-fold-core-update-optimization (match-beginning 0) (match-end 0)))))) (defun org-get-entry () "Get the entry text, after heading, entire subtree." @@ -10696,7 +10697,7 @@ narrowing." ;; No drawer found. Create one, if permitted. (when create ;; `org-end-of-meta-data' ended up at next heading - ;; * Heading to insert darawer + ;; * Heading to insert drawer ;; * Another heading ;; ;; Unless current heading is the last heading in buffer diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 6b62d8bae7f..24ea47a32a4 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -6425,7 +6425,7 @@ them." ("it" :default "Riferimenti") ("nl" :default "Bronverwijzingen") ("nn" :default "Kjelder") - ("pl" :default "Odwołania") ; could be "Referencje" but I think its too englishy + ("pl" :default "Odwołania") ; could be "Referencje" but I think it's too Englishy ("pt_BR" :html "Referências" :default "Referências" :ascii "Referencias") ("ro" :default "Bibliografie") ("sl" :default "Reference") diff --git a/lisp/play/zone.el b/lisp/play/zone.el index 0d33a9783d6..b811ca1573e 100644 --- a/lisp/play/zone.el +++ b/lisp/play/zone.el @@ -295,7 +295,7 @@ if they might expose privileged or secret information." special-mode ;; Special/internal buffers image-mode ;; image buffers authinfo-mode ;; encrypted buffers - zone--buffer-encrpted-p + zone--buffer-encrypted-p "\\`\\*scratch\\*\\'" ;; zone will fallback to scratch , but ;; ignore it in the first pass ) diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 89da0e34148..66f52b932bf 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -178,7 +178,7 @@ set other variables, see `antlr-tool-version-variables'." For each antlr-VAR in this list, function `antlr-set-local-variables' makes it buffer-local and uses the variable VERSION-VAR, i.e., antlr-v2-VAR, antlr-v3-VAR or antlr-v4-VAR to set its value, -dependending on the value VERSION of `antlr-tool-version'. +depending on the value VERSION of `antlr-tool-version'. If that variable VERSION-VAR does not exist, ignore antlr-VAR if it is listed after the symbol &optional, or issue an error otherwise.") @@ -250,7 +250,7 @@ The value is used to set other variables, see `antlr-language-variables'.") For each antlr-VAR in this list, function `antlr-set-local-variables' makes it buffer-local and uses the variable LANGUAGE-VAR, i.e., antlr-java-VAR, antlr-cpp-VAR, and so on to set its value, -dependending on the value LANGUAGE of `antlr-language'. +depending on the value LANGUAGE of `antlr-language'. If that variable LANGUAGE-VAR does not exist, ignore antlr-VAR if it is listed after the symbol &optional, or issue an error otherwise.") @@ -1619,7 +1619,7 @@ with value `upcase', only return alist with tokenref names." ;; --- simplified v2 grammar ------------------------------------------------- ;; file: ("header" STRING? ACTION)? OPTIONS? ACTION? class* -;; class: "class" ID // moved preable action to file rule +;; class: "class" ID // moved preamble action to file rule ;; ("extends" ("Lexer"|"Parser"|"TreeParser") ID?)? ";" ;; OPTIONS? TOKENS? ACTION? rule* ;; rule: ("protected"|"public"|"private")? ID "!"? @@ -2145,7 +2145,7 @@ is undefined." (defun antlr-try-rule-or-grammar-option (requested bor) "Try whether rule or grammar option can be applied. Called by function `antlr-option-level' with arguments REQUESTED, -and BOR poiting to the beginning of the current rule." +and BOR pointing to the beginning of the current rule." (or (and (memq requested '(nil 3)) (elt antlr-options-alists 2) (progn (goto-char bor) 3)) (and (memq requested '(nil 2)) (cadr antlr-options-alists) diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el index 08857f9ab20..41dc4def276 100644 --- a/lisp/progmodes/c-ts-common.el +++ b/lisp/progmodes/c-ts-common.el @@ -691,8 +691,8 @@ This rule works for a wide range of scenarios including complex situations. Major modes should use this as the fallback rule, and add exception rules before it to cover the cases it doesn't apply. -This rule tries to be smart and ignore proprocessor node in some -situations. By default, any node that has \"proproc\" in its type are +This rule tries to be smart and ignore preprocessor node in some +situations. By default, any node that has \"preproc\" in its type are considered a preprocessor node. If that heuristic is inaccurate, define a `preproc' thing in `treesit-thing-settings', and this rule will use the thing definition instead. diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index e17f388216e..8fbf5291177 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -551,7 +551,7 @@ MODE can be `c' or `cpp'. STYLE can be `gnu', `k&r', `linux', `bsd'." ('cpp `((cpp . ,rules)))))) (defun c-ts-mode--parenthesized-expression-indent-rule (_node parent &rest _) - "Indent rule that indents aprenthesized expression. + "Indent rule that indents parenthesized expression. Aligns the next line to the first sibling diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 2296cbdd7a3..829f82d5f56 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -2724,7 +2724,7 @@ will be handled." c '("auto")) (c-lang-defconst c-no-type-with-equals-key - ;; Regexp mathing an entry from `c-no-type-with-equals-kwds'. + ;; Regexp matching an entry from `c-no-type-with-equals-kwds'. t (c-make-keywords-re t (c-lang-const c-no-type-with-equals-kwds))) (c-lang-defvar c-no-type-with-equals-key (c-lang-const c-no-type-with-equals-key)) diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el index c1db5439ab5..9084535aa94 100644 --- a/lisp/progmodes/csharp-mode.el +++ b/lisp/progmodes/csharp-mode.el @@ -732,7 +732,7 @@ compilation and evaluation time conflicts." (defgroup csharp-ts-mode-faces nil "Font faces." - :group 'cshap) + :group 'csharp) (defface csharp-ts-mode-attribute-face '((t . (:inherit font-lock-property-use-face))) @@ -885,7 +885,7 @@ compilation and evaluation time conflicts." '((this_expression) @font-lock-keyword-face) '("this" @font-lock-keyword-face)) - ;; avoid fontifying indentifiers with a keyword-values as identifiers. + ;; Avoid fontifying identifiers with a keyword-values as identifiers. ((identifier) @font-lock-keyword-face (:match ,(concat "\\`" (regexp-opt csharp-ts-mode--keywords t) "\\'") @font-lock-keyword-face))) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 96f1c7e9820..b68b3a57a09 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -4345,7 +4345,7 @@ at point. With prefix argument, prompt for ACTION-KIND." GLOBS is a list of (COMPILED-GLOB . KIND) pairs, where COMPILED-GLOB is a compiled glob predicate and KIND is a bitmask of change types. DIR is the directory to watch (nil means entire project). IN-ROOT says if DIR -happens to be inside or maching the project root." +happens to be inside or matching the project root." (cl-labels ((subdirs-using-project () (delete-dups @@ -4811,8 +4811,8 @@ See `eglot--semtok-request' implementation for details.") ;; eglot--docver docver (c :orig-docver) (c :req-docver)) ;; This skip is different from the one below. Comparing ;; the lexical `docver' to the original request's - ;; `:orig-docver' allows skipping the outdated reponse - ;; of a dispatched request that has been overriden by + ;; `:orig-docver' allows skipping the outdated response + ;; of a dispatched request that has been overridden by ;; another (perhaps not dispatched yet) request. (when (eq docver (c :orig-docver)) (setf (c :docver) (c :req-docver) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index da8302953d1..4464aa28734 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -2691,7 +2691,7 @@ current buffer state and calls REPORT-FN when done." (unless (trusted-content-p) ;; FIXME: Use `bwrap' and friends to compile untrusted content. ;; FIXME: We emit a message *and* signal an error, because by default - ;; Flymake doesn't display the warning it puts into "*flmake log*". + ;; Flymake doesn't display the warning it puts into "*flymake log*". (message "Disabling elisp-flymake-byte-compile in %s (untrusted content)" (buffer-name)) (user-error "Disabling elisp-flymake-byte-compile in %s (untrusted content)" diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 07a3e7785a3..308b196b37f 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -2008,8 +2008,8 @@ POS can be a buffer position or a button" (defun flymake--tabulated-setup-1 (diags project-root) "Helper for `flymake--tabulated-setup'. -Sets `tabulated-list-format' and `tabulated-list-entries', dinamically -resizing columns and ommiting redudant columns." +Sets `tabulated-list-format' and `tabulated-list-entries', dynamically +resizing columns and omitting redundant columns." (cl-loop with fields = (copy-tree flymake--tabulated-list-format-base t) initially (cl-loop for y across fields do (setf (cadr y) nil)) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 688f2e7cdff..8b8981e097b 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -178,7 +178,7 @@ ;; *** Tree-sitter support ;; -;; All the treesit based modes already have support for hidding/showing +;; All the treesit based modes already have support for hiding/showing ;; using the treesit thing `list' (see `treesit-major-mode-setup'). ;; ;; However, for some modes the `list' thing is not enough for detecting diff --git a/lisp/progmodes/lua-mode.el b/lisp/progmodes/lua-mode.el index faeadf212de..054fd65c550 100644 --- a/lisp/progmodes/lua-mode.el +++ b/lisp/progmodes/lua-mode.el @@ -748,7 +748,7 @@ Return the amount the indentation changed by." (pos (- (point-max) (point)))) (back-to-indentation) (setq indent (if (lua-comment-or-string-p) - ;; Just restore point posistion. + ;; Just restore point position. (lua-calculate-string-or-comment-indentation) (max 0 (lua-calculate-indentation)))) @@ -1011,7 +1011,7 @@ DIRECTION has to be either \\='forward or \\='backward." maybe-found-pos))) (defun lua-goto-matching-block-token (&optional parse-start direction) - "Find block begion/end token matching the one at the point. + "Find block begin/end token matching the one at the point. This function moves the point to the token that matches the one at the current point. Returns the point position of the first character of the matching token if successful, nil otherwise. @@ -1525,7 +1525,7 @@ The argument REVERSED-INDENTATION-INFO is an indentation INFO-LIST." (let (indentation-info (type 'relative) (accu 0)) - ;; Aggregate all neighbouring relative offsets, reversing the INFO list. + ;; Aggregate all neighboring relative offsets, reversing the INFO list. (dolist (elt reversed-indentation-info) (if (and (eq (car elt) 'relative) (eq (caar indentation-info) 'relative)) diff --git a/lisp/pulse.el b/lisp/pulse.el index 3f0fbbab3bb..687215ac216 100644 --- a/lisp/pulse.el +++ b/lisp/pulse.el @@ -238,7 +238,7 @@ Only pulses the line if `pulse-command-advice-flag' is non-nil." :version "31.1") ;; FIXME: The pulse's smooth effect cannot be achieved here because -;; the face-remaping will not work well for that. +;; the face-remapping will not work well for that. (defun pulse-faces (faces &optional with-face) "Briefly pulse FACES by using attributes of face WITH-FACE (if defined). FACES should be a list of faces to pulse. @@ -259,7 +259,7 @@ to `pulse-highlight-face'." (if (> pulse-face-duration 0.1) (run-with-timer pulse-face-duration 0 (lambda () - ;; Remove the face remaping in the buffer + ;; Remove the face remapping in the buffer ;; where `pulse-faces' was called. (if (buffer-live-p in-buffer) (with-current-buffer in-buffer diff --git a/lisp/replace.el b/lisp/replace.el index bf0d8ac672d..862e10c8923 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -389,7 +389,7 @@ should a regexp." (defun query-replace-read-transpose-from-to () "Transpose the FROM and TO arguments of a `query-replace' operation. -If there is an active region in the minibuffer, tranpose only those +If there is an active region in the minibuffer, transpose only those parts of FROM and TO that intersect with the active region, or complete TO or FROM if the active region only intersects with FROM or TO, respectively. diff --git a/lisp/simple.el b/lisp/simple.el index c1d876de63e..63c2a665b64 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -9033,7 +9033,7 @@ A negative ARG means to kill forwards. Unix-words differ from Emacs words in that they are always delimited by whitespace, regardless of the buffer's syntax table. Thus, this command emulates C-w at the Unix terminal or shell. -See also this command's nakesake in Info node +See also this command's namesake in Info node `(readline)Commands For Killing'." (interactive "^p") (let ((start (point))) diff --git a/lisp/so-long.el b/lisp/so-long.el index 59a833d2c32..0e328a2abaf 100644 --- a/lisp/so-long.el +++ b/lisp/so-long.el @@ -69,7 +69,7 @@ ;; the long lines. In such circumstances you may find that `longlines-mode' is ;; the most helpful facility. ;; -;; Note also that the mitigations are automatically triggered when visiting a +;; Note also that the mitigation is automatically triggered when visiting a ;; file. The library does not automatically detect if long lines are inserted ;; into an existing buffer (although the `so-long' command can be invoked ;; manually in such situations). @@ -392,7 +392,7 @@ ;; by the global mode (although the `so-long' command can be invoked manually). ;; To handle such buffers additional glue code will be required, and that code ;; should likely be specific to the particular use-case to avoid unintended -;; behaviours. +;; behaviors. ;; ;; An example to handle `compilation-mode' (and derivative) buffers follows: ;; @@ -532,7 +532,7 @@ "Internal use. Non-nil when any `so-long' functionality has been used.") (defvar-local so-long--active nil ; internal use - "Non-nil when `so-long' mitigations are in effect.") + "Non-nil when `so-long' mitigation is in effect.") (defvar so-long--set-auto-mode nil ; internal use "Non-nil while `set-auto-mode' is executing.") @@ -1006,7 +1006,7 @@ If nil, no mode line indicator will be displayed." (defface so-long-mode-line-active '((t :inherit mode-line-emphasis)) - "Face for the mode line construct when mitigations are active. + "Face for the mode line construct when mitigation is active. Applied to `mode-name' in the `so-long-mode' major mode, and to `so-long-mode-line-label' otherwise (for non-major-mode actions). @@ -1016,7 +1016,7 @@ See also `so-long-mode-line-info'." (defface so-long-mode-line-inactive '((t :inherit mode-line-inactive)) - "Face for `so-long-mode-line-info' when mitigations have been reverted." + "Face for `so-long-mode-line-info' when mitigation has been reverted." :package-version '(so-long . "1.0")) ;; Modes that go slowly and line lengths excessive @@ -1187,7 +1187,7 @@ Displayed as part of `mode-line-misc-info'. `so-long-mode-line-label' defines the text to be displayed (if any). -Face `so-long-mode-line-active' is used while mitigations are active, and +Face `so-long-mode-line-active' is used while mitigation is active, and `so-long-mode-line-inactive' is used if `so-long-revert' is called. Not displayed when `so-long-mode' is enabled, as the major mode construct @@ -1917,7 +1917,7 @@ Equivalent to calling (global-so-long-mode 0)" ;;;###autoload (define-minor-mode global-so-long-mode - "Toggle automated performance mitigations for files with long lines. + "Toggle automated performance mitigation for files with long lines. Many Emacs modes struggle with buffers which contain excessively long lines, and may consequently cause unacceptable performance issues. @@ -2124,7 +2124,7 @@ If it appears in `%s', you should remove it." ; LocalWords: noerror selectable mapc sgml nxml hl flydiff defs arg Phil Sainty ; LocalWords: defadvice nadvice whitespace ie bos eos eobp origmode un Un setq ; LocalWords: docstring auf Wiedersehen longlines alist autoload Refactored Inc -; LocalWords: MERCHANTABILITY RET REGEXP VAR ELPA WS mitigations EmacsWiki eval +; LocalWords: MERCHANTABILITY RET REGEXP VAR ELPA WS EmacsWiki eval ; LocalWords: rx filename filenames js defun bidi bpa FIXME globalized amongst ;; So long, farewell, auf Wiedersehen, goodbye diff --git a/lisp/system-taskbar.el b/lisp/system-taskbar.el index cf3865b0b49..cfcce97f867 100644 --- a/lisp/system-taskbar.el +++ b/lisp/system-taskbar.el @@ -366,7 +366,7 @@ Note: The Unity D-Bus protocol supports only integer badges." &optional urgency timeout) "Request URGENCY user attention on the system taskbar Emacs icon. The request will time out within the TIMEOUT seconds interval. -The Unity D-Bus protocol does not support differentiated urgencies." +The Unity D-Bus protocol does not support differentiated urgency levels." (setq system-taskbar--dbus-attention urgency) (system-taskbar--dbus-send-signal `((:dict-entry "urgent" diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el index f2f82adfc0c..1b85405c35e 100644 --- a/lisp/textmodes/markdown-ts-mode.el +++ b/lisp/textmodes/markdown-ts-mode.el @@ -293,7 +293,7 @@ the same features enabled in MODE." ;; FIXME: Kind of a hack here: we use this function as a hook for ;; loading up configs for the language for the code block on-demand. (let ((mode (alist-get lang markdown-ts-code-block-source-mode-map))) - ;; If there's no supported mode for the langauge, return nil, + ;; If there's no supported mode for the language, return nil, ;; which makes Emacs skip the code block. (if (not (and mode (fboundp mode))) nil diff --git a/lisp/transient.el b/lisp/transient.el index 0ca60c4ceea..e2e472f730f 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -1945,7 +1945,7 @@ probably use this instead: ;; that there is a bug somewhere. ((length> suffixes 1) (error "BUG: Cannot unambiguously determine suffix object")) - ;; It is legimate to use this function as a predicate of sorts. + ;; It is legitimate to use this function as a predicate of sorts. ;; `transient--pre-command' and `transient-help' are examples. (t nil)))) ((bind-and* (obj (transient--suffix-prototype (or command this-command))) diff --git a/lisp/treesit.el b/lisp/treesit.el index 752ab73a473..5ad76ad54a3 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1260,7 +1260,7 @@ omitted, default END to BEG." ;;; Language -;; Defined in tressit.c. This is just to add some default values. +;; Defined in treesit.c. This is just to add some default values. (defvar treesit-languages-need-line-column-tracking '(haskell)) @@ -1279,7 +1279,7 @@ omitted, default END to BEG." "An alist mapping language symbols to their display names. Used by `treesit-language-display-name'. If there's no mapping for a -lamguage in this alist, `treesit-language-display-name' converts the +language in this alist, `treesit-language-display-name' converts the symbol to the display name by capitalizing the first letter of the symbol's name. Thus, languages like Java, Javascript, Rust don't need an entry in this variable.") @@ -3326,7 +3326,7 @@ The `sexp' type uses the `sexp' thing defined in `treesit-thing-settings'. With this type commands use only the treesit definitions of parser nodes, without distinction between symbols and lists. Since tree-sitter grammars could group node types in arbitrary ways, navigation by `sexp' might not -match your expectations, and might produce different results in differnt +match your expectations, and might produce different results in different treesit-based modes." (interactive "p") (if (not (treesit-thing-defined-p 'list (treesit-language-at (point)))) @@ -5538,7 +5538,7 @@ The value can be either a list of ts-modes to enable, or t to enable all ts-modes. The value nil (the default) means not to enable any tree-sitter based modes. -Enabling a tree-stter based mode means that visiting files in the +Enabling a tree-sitter based mode means that visiting files in the corresponding programming language will automatically turn on that mode, instead of any non-tree-sitter based modes for the same language." @@ -5596,7 +5596,7 @@ language." :eg-result c) (treesit-parser-tag :no-eval (treesit-parser-tag parser) - :eg-result 'embeded) + :eg-result 'embedded) (treesit-parser-changed-regions :no-eval (treesit-parser-changed-regions parser) :eg-result '((1 . 10) (24 . 58))) diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 04fee189cfa..4742abc491d 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1349,7 +1349,7 @@ The return value of this function is the retrieval buffer." ;; The async processes operate on a buffer created in this function, ;; so the way to accomplish this goal is to set buffer local copies of ;; the relevant variables to the dynamic values in scope as we create - ;; the buffer. When new variables are added that influence behaviour + ;; the buffer. When new variables are added that influence behavior ;; of requests, they should be added to the handling in this function ;; to make them work reliably without changing their global values. (let* (;; (host (url-host (or url-using-proxy url))) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 045c49fcff2..5e634e3bfdb 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -3102,7 +3102,7 @@ fixed, visit it in a buffer." (defun diff--font-lock-prettify (limit) (when diff-font-lock-prettify ;; FIXME: `window-fringes` uselessly allocates 4 cons cells, - ;; but the previous use of `frame-paramter' ended up internally + ;; but the previous use of `frame-parameter' ended up internally ;; calling `frame-parameters' making it even worse! (when (> (car (window-fringes)) 0) (save-excursion diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index df07972c6cc..1175be83488 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -122,7 +122,7 @@ dispatcher client mode imposes itself." ;; This hook was undeclared and undocumented until declared obsolete. ;; I believe it can be replaced with `vc-log-after-operation-hook'; if ;; someone can demonstrate a case where this is wanted too, we can -;; unobsolete it. --spwhitton +;; bring it back. --spwhitton (defvar vc-finish-logentry-hook nil "Additional hook run at the end of `vc-finish-logentry'.") (make-obsolete-variable 'vc-finish-logentry-hook 'vc-log-after-operation-hook diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index ddc5af317bb..ef8c74a9f31 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -235,7 +235,7 @@ VC commands are globally reachable under the prefix \\[vc-prefix-map]: ;; ;; In addition we store some whole-repository properties keyed to the ;; repository root. We invalidate/update these during VC operations, -;; but there isn't a point analagous to the killing of a buffer at which +;; but there isn't a point analogous to the killing of a buffer at which ;; we clear them all out, like there is for per-file properties. (defvar vc-file-prop-obarray (obarray-make 17) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 748197484d0..d5d00540673 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1095,7 +1095,7 @@ value other than `ask' if you have a strong grasp of the VCS in use." (const :tag "Allow without prompting" t)) :version "31.1") -(defconst vc-cloneable-backends-custom-type +(defconst vc-clonable-backends-custom-type `(choice :convert-widget ,(lambda (widget) (let (opts) @@ -1106,6 +1106,9 @@ value other than `ask' if you have a strong grasp of the VCS in use." (widget-put widget :args opts)) widget)) "The type of VC backends that support cloning VCS repositories.") +(define-obsolete-variable-alias + 'vc-cloneable-backends-custom-type + 'vc-clonable-backends-custom-type "31.1") (defcustom vc-clone-heuristic-alist `((,(rx bos "http" (? "s") "://" @@ -1147,7 +1150,7 @@ specifying a backend. Each element of the alist has the form the first association for which the URL of the repository matches the URL-REGEXP of the association." :type `(alist :key-type (regexp :tag "Regular expression matching URLs") - :value-type ,vc-cloneable-backends-custom-type) + :value-type ,vc-clonable-backends-custom-type) :version "31.1") (defcustom vc-async-checkin nil @@ -4042,7 +4045,7 @@ The command prompts for the branch whose change log to show." ;; else cherry-picks the very same commits that you have outstanding, ;; and pushes them. Given this, we implement our own caching. ;; - ;; Do store `nil', before signalling an error, if there is no incoming + ;; Do store `nil', before signaling an error, if there is no incoming ;; revision, because that's also something that can be slow to ;; determine and so should be remembered. (if-let* ((_ (not refresh)) diff --git a/lisp/windmove.el b/lisp/windmove.el index ed76c67ac46..8e6aee2dd7a 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -444,7 +444,7 @@ it is relative to the top edge (for positive ARG) or the bottom edge If no window is at the desired location, an error is signaled unless `windmove-create-window' is non-nil and a new window is created. -If `windmove-allow-repeated-command-override' is true and this commnad +If `windmove-allow-repeated-command-override' is true and this command stopped because it wouldn't move into a window marked with `no-other-window', repeating the command will move into that window." (interactive "P\np") @@ -462,7 +462,7 @@ negative ARG) of the current window. If no window is at the desired location, an error is signaled unless `windmove-create-window' is non-nil and a new window is created. -If `windmove-allow-repeated-command-override' is true and this commnad +If `windmove-allow-repeated-command-override' is true and this command stopped because it wouldn't move into a window marked with `no-other-window', repeating the command will move into that window." (interactive "P\np") @@ -480,7 +480,7 @@ bottom edge (for negative ARG) of the current window. If no window is at the desired location, an error is signaled unless `windmove-create-window' is non-nil and a new window is created. -If `windmove-allow-repeated-command-override' is true and this commnad +If `windmove-allow-repeated-command-override' is true and this command stopped because it wouldn't move into a window marked with `no-other-window', repeating the command will move into that window." (interactive "P\np") @@ -498,7 +498,7 @@ it is relative to the left edge (for positive ARG) or the right edge If no window is at the desired location, an error is signaled unless `windmove-create-window' is non-nil and a new window is created. -If `windmove-allow-repeated-command-override' is true and this commnad +If `windmove-allow-repeated-command-override' is true and this command stopped because it wouldn't move into a window marked with `no-other-window', repeating the command will move into that window." (interactive "P\np") diff --git a/src/dispnew.c b/src/dispnew.c index 4ec6e22ea46..d7833fe999c 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3271,7 +3271,7 @@ DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "", Let a "root" frame be a frame that has no parent frame. Such root frames are required to be the size of the terminal screen. The - current glyph matrix of a root frame of a termimnal represents what + current glyph matrix of a root frame of a terminal represents what is on the screen. The desired matrix of a root frame represents what should be one the screen. diff --git a/src/editfns.c b/src/editfns.c index eb7d77ade55..4b13c6da90a 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1932,7 +1932,7 @@ DEFUN ("replace-region-contents", Freplace_region_contents, (get-buffer (read-buffer-to-switch \"Source buffer: \")))", doc: /* Replace the region between BEG and END with that of SOURCE. SOURCE can be a buffer, a string, or a vector [SBUF SBEG SEND] -denoting the subtring SBEG..SEND of buffer SBUF. +denoting the substring SBEG..SEND of buffer SBUF. If optional argument INHERIT is non-nil, the inserted text will inherit properties from adjoining text. @@ -1953,7 +1953,7 @@ for comparing the buffers. If it takes longer than MAX-SECS, the function falls back to a plain `delete-region' and `insert-buffer-substring'. (Note that the checks are not performed too evenly over time, so in some cases it may run a bit longer than -allowed). In partricular, passing zero as the value of MAX-SECS +allowed). In particular, passing zero as the value of MAX-SECS disables the comparison step, so this function immediately falls back to a plain delete/insert method. diff --git a/src/frame.c b/src/frame.c index 398352e9daf..1594578c06d 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1986,7 +1986,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor the one you're actually typing in. */ /* FIXME/tty: I don't understand this. (The comment above is from - Jim BLandy 1993 BTW, and the frame_ancestor_p from 2017.) + Jim Blandy 1993 BTW, and the frame_ancestor_p from 2017.) Setting the last event frame to nil leads to switch-frame events being generated even if they normally wouldn't be because the frame diff --git a/src/lread.c b/src/lread.c index 9c4da863363..41aae928255 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2207,7 +2207,7 @@ readevalloop (Lisp_Object readcharfun, specbind (Qstandard_input, readcharfun); - /* In an .elc file, all shorthand expansion has alreay taken place, so + /* In an .elc file, all shorthand expansion has already taken place, so make sure we disable any read-symbol-shorthands set higher up in the stack of recursive 'load'. */ if (STRINGP (sourcename) && suffix_p (sourcename, ".elc")) diff --git a/src/nsterm.m b/src/nsterm.m index 6eb1e88a182..9468832b6d5 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3957,7 +3957,7 @@ ns_maybe_dumpglyphs_background (struct glyph_string *s, char force_p) struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (s->f); #ifdef NS_IMPL_COCOA /* On cocoa emacs the stipple is stored as a mask CGImage. - First we want to clear the background with the bg colour */ + First we want to clear the background with the bg color. */ [[NSColor colorWithUnsignedLong:face->background] set]; r = NSMakeRect (s->x, s->y + box_line_width, s->background_width, @@ -3978,7 +3978,7 @@ ns_maybe_dumpglyphs_background (struct glyph_string *s, char force_p) CGContextClipToRect (context, r); CGContextScaleCTM (context, 1, -1); - /* Stamp the foreground colour using the stipple mask */ + /* Stamp the foreground color using the stipple mask */ [[NSColor colorWithUnsignedLong:face->foreground] set]; CGRect imageSize = CGRectMake (0, 0, CGImageGetWidth (mask), CGImageGetHeight (mask)); diff --git a/src/print.c b/src/print.c index 6d0033c21f1..55a8f7361c7 100644 --- a/src/print.c +++ b/src/print.c @@ -1130,7 +1130,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context, we throw any information away. */ && !NILP (XCAR (tail)) && NILP (XCDR (tail))) { - /* Prevent message3 from outputting a newline aftere "user-error:". */ + /* Prevent message3 from outputting a newline after "user-error:". */ reset_message_log_need_newline (); message3 (XCAR (tail)); return; diff --git a/src/regex-emacs.c b/src/regex-emacs.c index d3017f46751..1fc45a9e20d 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c @@ -3751,7 +3751,7 @@ skip_one_char (re_char *p) C is character to test (possibly after translations) and CORIG is original character (i.e. without any translations). UNIBYTE denotes whether c is unibyte or multibyte character. - CANON_TABLE is the canonicalisation table for case folding or Qnil. */ + CANON_TABLE is the canonicalization table for case folding or Qnil. */ static bool execute_charset (re_char **pp, int c, int corig, bool unibyte, Lisp_Object canon_table) diff --git a/src/treesit.c b/src/treesit.c index 3d63ad67157..5049c62b06d 100644 --- a/src/treesit.c +++ b/src/treesit.c @@ -446,7 +446,7 @@ init_treesit_functions (void) tracking/non-tracking, it stays that way, regardless of later changes to treesit-languages-require-line-column-tracking. - To make calculating line/column positons fast, we store linecol + To make calculating line/column positions fast, we store linecol caches for begv, point, and zv in the buffer (buf->ts_linecol_cache_xxx); and in the parser object, we store linecol cache for visible beg/end of that parser. @@ -1072,7 +1072,7 @@ treesit_linecol_of_pos (ptrdiff_t target_bytepos, /* When we finished searching for newlines between CACHE and TARGET_POS, BYTE_POS_2 is at TARGET_POS, and BYTE_POS_1 is at the - previous newline. If TARGET_POS happends to be on a newline, + previous newline. If TARGET_POS happens to be on a newline, BYTE_POS_1 will be on that position. BYTE_POS_1 is used for calculating the column. (If CACHE and TARGET_POS are in the same line, BYTE_POS_1 is unset and we don't use it.) */ @@ -1245,7 +1245,7 @@ treesit_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte, } /* Given a position at POS_LINECOL, and the linecol of a buffer change - (START_LINECOL, OLD_END_LINECOL, and NEW_END_LINCOL), compute the new + (START_LINECOL, OLD_END_LINECOL, and NEW_END_LINECOL), compute the new linecol for that position, then scan from this now valid linecol to TARGET_BYTEPOS and return the linecol at TARGET_BYTEPOS. @@ -1276,7 +1276,7 @@ compute_new_linecol_by_change (struct ts_linecol pos_linecol, { new_linecol = pos_linecol; } - /* 2. When old_end (oe) is before pos, the differnce between pos and + /* 2. When old_end (oe) is before pos, the difference between pos and pos' is the difference between old_end and new_end (ne). | | | | | | @@ -2197,7 +2197,7 @@ treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol, return treesit_query; } -/* Bsically treesit_ensure_query_compiled but can signal. */ +/* Basically treesit_ensure_query_compiled but can signal. */ static void treesit_ensure_query_compiled_signal (Lisp_Object lisp_query) { @@ -4507,7 +4507,7 @@ treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred, if (STRINGP (pred)) { const char *type = ts_node_type (node); - /* ts_node_type returning NULL means something unexpected happend + /* ts_node_type returning NULL means something unexpected happened in tree-sitter, in this case the only reasonable thing is to not match anything. */ if (type == NULL) return false; @@ -4564,8 +4564,8 @@ treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred, /* A bit of code duplication here, but should be fine. */ const char *type = ts_node_type (node); /* ts_node_type returning NULL means something unexpected - happend in tree-sitter, in this case the only reasonable - thing is to not match anything */ + happened in tree-sitter. In this case the only reasonable + thing is to not match anything. */ if (type == NULL) return false; if (!(fast_c_string_match (car, type, strlen (type)) >= 0)) return false; diff --git a/src/treesit.h b/src/treesit.h index e317e15a9f8..cd4d6932d7f 100644 --- a/src/treesit.h +++ b/src/treesit.h @@ -66,7 +66,7 @@ struct Lisp_TS_Parser Lisp_Object last_set_ranges; /* Parsers for embedded code blocks will have a non-zero embed level. The primary parser has level 0, and each additional layer of parser - embedding increments the leve by 1. The embed level can be either + embedding increments the level by 1. The embed level can be either a non-negative integer or nil. Every parser created by 'treesit-parser-create' starts with a nil level. If the value is nil, that means the range functions (treesit-update-ranges and diff --git a/src/w32fns.c b/src/w32fns.c index 88c7a07e0e5..158de459fea 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4277,7 +4277,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam, event. However, for layouts which deliver different characters for AltGr-x - and lCtrl-lAlt-x, this scheme makes the latter character unaccessible + and lCtrl-lAlt-x, this scheme makes the latter character inaccessible in Emacs. While it is easy to access functionality of [C-M-x] in Emacs by other means (for example, by the `controlify' prefix, or using lCtrl-rCtrl-x, or rCtrl-rAlt-x [in this order]), missing diff --git a/src/window.c b/src/window.c index 1d9104cc779..d90a5e86805 100644 --- a/src/window.c +++ b/src/window.c @@ -5450,7 +5450,7 @@ set correctly. See the code of `split-window' for how this is done. */) REFER end up as the sole children of PARENT which replaces WINDOW in the window tree. As a special case, if REFER's cdr is t, reuse REFER's car's old parent as new parent provided it - is a deleted fromer parent window. */ + is a deleted former parent window. */ parent = Fcdr (refer); refer = Fcar (refer); r = decode_any_window (refer); diff --git a/src/xdisp.c b/src/xdisp.c index 06d5481acd3..9208e13e7de 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -14219,7 +14219,7 @@ prepare_menu_bars (void) W, if set, denotes the window that should be considered as selected. For a tty child frame using F as surrogate menu bar frame, this - specifes the child frame's selected window and its buffer shall be + specifies the child frame's selected window and its buffer shall be used for updating the menu bar of the root frame instead of the buffer of the root frame's selected window. */ @@ -24770,7 +24770,7 @@ push_prefix_prop (struct it *it, Lisp_Object prop, int from_buffer) { struct text_pos pos = STRINGP (it->string) ? it->current.string_pos : it->current.pos; - bool phoney_display_string = + bool phony_display_string = from_buffer && STRINGP (it->string) && it->string_from_display_prop_p; eassert (it->method == GET_FROM_BUFFER @@ -24794,7 +24794,7 @@ push_prefix_prop (struct it *it, Lisp_Object prop, int from_buffer) string that follows iterator position). If we don't do that, any display properties on the prefix string will be ignored. The call to pop_it when we are done with the prefix will restore the flag. */ - if (phoney_display_string) + if (phony_display_string) it->string_from_display_prop_p = false; if (STRINGP (prop)) diff --git a/test/lisp/calendar/todo-mode-tests.el b/test/lisp/calendar/todo-mode-tests.el index 157a4c3168c..6beff5e976d 100644 --- a/test/lisp/calendar/todo-mode-tests.el +++ b/test/lisp/calendar/todo-mode-tests.el @@ -825,7 +825,7 @@ automatic testing." Calling todo-show should display the last current todo file, not necessarily the new file. After deleting the new file, todo-show should display the previously current (or default) todo file." - ;; This test has been reported to fail unreproducibly (bug#58473) or + ;; This test has been reported to fail irreproducibly (bug#58473) or ;; reproducibly only on the ZFS filesystem (bug#76381). Since the ;; causes are still unknown, don't run it with 'make check'. :tags '(:unstable) diff --git a/test/lisp/completion-preview-tests.el b/test/lisp/completion-preview-tests.el index 8ce2a30bb27..c44fe313cfe 100644 --- a/test/lisp/completion-preview-tests.el +++ b/test/lisp/completion-preview-tests.el @@ -378,7 +378,7 @@ instead." (should-not exit-fn-args)))) (ert-deftest completion-preview-insert-mid-symbol () - "Test `completion-preview-insert-word' when point is in a mulit-word symbol." + "Test `completion-preview-insert-word' when point is in a multi-word symbol." (with-temp-buffer (setq-local completion-at-point-functions (list diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 0245ad3c977..a9cc6228e40 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -1313,11 +1313,11 @@ byte-compiled. Run with dynamic binding." "warn-make-process-missing-keyword-value.el" "missing value for keyword argument :command") -;;;; NEW STOUGH, 2025-07-13 +;;;; NEW STUFF, 2025-07-13 (bytecomp--define-warning-file-test "macro-warning-position.el" ":18:8:") (bytecomp--define-warning-file-test "macro-warning-position-2.el" ":18:8:") -;;;; END OF NEW STOUGH +;;;; END OF NEW STUFF ;;;; Macro expansion. @@ -1412,7 +1412,7 @@ byte-compiled. Run with dynamic binding." (defun bytecomp-tests--f (x y &optional u v) (list x y u v)) -(ert-deftest bytecomp-tests--warn-arity-noncompiled-callee () +(ert-deftest bytecomp-tests--warn-arity-non-compiled-callee () "Check that calls to non-compiled functions are arity-checked (bug#78685)" (should (not (compiled-function-p (symbol-function 'bytecomp-tests--f)))) (let* ((source (concat ";;; -*-lexical-binding:t-*-\n" @@ -2081,8 +2081,8 @@ EXPECTED-POINT BINDINGS (MODES \\='\\='(ruby-mode js-mode python-mode)) \ (df '((((class color grayscale) (max-colors 75) (background light)) :foreground "cyan")))) (bytecomp--with-warning-test - (rx "Bad face display `defualt'") - (df '((defualt :foreground "cyan")))) + (rx "Bad face display `bad-default'") + (df '((bad-default :foreground "cyan")))) (bytecomp--with-warning-test (rx "`:inverse' is not a valid face attribute keyword") (df '((t :background "blue" :inverse t)))) diff --git a/test/lisp/emacs-lisp/package-vc-tests.el b/test/lisp/emacs-lisp/package-vc-tests.el index 3a6145f39fb..90ac0c994f4 100644 --- a/test/lisp/emacs-lisp/package-vc-tests.el +++ b/test/lisp/emacs-lisp/package-vc-tests.el @@ -46,7 +46,7 @@ ;; Silence byte-compiler (defvar message-auto-save-directory) -(defvar package-vc-tests-preserve-artefacts nil +(defvar package-vc-tests-preserve-artifacts nil "When non-nil preserve temporary files and buffers produced by tests. Each test produces a new temporary directory for each package under test. This leads to creation of [length of `package-vc-tests-packages'] @@ -140,7 +140,7 @@ the package. Otherwise each entry is in a form of PKG." ;; TODO: add test for deleting packages, with asserting ;; `package-vc-selected-packages' -;; TODO: clarify `package-vc-install-all' behaviour with regards to +;; TODO: clarify `package-vc-install-all' behavior with regards to ;; packages installed with `package-vc' but not stored in ;; `package-vc-selected-packages' i.e., packages from ELPAs @@ -412,7 +412,7 @@ names." ;; - keyring is saved in test directory (package-gnupghome-dir (expand-file-name "gnupg" package-user-dir)) - ;; - `package' has been initialised, and there are no + ;; - `package' has been initialized, and there are no ;; `package-archives' defined (package-archives (unless package--initialized (let (package-archives) @@ -440,7 +440,7 @@ names." '(package-vc-tests-install-from-elpa package-vc-tests-checkout-from-elpa-install-from-checkout)) collect name)) - ;; - make test packages recognisable by `package' and + ;; - make test packages recognizable by `package' and ;; `package-vc' internals: (package-archive-contents (mapcar @@ -472,7 +472,7 @@ names." package-vc-tests-elpa-packages)))) (package-vc--archive-data-alist '((test-elpa :version 1 :default-vc Git))) - ;; - `vc-guess-backend-url' is recognising bundles as `Git' + ;; - `vc-guess-backend-url' is recognizing bundles as `Git' ;; repositories: (vc-clone-heuristic-alist `((,(rx "test-package-" (1+ digit) ".bundle" eos) @@ -496,7 +496,7 @@ names." Unbind package defined symbols, and remove package defined features and entries from `load-path',`load-history', and `Info-directory-list'. Delete temporary directories and buffers produced by tests, except for -when PKG matches `package-vc-tests-preserve-artefacts'." +when PKG matches `package-vc-tests-preserve-artifacts'." (let ((pattern (rx string-start (literal package-vc-tests-dir)))) (dolist (entry load-history) (when-let* ((file (car-safe entry)) @@ -534,9 +534,9 @@ when PKG matches `package-vc-tests-preserve-artefacts'." (package-vc-tests-log-buffer-name pkg type))) '(doc make))))) - (if (or (memq package-vc-tests-preserve-artefacts `(t ,pkg)) - (and (listp package-vc-tests-preserve-artefacts) - (memq pkg package-vc-tests-preserve-artefacts))) + (if (or (memq package-vc-tests-preserve-artifacts `(t ,pkg)) + (and (listp package-vc-tests-preserve-artifacts) + (memq pkg package-vc-tests-preserve-artifacts))) (let ((buffers (mapconcat (lambda (buffer) (with-current-buffer buffer diff --git a/test/lisp/erc/resources/base/modes/speaker-status.eld b/test/lisp/erc/resources/base/modes/speaker-status.eld index 4a7d508e35c..fe3654f9117 100644 --- a/test/lisp/erc/resources/base/modes/speaker-status.eld +++ b/test/lisp/erc/resources/base/modes/speaker-status.eld @@ -22,7 +22,7 @@ (0.00 ":irc.example.net 372 tester : ") (0.00 ":irc.example.net 372 tester : Have fun with the image!") (0.00 ":irc.example.net 376 tester :End of message of the day.") - (0.00 ":irc.example.net 501 tester x :is not a recognised user mode.") + (0.00 ":irc.example.net 501 tester x :is not a recognized user mode.") (0.00 ":NickServ!NickServ@services.int NOTICE tester :Welcome to foonet, tester! Here on foonet, we provide services to enable the registration of nicknames and channels! For details, type \2/msg NickServ help\2 and \2/msg ChanServ help\2.")) ((mode 10 "MODE tester +i") diff --git a/test/lisp/erc/resources/services/regain/taken-ghost.eld b/test/lisp/erc/resources/services/regain/taken-ghost.eld index d5afd124a43..0a02f4dedb1 100644 --- a/test/lisp/erc/resources/services/regain/taken-ghost.eld +++ b/test/lisp/erc/resources/services/regain/taken-ghost.eld @@ -34,7 +34,7 @@ ((mode 10 "MODE dummy` +i")) ((privmsg 10 "PRIVMSG NickServ :GHOST dummy") - (0.00 ":irc.example.net 501 dummy` x :is not a recognised user mode.") + (0.00 ":irc.example.net 501 dummy` x :is not a recognized user mode.") (0.00 ":irc.example.net NOTICE dummy` :*** You are connected to irc.example.net using TLS (SSL) cipher 'TLS1.3-ECDHE-RSA-AES-256-GCM-AEAD'") (0.03 ":dummy`!dummy@10.0.2.100 MODE dummy` :+i") (0.02 ":NickServ!NickServ@services.int NOTICE dummy` :\2dummy\2 has been ghosted.")) diff --git a/test/lisp/erc/resources/services/regain/taken-regain.eld b/test/lisp/erc/resources/services/regain/taken-regain.eld index 22635d4cc89..dacd6d866b0 100644 --- a/test/lisp/erc/resources/services/regain/taken-regain.eld +++ b/test/lisp/erc/resources/services/regain/taken-regain.eld @@ -31,7 +31,7 @@ (0.00 ":irc.example.net 375 dummy` :irc.example.net message of the day") (0.00 ":irc.example.net 372 dummy` : Have fun with the image!") (0.00 ":irc.example.net 376 dummy` :End of message of the day.") - (0.00 ":irc.example.net 501 dummy` x :is not a recognised user mode.") + (0.00 ":irc.example.net 501 dummy` x :is not a recognized user mode.") (0.00 ":irc.example.net NOTICE dummy` :*** You are connected to irc.example.net using TLS (SSL) cipher 'TLS1.3-ECDHE-RSA-AES-256-GCM-AEAD'")) ((mode 10 "MODE dummy` +i")) diff --git a/test/lisp/eshell/em-prompt-tests.el b/test/lisp/eshell/em-prompt-tests.el index ed2cd02a516..7b5821c3337 100644 --- a/test/lisp/eshell/em-prompt-tests.el +++ b/test/lisp/eshell/em-prompt-tests.el @@ -201,10 +201,10 @@ This tests the case when `eshell-highlight-prompt' is nil." (eshell-insert-command "echo 'high five'") (eshell-insert-command "echo 'up high\n\ndown low'") (eshell-insert-command "echo 'too slow'") - (insert "echo goodby") ; A partially-entered command. + (insert "echo good") ; A partially-entered command. (ert-info ("Go back to the last prompt") (eshell-backward-paragraph) - (should (at-prompt-for-command-p "echo goodby"))) + (should (at-prompt-for-command-p "echo good"))) (ert-info ("Go back to the paragraph break") (eshell-backward-paragraph 2) (should (looking-at "\ndown low\n"))) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 3eb54f2b58d..979ff7edfc0 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3883,7 +3883,7 @@ This tests also `access-file', `file-readable-p', (delete-file tmp-name2) ;; A non-existent or cyclic link target makes the file - ;; unaccessible. + ;; inaccessible. (dolist (target `("does-not-exist" ,(file-name-nondirectory tmp-name2))) (make-symbolic-link target tmp-name2) diff --git a/test/lisp/progmodes/cperl-mode-tests.el b/test/lisp/progmodes/cperl-mode-tests.el index 424e89604b3..94d73322c3a 100644 --- a/test/lisp/progmodes/cperl-mode-tests.el +++ b/test/lisp/progmodes/cperl-mode-tests.el @@ -217,7 +217,7 @@ attributes, prototypes and signatures." (goto-char end-of-sub)))))) (ert-deftest cperl-test-fontify-builtin-constants () - "Test fontificiation of the floating point constants \"nan\" and \"inf\"." + "Test fontification of the floating point constants \"nan\" and \"inf\"." (skip-unless (eq cperl-test-mode #'cperl-mode)) (let ((constants '("my $min=-builtin::inf;" "my $unknown = builtin::nan;" diff --git a/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts b/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts index f2d0eacee5b..8cbae399f3b 100644 --- a/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts +++ b/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts @@ -79,7 +79,7 @@ def foo() do end =-=-= -Name: Bitstring mulitline +Name: Bitstring multiline =-= <<12, 22, diff --git a/test/lisp/textmodes/ispell-tests/ispell-tests.el b/test/lisp/textmodes/ispell-tests/ispell-tests.el index 8f733d05d2c..15687ed6f0f 100644 --- a/test/lisp/textmodes/ispell-tests/ispell-tests.el +++ b/test/lisp/textmodes/ispell-tests/ispell-tests.el @@ -135,7 +135,7 @@ Give `ispell-program-name' a real spellchecker." "Check that `ispell-call-process' works. This test fails, because HOME is not defined. This should not be the case, because `ispell-call-process' -whould be making sure that the directory for running +would be making sure that the directory for running the backend's process exists." :expected-result :failed (should @@ -175,7 +175,7 @@ makes it useless." (equal (buffer-string) string-to-send)))))) (ert-deftest ispell/ispell-call-process-region/cat-random () - "Check `ispell-call-process-region' works with unrelad process. + "Check `ispell-call-process-region' works with unrelated process. This test is expected to fail, because at the moment, there is a construction (let ((default-directory `default-directory'))...) in the `ispell-with-safe-default-directory' function, which effectively @@ -212,7 +212,7 @@ makes it useless." This function only works for aspell and ispell, for hunspell and enchant-2 it always returns either default or everything. I think this is an issue in itself, but this test is added to verify -that changes to third-party code do not break existing behaviour." +that changes to third-party code do not break existing behavior." (skip-unless (executable-find "hunspell")) (skip-unless (equal 0 (call-process "hunspell" nil nil nil))) (ispell-tests--letopt @@ -233,7 +233,7 @@ that changes to third-party code do not break existing behaviour." This function only works for aspell and ispell, for hunspell and enchant-2 it always returns either default or everything. I think this is an issue in itself, but this test is added to verify -that changes to third-party code do not break existing behaviour." +that changes to third-party code do not break existing behavior." (skip-unless (executable-find "hunspell")) (skip-unless (equal 0 (call-process "hunspell" nil nil nil))) (ispell-tests--letopt @@ -254,7 +254,7 @@ that changes to third-party code do not break existing behaviour." This function only works for aspell and ispell, for hunspell and enchant-2 it always returns either default or everything. I think this is an issue in itself, but this test is added to verify -that changes to third-party code do not break existing behaviour." +that changes to third-party code do not break existing behavior." (skip-unless (executable-find "enchant-2")) (ispell-tests--letopt ((ispell-program-name "enchant-2") @@ -274,7 +274,7 @@ that changes to third-party code do not break existing behaviour." This function only works for aspell and ispell, for hunspell and enchant-2 it always returns either default or everything. I think this is an issue in itself, but this test is added to verify -that changes to third-party code do not break existing behaviour." +that changes to third-party code do not break existing behavior." (skip-unless (executable-find "enchant-2")) (ispell-tests--letopt ((ispell-program-name "enchant-2") @@ -525,8 +525,8 @@ presumably nobody will have `ispell-tests--constants/english/wrong' (expand-file-name (format "%s" (random)) temporary-file-directory)))) - (ert-deftest ispell/ispell-buffer-local-dict/no-reload+no-overriden () - "ispell.el can recognise keyword-defined dictionary and keyword-defined + (ert-deftest ispell/ispell-buffer-local-dict/no-reload+no-overridden () + "ispell.el can recognize keyword-defined dictionary and keyword-defined personal-dictionary." (with-temp-buffer (nxml-mode) @@ -541,8 +541,8 @@ personal-dictionary." (should (equal ispell-local-pdict test-pdict))) possible-pdict-paths)))) - (ert-deftest ispell/ispell-buffer-local-dict/reload+no-overriden () - "ispell.el can recognise keyword-defined dictionary and keyword-defined + (ert-deftest ispell/ispell-buffer-local-dict/reload+no-overridden () + "ispell.el can recognize keyword-defined dictionary and keyword-defined personal-dictionary." :expected-result :failed (with-temp-buffer @@ -559,8 +559,8 @@ personal-dictionary." (should (equal ispell-current-personal-dictionary test-pdict)))) possible-pdict-paths)))) - (ert-deftest ispell/ispell-buffer-local-dict/no-reload+overriden () - "ispell.el can recognise keyword-defined dictionary and keyword-defined + (ert-deftest ispell/ispell-buffer-local-dict/no-reload+overridden () + "ispell.el can recognize keyword-defined dictionary and keyword-defined personal-dictionary. With no-reload it needs no backend at all." (with-temp-buffer (nxml-mode) @@ -577,8 +577,8 @@ personal-dictionary. With no-reload it needs no backend at all." (should (equal ispell-local-pdict test-pdict)))) possible-pdict-paths)))) - (ert-deftest ispell/ispell-buffer-local-dict/reload+overriden () - "ispell.el can recognise keyword-defined dictionary and keyword-defined + (ert-deftest ispell/ispell-buffer-local-dict/reload+overridden () + "ispell.el can recognize keyword-defined dictionary and keyword-defined personal-dictionary. With no-reload it needs no backend at all." :expected-result :failed (with-temp-buffer @@ -601,7 +601,7 @@ personal-dictionary. With no-reload it needs no backend at all." ;; parsing (ert-deftest ispell/ispell-buffer-local-parsing/local-keyword () - "Check that ispell.el can suscessfully pick up a tex parser from a buffer-local keyword." + "Check that ispell.el can successfully pick up a tex parser from a buffer-local keyword." ;; FIXME: what if default dictionary sets ;; (ispell-get-extended-character-mode) ? (with-temp-buffer @@ -640,7 +640,7 @@ personal-dictionary. With no-reload it needs no backend at all." ) (ert-deftest ispell/ispell-buffer-local-parsing/local-keyword/hunspell-bug () - "Check that ispell.el can suscessfully pick up a tex parser from a buffer-local keyword." + "Check that ispell.el can successfully pick up a tex parser from a buffer-local keyword." ;; FIXME: what if default dictionary sets ;; (ispell-get-extended-character-mode) ? :expected-result :failed @@ -679,7 +679,7 @@ personal-dictionary. With no-reload it needs no backend at all." ) (ert-deftest ispell/ispell-buffer-local-parsing/mode-tex () - "Check that ispell.el can suscessfully pick up a tex parser from tex-based mode-name. + "Check that ispell.el can successfully pick up a tex parser from tex-based mode-name. There is another implicit check here: explicit-character-mode \(argument 7 from the ispell.el dictionary structure) is nil." (with-temp-buffer @@ -716,7 +716,7 @@ There is another implicit check here: explicit-character-mode ) (ert-deftest ispell/ispell-buffer-local-parsing/extended-character-mode () - "Check that ispell.el can suscessfully pick up an extended character mode from the dictionary." + "Check that ispell.el can successfully pick up an extended character mode from the dictionary." (with-temp-buffer (insert ispell-tests--constants/english/correct-one "\n\n\n") diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index b82fb3effbe..24d08ba7a9f 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -686,7 +686,7 @@ orange (insert patch) (goto-char (point-min)) (diff-hunk-next) - ;; Undo hunk by dwim behaviour + ;; Undo hunk by dwim behavior (cl-letf (((symbol-function 'y-or-n-p) #'always)) (diff-apply-hunk))) (with-current-buffer buf-after @@ -734,7 +734,7 @@ plum (insert patch) (goto-char (point-min)) (diff-hunk-next) - ;; Undo hunk by dwim behaviour + ;; Undo hunk by dwim behavior (cl-letf (((symbol-function 'y-or-n-p) #'always)) (diff-apply-hunk))) (with-current-buffer buf-after diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el index fdc9a0b41b9..1c9a6a2b603 100644 --- a/test/lisp/vc/log-edit-tests.el +++ b/test/lisp/vc/log-edit-tests.el @@ -407,7 +407,7 @@ CVS: Abort checkin if you answer no. "Strip lines that contain solely \"CVS:\" when using CVS as VC backend." ;; This test verifies that lines consisting only of "CVS:" (no blank ;; after the colon) are stripped from the commit message. - ;; CVS does this to accomodate editors that delete trailing whitespace. + ;; CVS does this to accommodate editors that delete trailing whitespace. (let (string wanted) (setq string "CVS:\n" wanted "") diff --git a/test/manual/etags/merc-src/accumulator.m b/test/manual/etags/merc-src/accumulator.m index 0ee41216c11..2bfe142a935 100644 --- a/test/manual/etags/merc-src/accumulator.m +++ b/test/manual/etags/merc-src/accumulator.m @@ -53,7 +53,7 @@ % in CVS papers archive in the directory update, but has been submitted % to PPDP '00. % -% The transformation recognises predicates in the form +% The transformation recognizes predicates in the form % % p(In, OutUpdate, OutAssoc) :- % minimal(In), diff --git a/test/src/editfns-tests.el b/test/src/editfns-tests.el index a66e25ddc6a..e387460a149 100644 --- a/test/src/editfns-tests.el +++ b/test/src/editfns-tests.el @@ -368,7 +368,7 @@ Execute tests as described by `editfns-tests--transpose-regions-tests'." (should (equal (mapcar #'marker-position pmarkers) pmpos)) ;; Meh. This more or less blindly duplicates function ;; transpose_markers, since I have been too lazy to - ;; reproduce the arithmetics myself. + ;; reproduce the arithmetic myself. (setq pmpos (mapcar (lambda (pos) diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el index 89303114735..e107829621a 100644 --- a/test/src/treesit-tests.el +++ b/test/src/treesit-tests.el @@ -235,7 +235,7 @@ ;;; Linecol (ert-deftest treesit-linecol-basic () - "Tests for basic lincol synchronization." + "Tests for basic linecol synchronization." (skip-unless (fboundp 'treesit--linecol-cache)) (with-temp-buffer (should (equal (treesit--linecol-cache)