; Fix typos

(cherry picked from commit bef514de4d3c88f60ad23115ec10f0ec064e9ae7)

diff --git a/ChangeLog.3 b/ChangeLog.3
index ef63f674b59ec402b9315fec56f7617ea40c7663..46fc57cd0c0207be22702105d2f888574b310947 100644 (file)
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -229133,7 +229133,7 @@
        ee9a1f7 Support safe navigation operator in non-SMIE indentation code
        c3ed95b Move xsd:base64Binary decoding fix to debbugs.el 0.9.1
        2036be4 Fix Ruby's operator precedence
-       1d686c2 (ruby-interpolation-inside-another-interpolation): New failin...
+       1d686c2 (ruby-interpolation-inside-another-interpolation): New failing...
        7950e1d Port to clang 3.7.0 on x86-64
        218ae59 * test/automated/package-test.el (package-test-signed): Tweak...
        ba33b7c Sync with gnulib

diff --git a/ChangeLog.4 b/ChangeLog.4
index 3eb2c16d6b1bd9e09a9f4de20258f801a464b7ef..a9450fdba6ce711b17b77585ab507465fe2cabc3 100644 (file)
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -4268,7 +4268,7 @@
 
 2023-07-20  Po Lu  <luangruo@yahoo.com>
 
-       Fix typos and ommissions in cus-edit.el
+       Fix typos and omissions in cus-edit.el
 
        * lisp/cus-edit.el (custom-display): Add missing display types.
 

diff --git a/INSTALL b/INSTALL
index 59a8063ba192e7aaf6bc7d585d04d2af4d7aae2f..d5ce16db14763fc59414fd672bce2dc6edda1d94 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -65,7 +65,7 @@ sections if you need to.
 
                 ./configure --prefix=/SOME/OTHER/DIRECTORY
 
-      where /SOME/OTHER/DIRECTORY is a directory writeable by your user,
+      where /SOME/OTHER/DIRECTORY is a directory writable by your user,
       for example, a subdirectory of your home directory.
 
   3. When 'configure' finishes, it prints several lines of details
@@ -470,7 +470,7 @@ should put emacs and its data files.  This defaults to '/usr/local'.
 
 If you don't have write access to the default '/usr/local' tree, and
 cannot have root access (without which "make install" will fail),
-specify '--prefix=PREFIXDIR' where PREFIXDIR is a directyory writeable
+specify '--prefix=PREFIXDIR' where PREFIXDIR is a directory writable
 by your user, for example your HOME directory or some subdirectory of
 it.
 

diff --git a/admin/codespell/codespell.dictionary b/admin/codespell/codespell.dictionary
index b082a48fe9963390b5048f2483f8c23f2ccf46d4..59065fbf8e23750cbe38a162bbcacd00115528f8 100644 (file)
--- a/admin/codespell/codespell.dictionary
+++ b/admin/codespell/codespell.dictionary
@@ -6,9 +6,9 @@ defalises->defaliases
 ecmacs->emacs
 ehsell->eshell
 emcs->emacs
+file-writeable-p->file-writable-p
 finis->finish
 firs->first
-file-writeable-p->file-writable-p
 hep->help
 least-favourite->least-favorite
 lien->line

diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index 6413a73701b122ad0f8c5376f4682c0087b46109..0fe6e0ea8f84b9f1c8ed2d9d81492905dc029228 100644 (file)
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1585,3 +1585,16 @@ VERY VERY LONG STRIN | VERY VERY LONG STRIN
 .UE .
  (0.03 ":bob!~u@euegh6mj3y8r2.irc PRIVMSG #chan :alice: See, by good hap, yonder's my lord; I have sweat to see his honour.")
  (0.05 ":bob!~u@euegh6mj3y8r2.irc PRIVMSG #chan :alice: But, in defence, by mercy, 'tis most just.")
+               "n" "nu" "nul" "nulL" "nulll"
+       rin=\E[%p1%dT, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
+       (ede-load-project-file): Add new input DETECTIN.
+(defun ede-load-project-file (dir &optional detectin rootreturn)
+Optional DETECTIN is an autoload cons from `ede-detect-directory-for-project'
+          (detect (or detectin (ede-directory-project-cons path)))
+                               ;; Postpone readin hook till we map
+             ;; Don't make undo entries for readin.
+  :nicky!uhuser@host212223.dialin.fnordisp.net PRIVMSG #lazybastards :Hello!
+         (skipp (or (bound-and-true-p erc-stamp--display-margin-mode)
+         (erc--msg-prop-overrides `(,@(and skipp `((erc--skip stamp)))
+    ("\\.\\(flc\\|fli\\|rle\\|iff\\|pfx\\|avi\\|sme\\|rpza\\|dl\\|qt\\|rsrc\\|mov\\)$" "xanim")
+    ("\\.sme$" "video/sme")

diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore
index 34de02e969b763356c2d8709a8b86eda6dffe1b6..4f6135ca39a1757cc3796a8cc11f3b11b6df5c5b 100644 (file)
--- a/admin/codespell/codespell.ignore
+++ b/admin/codespell/codespell.ignore
@@ -6,6 +6,7 @@ ans
 bloc
 blocs
 callint
+checkin
 clen
 crossreference
 crossreferences

diff --git a/admin/run-codespell b/admin/run-codespell
index 991b72073b2344740fe90b8effbfca149df7da49..c61bd47d451e18896878562b4ffa47004dd72eca 100755 (executable)
--- a/admin/run-codespell
+++ b/admin/run-codespell
@@ -43,6 +43,7 @@ emacs_run_codespell ()
         grep -v -E -e '^(lib|m4)/.*' |\
         grep -v -E -e '^admin/(charsets|codespell|unidata)/.*' |\
         grep -v -E -e '^doc/misc/texinfo.tex$' |\
+        grep -v -E -e '^doc/translations/.*' |\
         grep -v -E -e '^etc/(AUTHORS|HELLO|publicsuffix.txt)$' |\
         grep -v -E -e '^etc/refcards/(cs|de|fr|pl|pt|sk)-.+.tex$' |\
         grep -v -E -e '^etc/tutorials/TUTORIAL\..+' |\
@@ -50,6 +51,7 @@ emacs_run_codespell ()
         grep -v -E -e '^lisp/language/ethio-util.el' |\
         grep -v -E -e '^lisp/ldefs-boot.el' |\
         grep -v -E -e '^lisp/leim/.*' |\
+        grep -v -E -e '^test/lisp/erc/resources/.*' |\
         grep -v -E -e '^test/lisp/net/puny-resources/IdnaTestV2.txt' |\
         grep -v -E -e '^test/manual/(etags|indent)/.*' |\
         grep -v -E -e '^test/src/regex-resources/.*' |\

diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 7ac1f87532cfb0fbefb4d3da1a721c9254f22b64..c49367cd921555ffd052f418c472829d0b11cd14 100644 (file)
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -397,7 +397,7 @@ remains unmodified.  In-place sorting is slightly faster, but the
 original sequence is lost.
 @end table
 
-If the default behaviour is not suitable for your needs, it is usually
+If the default behavior is not suitable for your needs, it is usually
 easier and faster to supply a new @code{:key} function than a different
 @code{:lessp} predicate.  For example, consider sorting these strings:
 

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 334434870662046da2f0cb12976b415be3a6203c..3e353dc356d4cc35acc778217e41e3f8d8797c3f 100644 (file)
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -88,7 +88,7 @@ The Modus themes consist of eight themes, divided into four subgroups.
   are variants of the two main themes.  They slightly tone down the
   intensity of the background and provide a bit more color variety.
   ~modus-operandi-tinted~ has a set of base tones that are shades of
-  light ochre (earthly colors), while ~modus-vivendi-tinted~ gives a
+  light ocher (earthly colors), while ~modus-vivendi-tinted~ gives a
   night sky impression.
 
 - Deuteranopia themes :: ~modus-operandi-deuteranopia~ and its
@@ -4442,7 +4442,7 @@ advanced customization options of the themes.
 [[#h:f4651d55-8c07-46aa-b52b-bed1e53463bb][Advanced customization]].
 
 In the following example, we are assuming that the user wants to (i)
-re-use color variables provided by the themes, (ii) be able to retain
+reuse color variables provided by the themes, (ii) be able to retain
 their tweaks while switching between ~modus-operandi~ and ~modus-vivendi~,
 and (iii) have the option to highlight either the foreground of the
 parentheses or the background as well.
@@ -4462,7 +4462,7 @@ Then we can update our preference with this:
 (setq my-highlight-parentheses-use-background nil)
 #+end_src
 
-To re-use colors from the themes, we must wrap our code in the
+To reuse colors from the themes, we must wrap our code in the
 ~modus-themes-with-colors~ macro.  Our implementation must interface with
 the variables ~highlight-parentheses-background-colors~ and/or
 ~highlight-parentheses-colors~.

diff --git a/doc/translations/README b/doc/translations/README
index 02edb829dcfe13c133b9905a1792fafcf40febce..d9d11bfcc028369eb575c2e3ab2f9afad64df684 100644 (file)
--- a/doc/translations/README
+++ b/doc/translations/README
@@ -194,7 +194,7 @@ Such tools include:
 etc.
 
 
-* Licence of this document
+* License of this document
 
 Copyright (C) 2024 Free Software Foundation, Inc.
 

diff --git a/etc/themes/modus-operandi-tinted-theme.el b/etc/themes/modus-operandi-tinted-theme.el
index f112456034bd293a15d92b579786fbaf101b4be4..d906715e44c527ba0478e90bdf75593995cf71e0 100644 (file)
--- a/etc/themes/modus-operandi-tinted-theme.el
+++ b/etc/themes/modus-operandi-tinted-theme.el
@@ -1,4 +1,4 @@
-;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ochre background -*- lexical-binding:t -*-
+;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ocher background -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2019-2024  Free Software Foundation, Inc.
 
@@ -44,7 +44,7 @@
 
 ;;;###theme-autoload
   (deftheme modus-operandi-tinted
-    "Elegant, highly legible theme with a light ochre background.
+    "Elegant, highly legible theme with a light ocher background.
 Conforms with the highest legibility standard for color contrast
 between background and foreground in any given piece of text,
 which corresponds to a minimum contrast in relative luminance of

diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 7adf9abfdcbcf1ab10ee3dd90d53aea6d5b0f464..3249f64cc6f7cc7a0d8e3ad64fb6367cb0456223 100644 (file)
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1407,7 +1407,7 @@ This object type doesn't do focus, so will never have a focus object."
   ()
   "Display options in *Completions* buffer.
 Traditional display mechanism for a list of possible completions.
-Completions are showin in a new buffer and listed with the ability
+Completions are shown in a new buffer and listed with the ability
 to click on the items to aid in completion.")
 
 (define-obsolete-function-alias 'semantic-displayor-show-request

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index d4895f3c5f85c8eb7bf3765371933249ad7546bc..a9caa83b15c76e58787819a784b9726859851de0 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8958,7 +8958,7 @@ The difference between N and the number of articles fetched is returned."
            (widen))
        (setq ref
               ;; It's not the current article, or we altered the header,
-              ;; so we use whats in the header vector.
+              ;; so we use what's in the header vector.
              (mail-header-references header)))
       (if (and ref
               (not (equal ref "")))

diff --git a/lisp/subr.el b/lisp/subr.el
index ab5db81c8fc1831a0dd1767ea4f1ac57effd671b..cebf2333eb94827e820137e22676ac675f0b2696 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -5704,7 +5704,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
            (if (multibyte-string-p string)
                (> (max fromchar tochar) 127)
              (> tochar 255)))
-      ;; Avoid quadratic behaviour from resizing replacement.
+      ;; Avoid quadratic behavior from resizing replacement.
       (let ((res (string-replace (string fromchar) (string tochar) string)))
         (unless (eq res string)
           ;; Mend properties broken by the replacement.

diff --git a/src/fns.c b/src/fns.c
index db7fc91bcdb313601e2f464b66e64ca1d60b33c2..ea96d5d667b631805b786d5c2f3a75b82fe03718 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -3056,7 +3056,7 @@ value_cmp (Lisp_Object a, Lisp_Object b, int maxdepth)
       goto type_mismatch;
 
     case Lisp_Cons:
-      /* FIXME: Optimise for difference in the first element? */
+      /* FIXME: Optimize for difference in the first element? */
       FOR_EACH_TAIL (b)
        {
          int cmp = value_cmp (XCAR (a), XCAR (b), maxdepth - 1);