; Fix typos

diff --git a/ChangeLog.3 b/ChangeLog.3
index edb738b56c9929d671dadf6a84e7d0853b4a60ae..b162f96cb11bcef81a6ef694a63557fadcd5e23b 100644 (file)
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1654,7 +1654,7 @@
        This reverts commit 78f76fe16e2737b40694f82af28d17a90a21ed7b.
 
        The commit made calls to cl-concatenate bug out, since
-       autoloading defalises doesn't work very well (bug#54901).
+       autoloading defaliases doesn't work very well (bug#54901).
 
 2022-04-12  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 8a21c291e72e8847547256b544706ab8c0f6e4a2..ac1befac1e6021ecaec34efe5713f591210ab744 100644 (file)
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -10320,7 +10320,7 @@
        * bs.el, expand.el, ido.el, image-dired.el, lpr.el, pcomplete.el,
        * skeleton.el, term.el, time.el, wid-edit.el, woman.el,
        * calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el,
-       * calc/calc.el, emacs-lisp/cl-extra.el, emacs-lips/cl-loaddefs.el,
+       * calc/calc.el, emacs-lisp/cl-extra.el, emacs-lisp/cl-loaddefs.el,
        * emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el,
        * eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el,
        * gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el,

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 66b214554ee750dd725dbe6b55349c9ab41fdc78..60b01051a33b9d0aa72937e8595310b89d24d0f7 100644 (file)
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -552,7 +552,7 @@ too large if positive or too small if negative)."
                        ,new)))))
   (seq-subseq seq start end))
 
-;;; This isn't a defalias because autoloading defalises doesn't work
+;;; This isn't a defalias because autoloading defaliases doesn't work
 ;;; very well.
 
 ;;;###autoload

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d404bc9632734ce7670d18a714fc1aec54abb39b..9b33bc8e76509c0a7e5fa2aaddeaa724fce61f18 100644 (file)
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1685,7 +1685,7 @@ the current line if the beginning of the defun is indented."
 
 Return a list of (PREV NEXT PARENT), where PREV and NEXT are
 previous and next sibling defuns around POS, and PARENT is the
-parent defun surrouding POS.  All of three could be nil if no
+parent defun surrounding POS.  All of three could be nil if no
 sound defun exists.
 
 REGEXP and PRED are the same as in `treesit-defun-type-regexp'."
@@ -1767,7 +1767,7 @@ If ARG is positive, move forward that many steps, if negative,
 move backward.  If SIDE is `beg', stop at the beginning of a
 defun, if SIDE is `end', stop at the end.
 
-This function doesn't actaully move point, it just returns the
+This function doesn't actually move point, it just returns the
 position it would move to.  If there aren't enough defuns to move
 across, return nil.
 

diff --git a/src/xfaces.c b/src/xfaces.c
index 94247f559697126d092c11a6404762b77fa7dce5..be4a7ca71ccf20422f87b76f78083f5c0e5f59e7 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7443,7 +7443,7 @@ If the value is nil, candidate fonts might be rejected if the don't
 have exactly the same values of attributes as the face requests.
 
 This variable exists for debugging of the font-selection process,
-and we advise not to change it othersie.  */);
+and we advise not to change it otherwise.  */);
   Vface_font_lax_matched_attributes = Qt;
 
 #ifdef HAVE_WINDOW_SYSTEM

diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el
index 04ecd7891ab29d06351dbbf4d838a6c8548a8f7d..47d2e2ee6a6f4328e67ecfdc4ba80d3cda4885d3 100644 (file)
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@ -329,7 +329,7 @@ Pass TIMEOUT to `eglot--with-timeout'."
        (should-error (eglot--current-server-or-lose))))))
 
 (ert-deftest auto-detect-running-server ()
-  "Visit a file and \\[eglot], then visit a neighbour."
+  "Visit a file and \\[eglot], then visit a neighbor."
   (skip-unless (executable-find "clangd"))
   (eglot-tests--auto-detect-running-server-1))
 
@@ -704,7 +704,7 @@ pylsp prefers autopep over yafp, despite its README stating the contrary."
        (string= (buffer-string) "def a():\n    pass\n\n\ndef b():\n    pass\n")))))
 
 (ert-deftest rust-on-type-formatting ()
-  "Test textDocument/onTypeFormatting agains rust-analyzer."
+  "Test textDocument/onTypeFormatting against rust-analyzer."
   (skip-unless (executable-find "rust-analyzer"))
   (skip-unless (executable-find "cargo"))
   (eglot--with-fixture

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index eaf2df6210431dd1801bf7216a1a2b62e94f92c8..3617264502ba28be28d2d6535904c94cdc013c49 100644 (file)
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -611,7 +611,7 @@ visible_end.)"
 ;;
 ;; I've setup a framework for easier testing of defun navigation.
 ;;
-;; To use it for a particular langauge, first write a test program
+;; To use it for a particular language, first write a test program
 ;; similar to `treesit--ert-defun-navigation-python-program', and
 ;; insert markers.  Markers that marks BOLs are defined as follows:
 ;;
@@ -661,7 +661,7 @@ marking's number, and POS is each marking's position."
     (nreverse result)))
 
 (defun treesit--ert-collect-positions (positions functions)
-  "Collect posifions after caling each function in FUNCTIONS.
+  "Collect positions after calling each function in FUNCTIONS.
 
 POSITIONS should be a list of buffer positions, FUNCTIONS should
 be a list of functions.  This function collects the return value
@@ -710,7 +710,7 @@ and \"]\"."
            ;; Collect positions each function returns.
            (positions
             (treesit--ert-collect-positions
-             ;; The first columnn of DECODED-MASTER.
+             ;; The first column of DECODED-MASTER.
              (mapcar #'car decoded-master)
              ;; Four functions: next-end, prev-beg, next-beg, prev-end.
              (mapcar (lambda (conf)