December 2025 spelling fixes

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.

12 files changed, 23 insertions, 23 deletions

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))