diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
| commit | 4e79f77635a80e0c25841ba15feb0e70c8824516 (patch) | |
| tree | 7f68cf7d809a10e6c2501fb3d9451047fb8da051 /test | |
| parent | e1d93302c29916e738552484b9363c5b9e77c5c1 (diff) | |
| parent | 5e47ec95118c06dd66cd488ad25775d801d75c0c (diff) | |
| download | emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.bz2 emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.zip | |
Merge from origin/emacs-28
5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc
# Conflicts:
# etc/NEWS
# etc/themes/modus-themes.el
# lisp/emacs-lisp/byte-opt.el
# test/lisp/so-long-tests/spelling-tests.el
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | test/lisp/calc/calc-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/bytecomp-tests.el | 8 | ||||
| -rw-r--r-- | test/lisp/so-long-tests/spelling-tests.el | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index fe7e6626cbf..328609038a7 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -65,7 +65,7 @@ 2015-03-10 Paul Eggert <eggert@cs.ucla.edu> - Prefer "initialize" to "initialise" + Prefer "initialize" * indent/js-indent-init-t.js: Rename from indent/js-indent-first-initialiser-t.js. * indent/js-indent-init-dynamic.js: Rename from diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el index 56cb9057ed9..64e59f5b9b4 100644 --- a/test/lisp/calc/calc-tests.el +++ b/test/lisp/calc/calc-tests.el @@ -445,7 +445,7 @@ An existing calc stack is reused, otherwise a new one is created." (t ; n<k<0 0)))) ((natnump k) - ;; Generalisation for any n, integral k≥0: use falling product + ;; Generalization for any n, integral k≥0: use falling product (/ (apply '* (number-sequence n (- n (1- k)) -1)) (calc-tests--fac k))) (t (error "Case not covered")))) diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 9c5bef09a34..a246c25e24f 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -38,7 +38,7 @@ bytecomp-test-var) (defun bytecomp-test-identity (x) - "Identity, but hidden from some optimisations." + "Identity, but hidden from some optimizations." x) (defmacro bytecomp-test-loop (outer1 outer2 inner1 inner2) @@ -556,7 +556,7 @@ inner loops respectively." ((not x) 3))) '("a" "b" "c" "d" nil)) - ;; `let' and `let*' optimisations with body being constant or variable + ;; `let' and `let*' optimizations with body being constant or variable (let* (a (b (progn (setq a (cons 1 a)) 2)) (c (1+ b)) @@ -582,7 +582,7 @@ inner loops respectively." (let* (x y) 'a) - ;; Check empty-list optimisations. + ;; Check empty-list optimizations. (mapcar (lambda (x) (member x nil)) '("a" 2 nil)) (mapcar (lambda (x) (memql x nil)) '(a 2 nil)) (mapcar (lambda (x) (memq x nil)) '(a nil)) @@ -597,7 +597,7 @@ inner loops respectively." (list (mapcar (lambda (x) (assoc (setq n (1+ n)) nil)) '(a "nil")) n)) - ;; Exercise variable-aliasing optimisations. + ;; Exercise variable-aliasing optimizations. (let ((a (list 1))) (let ((b a)) (let ((a (list 2))) diff --git a/test/lisp/so-long-tests/spelling-tests.el b/test/lisp/so-long-tests/spelling-tests.el index ce4b0844c99..7bd06395535 100644 --- a/test/lisp/so-long-tests/spelling-tests.el +++ b/test/lisp/so-long-tests/spelling-tests.el @@ -58,7 +58,7 @@ (find-spelling-mistake (cl-letf (((symbol-function 'ispell-command-loop) (lambda (_miss _guess word _start _end) - (message "Unrecognised word: %s." word) + (message "Unrecognized word: %s." word) (throw 'mistake t)))) (catch 'mistake (find-library "so-long") |