; Spelling fixes

11 files changed, 31 insertions, 33 deletions

diff --git a/test/lisp/abbrev-tests.el b/test/lisp/abbrev-tests.el
index 2750e9a6263..8eee0712c22 100644
--- a/test/lisp/abbrev-tests.el
+++ b/test/lisp/abbrev-tests.el
@@ -283,7 +283,7 @@
         (inverse-add-abbrev table "Global" 1)))
     (should (string= (abbrev-expansion "foo" table) "bar"))))
 
-(ert-deftest inverse-add-abbrev-skips-trailing-nonword/postiive-arg ()
+(ert-deftest inverse-add-abbrev-skips-trailing-nonword/positive-arg ()
   "Test that adding an inverse abbrev skips trailing nonword characters."
   (let ((table (make-abbrev-table)))
     (with-temp-buffer
diff --git a/test/lisp/cedet/semantic-utest-ia.el b/test/lisp/cedet/semantic-utest-ia.el
index 61d7ea370e2..515275591f9 100644
--- a/test/lisp/cedet/semantic-utest-ia.el
+++ b/test/lisp/cedet/semantic-utest-ia.el
@@ -115,7 +115,7 @@
     (should (file-exists-p tst))
     (should-not (semantic-ia-utest tst))))
 
-(ert-deftest semantic-utest-ia-varnamse.java ()
+(ert-deftest semantic-utest-ia-varnames.java ()
   (let ((tst (expand-file-name "testvarnames.java" semantic-utest-test-directory)))
     (should (file-exists-p tst))
     (should-not (semantic-ia-utest tst))))
diff --git a/test/lisp/cedet/srecode-utest-getset.el b/test/lisp/cedet/srecode-utest-getset.el
index d69a195a128..2e82fc9c90a 100644
--- a/test/lisp/cedet/srecode-utest-getset.el
+++ b/test/lisp/cedet/srecode-utest-getset.el
@@ -21,7 +21,6 @@
 ;;
 ;; Unit tests for the getset inserter application.
 
-;;(require 'cedet-uutil)
 (require 'srecode/semantic)
 
 ;;; Code:
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el
index 85230447148..d3b9732b74d 100644
--- a/test/lisp/emacs-lisp/cl-macs-tests.el
+++ b/test/lisp/emacs-lisp/cl-macs-tests.el
@@ -569,14 +569,14 @@ collection clause."
                           finally return result)
                  '(2 1 0)))
 
-  ;; this nonintuitive result is replicated by clisp
+  ;; this unintuitive result is replicated by clisp
   (should (equal (cl-loop with result
                           for x below 3
                           and y = (progn (push x result))
                           finally return result)
                  '(2 1 0 0)))
 
-  ;; this nonintuitive result is replicated by clisp
+  ;; this unintuitive result is replicated by clisp
   (should (equal (cl-loop with result
                           for x below 3
                           and y = (progn (push x result)) then (progn (push (1+ x) result))
diff --git a/test/lisp/emacs-lisp/regexp-opt-tests.el b/test/lisp/emacs-lisp/regexp-opt-tests.el
index 3658964faac..6b94ccb2d5b 100644
--- a/test/lisp/emacs-lisp/regexp-opt-tests.el
+++ b/test/lisp/emacs-lisp/regexp-opt-tests.el
@@ -66,7 +66,7 @@
          (opt (regexp-opt-test--match-all perm opt-re)))
     (concat "\n"
             (format "Naïve regexp:     %s\n" ref-re)
-            (format "Optimised regexp: %s\n" opt-re)
+            (format "Optimized regexp: %s\n" opt-re)
             (format "Got:      %s\n" opt)
             (format "Expected: %s\n" ref))))
 
diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el
index 7d77eca87d2..72d5488ec2e 100644
--- a/test/lisp/vc/log-edit-tests.el
+++ b/test/lisp/vc/log-edit-tests.el
@@ -37,7 +37,7 @@
 \(fun6):
 \(fun7): Some prose.
 \(fun8): A longer description of a complicated change.\
-  Spread over a couple of sentencences.\
+  Spread over a couple of sentences.\
   Long enough to be filled for several lines.
 \(fun9): Etc.")
     (goto-char (point-min))
@@ -46,7 +46,7 @@
 * dir/file.ext (fun1, fun2, fun3):
 * file2.txt (fun4, fun5, fun6, fun7): Some prose.
 \(fun8): A longer description of a complicated change.  Spread over a
-couple of sentencences.  Long enough to be filled for several lines.
+couple of sentences.  Long enough to be filled for several lines.
 \(fun9): Etc."))
     (let ((fill-column 20)) (log-edit-fill-entry))
     (should (equal (buffer-string) "\
@@ -59,10 +59,9 @@ Some prose.
 description of a
 complicated change.
 Spread over a couple
-of sentencences.
-Long enough to be
-filled for several
-lines.
+of sentences.  Long
+enough to be filled
+for several lines.
 \(fun9): Etc."))
     (let ((fill-column 40)) (log-edit-fill-entry))
     (should (equal (buffer-string) "\
@@ -71,21 +70,21 @@ lines.
 Some prose.
 \(fun8): A longer description of a
 complicated change.  Spread over a
-couple of sentencences.  Long enough to
-be filled for several lines.
+couple of sentences.  Long enough to be
+filled for several lines.
 \(fun9): Etc."))))
 
 (ert-deftest log-edit-fill-entry-trailing-prose ()
   (with-temp-buffer
     (insert "\
 * dir/file.ext (fun1): A longer description of a complicated change.\
-  Spread over a couple of sentencences.\
+  Spread over a couple of sentences.\
   Long enough to be filled for several lines.")
     (let ((fill-column 72)) (log-edit-fill-entry))
     (should (equal (buffer-string) "\
 * dir/file.ext (fun1): A longer description of a complicated change.
-Spread over a couple of sentencences.  Long enough to be filled for
-several lines."))))
+Spread over a couple of sentences.  Long enough to be filled for several
+lines."))))
 
 (ert-deftest log-edit-fill-entry-joining ()
   ;; Join short enough function names on the same line.
diff --git a/test/manual/cedet/tests/test-fmt.cpp b/test/manual/cedet/tests/test-fmt.cpp
index c94bcfafbca..6ae373de359 100644
--- a/test/manual/cedet/tests/test-fmt.cpp
+++ b/test/manual/cedet/tests/test-fmt.cpp
@@ -56,12 +56,12 @@ struct moose {
  * ## uml-prototype "moose{} : struct"
  */
 
-struct moose strct_fcn ( struct moose in, char *out);
+struct moose struct_fcn ( struct moose in, char *out);
 /*
- * ## name "strct_fcn"
- * ## abbreviate "strct_fcn()"
- * ## prototype "struct moose strct_fcn (struct moose in,char* out)"
- * ## uml-prototype "strct_fcn (in : struct moose,out : char*) : struct moose"
+ * ## name "struct_fcn"
+ * ## abbreviate "struct_fcn()"
+ * ## prototype "struct moose struct_fcn (struct moose in,char* out)"
+ * ## uml-prototype "struct_fcn (in : struct moose,out : char*) : struct moose"
  */
 
 struct moose *var_one = NULL;
diff --git a/test/manual/cedet/tests/test.srt b/test/manual/cedet/tests/test.srt
index b77cd4fbe29..cbc8c3f1ba1 100644
--- a/test/manual/cedet/tests/test.srt
+++ b/test/manual/cedet/tests/test.srt
@@ -57,7 +57,7 @@ template testarea :blank
 ----
 
 ;; This is a bad hack - In order for the text to parse, but also get a completion
-;; monicker into the right spot, we need to pretend a comment is the same as the
+;; moniker into the right spot, we need to pretend a comment is the same as the
 ;; escape_end.
 ;; Local variables:
 ;; comment-start-skip: "}}"
diff --git a/test/manual/etags/cp-src/functions.cpp b/test/manual/etags/cp-src/functions.cpp
index 764498d4084..7c353d161a1 100644
--- a/test/manual/etags/cp-src/functions.cpp
+++ b/test/manual/etags/cp-src/functions.cpp
@@ -28,7 +28,7 @@ void Date::setDate ( int d , int m , int y ){
 	t = mktime ( date ) ;
 }
 
-// Addition operation ::: Warning ::: A combination of addition and substraction does not give a proper result
+// Addition operation ::: Warning ::: A combination of addition and subtraction does not give a proper result
 void Date::plus ( int days , int month , int year ){
 	if ( ! set () )
 		return;
@@ -38,7 +38,7 @@ void Date::plus ( int days , int month , int year ){
 	mktime ( date );
 }
 
-//Substraction operation ::: Warning ::: A combination of addition and substraction does not give a proper result
+//Subtraction operation ::: Warning ::: A combination of addition and subtraction does not give a proper result
 void Date::minus ( int days , int month , int year ){
 	if ( ! set () )
 		return;
@@ -74,7 +74,7 @@ Date & Date::operator += ( int days ){
 	return(*this);
 }
 
-// Substract number of days
+// Subtract number of days
 Date & Date::operator -= ( int days ){
 	if ( set () ){
 		date->tm_mday -= days ;
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 5fd37520f70..3a9b43ec4ee 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -565,7 +565,7 @@ with parameters from the *Messages* buffer modification."
 (deftest-previous-overlay-change-1 o 25 20 (30 30) (20 30))
 (deftest-previous-overlay-change-1 p 30 20 (20 20) (20 30))
 (deftest-previous-overlay-change-1 q 40 30 (20 20) (20 30))
-;; 1 empty, 1 non-empty, intersectig in the middle
+;; 1 empty, 1 non-empty, intersecting in the middle
 (deftest-previous-overlay-change-1 r 10 1 (25 25) (20 30))
 (deftest-previous-overlay-change-1 s 20 1 (25 25) (20 30))
 (deftest-previous-overlay-change-1 t 25 20 (25 25) (20 30))
@@ -969,7 +969,7 @@ with parameters from the *Messages* buffer modification."
       (should (= 25 (overlay-start right)))
       (should (= 75 (overlay-end right)))
       ;; Try to detect the error, by removing left.  The should fail
-      ;; an eassert, since it won't be found by a reular tree
+      ;; an eassert, since it won't be found by a regular tree
       ;; traversal - in theory.
       (delete-overlay left)
       (should (= 2 (length (overlays-in 1 (point-max))))))))
@@ -1045,7 +1045,7 @@ with parameters from the *Messages* buffer modification."
 ;; | make-indirect-buffer
 ;; +==========================================================================+
 
-;; Check if overlays are cloned/seperate from indirect buffer.
+;; Check if overlays are cloned/separate from indirect buffer.
 (ert-deftest test-make-indirect-buffer-1 ()
   (with-temp-buffer
     (dotimes (_ 10) (make-overlay 1 1))
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index 93f7f63847f..bcc652a8053 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -269,7 +269,7 @@
   (should (equal (base64-encode-string "\x14\xfb\x9c\x03\xd9\x7f") "FPucA9l/")))
 
 (ert-deftest fns-test-base64url-encode-region ()
-  ;; url variant wih padding
+  ;; url variant with padding
   (should (equal (fns-tests--with-region base64url-encode-region "") ""))
   (should (equal (fns-tests--with-region base64url-encode-region "f") "Zg=="))
   (should (equal (fns-tests--with-region base64url-encode-region "fo") "Zm8="))
@@ -311,7 +311,7 @@
                  (fns-tests--string-repeat "FPucA9l_" 10))))
 
 (ert-deftest fns-test-base64url-encode-string ()
-  ;; url variant wih padding
+  ;; url variant with padding
   (should (equal (base64url-encode-string "") ""))
   (should (equal (base64url-encode-string "f") "Zg=="))
   (should (equal (base64url-encode-string "fo") "Zm8="))
@@ -356,7 +356,7 @@
   (should (equal (base64-decode-string "FPucA9l+") "\x14\xfb\x9c\x03\xd9\x7e"))
   (should (equal (base64-decode-string "FPucA9l/") "\x14\xfb\x9c\x03\xd9\x7f"))
 
-  ;; no paddign
+  ;; no padding
   (should (equal (base64-decode-string "" t) ""))
   (should (equal (base64-decode-string "Zg" t) "f"))
   (should (equal (base64-decode-string "Zm8" t) "fo"))
@@ -365,7 +365,7 @@
   (should (equal (base64-decode-string "Zm9vYmE" t) "fooba"))
   (should (equal (base64-decode-string "Zm9vYmFy" t) "foobar"))
 
-  ;; url variant wih padding
+  ;; url variant with padding
   (should (equal (base64-decode-string "") ""))
   (should (equal (base64-decode-string "Zg==" t) "f") )
   (should (equal (base64-decode-string "Zm8=" t) "fo"))