; Fix typos

(cherry picked from commit fc8b09484a2fbe182a0351c47afc3bf71f3b2a1b)

diff --git a/ChangeLog.3 b/ChangeLog.3
index dc712df43ad6909dc001887c94a23a69e369ddf7..7db4986410dedc4e7d998e3d12e2dc5a7c916385 100644 (file)
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -137530,7 +137530,7 @@
        Bind `enable-local-variables' in `hack-connection-local-variables'
 
        * lisp/files-x.el (hack-connection-local-variables):
-       Bind `enable-local-variables', instead of re-declaring
+       Bind `enable-local-variables', instead of redeclaring
        `safe-local-variable-p'.
 
 2019-03-23  Eli Zaretskii  <eliz@gnu.org>
@@ -163179,7 +163179,7 @@
 
        Quieten compilation of octave.el
 
-       * lisp/progmodes/octave.el (compilation-forget-errors): Re-declare.
+       * lisp/progmodes/octave.el (compilation-forget-errors): Redeclare.
 
 2018-02-28  Glenn Morris  <rgm@gnu.org>
 

diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index 416d79cf13122cb4ced9b3a168339303536b674f..6413a73701b122ad0f8c5376f4682c0087b46109 100644 (file)
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1583,3 +1583,5 @@ VERY VERY LONG STRIN | VERY VERY LONG STRIN
     (ert-info ("Joined by bouncer to #chan@foonet, pal persent")
     (ert-info ("Joined by bouncer to #chan@barnet, pal persent")
 .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.")

diff --git a/lisp/erc/erc-common.el b/lisp/erc/erc-common.el
index abcdc4c884391f137c59798ae077fed23fee422c..8388efe062ce964678883e72ecce0167aba9819e 100644 (file)
--- a/lisp/erc/erc-common.el
+++ b/lisp/erc/erc-common.el
@@ -171,7 +171,7 @@ Derived from the advertised \"PREFIX\" ISUPPORT parameter."
 
 ;; After dropping 28, we can use prefixed "erc-autoload" cookies.
 (defun erc--normalize-module-symbol (symbol)
-  "Return preferred SYMBOL for `erc--modules'."
+  "Return preferred SYMBOL for `erc--module'."
   (while-let ((canonical (get symbol 'erc--module))
               ((not (eq canonical symbol))))
     (setq symbol canonical))

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index ef0472012513641abeea68f00ae30067523dc013..08dfa4b8f1bb2faf9762e18a580b2878150f57e6 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6815,7 +6815,7 @@ stand-in from the fallback value \"(qaohv)~&@%+\"."
   "Return numeric rank for CHAR or nil if unknown.
 For example, given letters \"qaohv\" return 1 for ?v, 2 for ?h,
 and 4 for ?o, etc.  If given, expect PARSED-PREFIX to be a
-`erc--parse-prefix' object.  With FROM-PREFIX-P, expect CHAR to
+`erc--parsed-prefix' object.  With FROM-PREFIX-P, expect CHAR to
 be a prefix instead."
   (and-let* ((obj (or parsed-prefix (erc--parsed-prefix)))
              (pos (erc--strpos char (if from-prefix-p

diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 97ddac58629960675ff8029a06758dd87630f91d..78cf28d785a8dc2edbb9181dca8ca949dd936fdf 100644 (file)
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -285,7 +285,7 @@ QUOTED is passed to `eshell-concat' (which see) and, if non-nil,
 allows values to be converted to numbers where appropriate.
 
 ARGS should be a list of lists of arguments, such as that
-produced by `eshell-prepare-slice'.  \"Adjacent\" values of
+produced by `eshell-prepare-splice'.  \"Adjacent\" values of
 consecutive arguments will be passed to `eshell-concat'.  For
 example, if ARGS is
 

diff --git a/lisp/forms.el b/lisp/forms.el
index 009667af273861d117a61d2e1e8da25971fa2c02..3a3160a0c8b4aa2fd4f5e252ea646ac5bc951700 100644 (file)
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -343,7 +343,7 @@ suitable for forms processing.")
 
 (defvar forms-write-file-filter nil
   "The name of a function that is called before writing the data file.
-This can be used to undo the effects of `form-read-file-filter'.")
+This can be used to undo the effects of `forms-read-file-filter'.")
 
 (defvar forms-new-record-filter nil
   "The name of a function that is called when a new record is created.")

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 43f8dec876e9ca8f9ee77ac6dd89070e7c46c20a..6d79d1e67c597207e88c1745790277075d4bfd0e 100644 (file)
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -590,7 +590,7 @@ It is nil if Eglot is not byte-complied.")
   (let ((vec (copy-sequence url-path-allowed-chars)))
     (aset vec ?: nil) ;; see github#639
     vec)
-  "Like `url-path-allows-chars' but more restrictive.")
+  "Like `url-path-allowed-chars' but more restrictive.")
 
 \f
 ;;; Message verification helpers

diff --git a/src/fns.c b/src/fns.c
index 1262e3e749ecd323e51b7eee95d5b1ceb857a3ef..08908d481a36debb13cc67cecf88bb8c7e8d9a84 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -5374,7 +5374,7 @@ mark_fns (void)
     }
 }
 
-/* Find the hash_table_test object correponding to the (bare) symbol TEST,
+/* Find the hash_table_test object corresponding to the (bare) symbol TEST,
    creating one if none existed.  */
 static struct hash_table_test *
 get_hash_table_user_test (Lisp_Object test)