; Fix typos

(cherry picked from commit 67a27ff53bf0f8473cb6b58ad85298e066b8def4)

diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index 1dc4fb8f014ece840f46cb0fb823ec44c084fd80..f4c67ae83e82fc3315b42d63b26f56ca2c44ed81 100644 (file)
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1701,8 +1701,6 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph
        5b34fc07085 * lisp/treesit.el (treesit-node-at): Update docstring (bu...
        5cf1de683b2 Fix python-fill-paragraph problems on filling strings (bu...
        7678b7e46f2 Eglot: check server capability before sending didSave (bu...
-       7678b7e46f2 Eglot: check server capability before sending didSave (bu...
-       9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu...
        9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu...
        9e105d483fa Fix c-ts-mode indentation for statement after preproc (bu...
        When running emacs in a terminal (or at least, in iTerm), keys are not
@@ -1736,7 +1734,6 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph
        ed3bab3cc72 Revert 'forward-sentence-default-function' to return poin...
        b3e930d328e Revert inadvertent change to lisp/icomplete.el in previou...
        973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid...
-       973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid...
        e444115d026 Improve keymap-global-set and keymap-local-set interactiv...
        8e9783b4ce4 Rebind in read-regexp-map ‘M-c’ to ‘M-s c’ compatible wit...
        f12f72b0e09 ; * lisp/simple.el (primitive-undo): Clarify error messag...
@@ -1744,3 +1741,5 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph
        b211a63455c Make tab-bar-tab-group-format-function also handle curren...
        a3c310c11a Create new "use-package" themse and use it for :custom wit...
        2a85d81c47 Add support for gathering statistics on use-package declar...
+            (let* ((nam (buffer-substring (match-beginning 2) (match-end 2)))
+             (setq nmlst (cons nam nmlst)

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 751a0412d8c6341a8263e691f856a71bc7191cc3..8d5be7cc30602ff10fc5fa393257b5fe9d07f211 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1430,7 +1430,7 @@ If you need to contact the Free Software Foundation, see
 
 @display
 Free Software Foundation
-31 Milk Street # 960789
+31 Milk Street, # 960789
 Boston, MA 02196
 USA
 @end display

diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
index cea8f85c081a2c08c0a47c3757c4954dc144d8ea..1c3c3b26752b9c37c4c3a4504170a970e705d892 100644 (file)
--- a/etc/themes/adwaita-theme.el
+++ b/etc/themes/adwaita-theme.el
@@ -105,4 +105,4 @@ default look of the Gnome 3 desktop."
    `(diff-added ((,class (:bold t :foreground "#4E9A06"))))
    `(diff-removed ((,class (:bold t :foreground "#F5666D"))))))
 
-;;; adwaita-theme.el  ends here
+;;; adwaita-theme.el ends here

diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index b902f293ca0ae06dab63c0ff8621128186490e46..820b4d397b5b1e6462777e8c04b3296e44be5b0e 100644 (file)
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -37,7 +37,7 @@
 ;; viewed, for example, the Gnus group buffer, consistent and logical
 ;; color choices are the only sane option.  Gnus groups can be newa
 ;; (blueish) or mail (greenish), have states (large number of under
-;; messages, normal, and empty). The large number unread groups have
+;; messages, normal, and empty).  The large number unread groups have
 ;; highest luminance (appear brighter), and the empty one have lower
 ;; luminance (appear grayer), but have the same chroma and saturation.
 ;; Sub states and group priorities are rendered using a color series
@@ -704,4 +704,4 @@ jarring angry fruit salad look to reduce eye fatigue."
 
 (provide-theme 'manoj-dark)
 
-;;; manoj-dark.el ends here
+;;; manoj-dark-theme.el ends here

diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
index 75693b59016752b2898fdd25e72cfc1bd3f10e11..6487356fbb15dbb82289ae07df5c890373eec4f5 100644 (file)
--- a/etc/themes/misterioso-theme.el
+++ b/etc/themes/misterioso-theme.el
@@ -134,4 +134,4 @@
 
 (provide-theme 'misterioso)
 
-;;; misterioso-theme.el  ends here
+;;; misterioso-theme.el ends here

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 36df143a82a64d4c13b133f736b095a54ecae159..ac9254c867a06e74128fc12d5437c0d27221d516 100644 (file)
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -584,7 +584,7 @@ of the piece of advice."
 ;;;###autoload
 (defmacro define-advice (symbol args &rest body)
   "Define an advice and add it to function named SYMBOL.
-See `advice-add' and `add-function' for explanation on the
+See `advice-add' and `add-function' for explanation of the
 arguments.  If NAME is non-nil, the advice is named `SYMBOL@NAME'
 and installed with the name NAME; otherwise, the advice is anonymous.
 

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 0c2da768833d12bb36fce65f31f931ca54cae95b..f4b1eea16b499922e8f38f8e31927f73da5a74cb 100644 (file)
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1488,9 +1488,9 @@ recommended to enable `electric-pair-mode' with this mode."
       :help "Toggle C/C++ comment style between block and line comments"])
     "--"
     ("Toggle..."
-     ["SubWord Mode" subword-mode
+     ["Subword Mode" subword-mode
       :style toggle :selected subword-mode
-      :help "Toggle sub-word movement and editing mode"])))
+      :help "Toggle subword movement and editing mode"])))
 
 ;; We could alternatively use parsers, but if this works well, I don't
 ;; see the need to change.  This is copied verbatim from cc-guess.el.

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 22fdcf17c9861ae9fab2beeedbbe668cad455437..056828e06556a50f0a8d4ea296ae386069a6ed79 100644 (file)
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1904,7 +1904,7 @@ If no file is associated with the current buffer, this function returns nil."
 (defun list-tags (file &optional _next-match)
   "Display list of tags in file FILE.
 Interactively, prompt for FILE, with completion, offering the current
-buffer's file name as the defaul.
+buffer's file name as the default.
 This command searches only the first table in the list of tags tables,
 and does not search included tables.
 FILE should be as it was submitted to the `etags' command, which usually

diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index c8f50f7feacee3f64496117b318708b92248530d..9d41877fd2acb66da0a6721f207006461234efea 100644 (file)
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -437,7 +437,7 @@ Useful for debugging."
 
 Return `php-ts-mode-indent-offset' plus 1 when BOL is after
 `php-ts-mode--possibly-braceless-keyword-re', otherwise return 0.  It's
-usefull for matching incomplete compound_statement or colon_block.
+useful for matching incomplete compound_statement or colon_block.
 PARENT is NODE's parent, BOL is the beginning of non-whitespace
 characters of the current line."
   (and (null node)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index f1b525375cc7100b8dd518c795d0de6d006d7102..91efdb30f31571896f1dc096fed8c3bddc3d17d6 100644 (file)
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3083,7 +3083,7 @@ If `treesit-defun-name-function' is non-nil, set up
 If `treesit-simple-imenu-settings' is non-nil, set up Imenu.
 
 If either `treesit-outline-predicate' or `treesit-simple-imenu-settings'
-are non-nil, and Outline minor mode settings don't alreay exist, setup
+are non-nil, and Outline minor mode settings don't already exist, setup
 Outline minor mode.
 
 If `sexp', `sentence' are defined in `treesit-thing-settings',

diff --git a/test/lisp/eshell/em-glob-tests.el b/test/lisp/eshell/em-glob-tests.el
index 239968917abc070014db2c36b836d4cfb66f8ddc..16ae9be1bcee0a00c168432b5d9dc7e1f321ec79 100644 (file)
--- a/test/lisp/eshell/em-glob-tests.el
+++ b/test/lisp/eshell/em-glob-tests.el
@@ -74,7 +74,7 @@ component ending in \"symlink\" is treated as a symbolic link."
       ;; Ensure the default expansion splices the glob.
       (eshell-command-result-equal "funcall list *.el" '("a.el" "b.el"))
       (eshell-command-result-equal "funcall list *.txt" '("c.txt"))
-      ;; When spliting, no-matches cases also return a list containing
+      ;; When splitting, no-matches cases also return a list containing
       ;; the original non-matching glob.
       (eshell-command-result-equal "funcall list *.no" '("*.no"))
       (when (eshell-tests-remote-accessible-p)

diff --git a/test/lisp/progmodes/c-ts-mode-resources/indent.erts b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
index f97ceac61f5104f5c4b138eb7887fae308e6f5ab..2f3540c39705b5b7160bd15998bf3b28d4c63506 100644 (file)
--- a/test/lisp/progmodes/c-ts-mode-resources/indent.erts
+++ b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
@@ -208,7 +208,7 @@ int main()
 }
 =-=-=
 
-Name: Return Compund Literal
+Name: Return Compound Literal
 
 =-=
 struct pair { int fst, snd; };