diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-06-24 13:52:51 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-06-24 13:52:51 +0200 |
| commit | 81e58d1ce5a16fbe4cad543b1b011fe52da5d70c (patch) | |
| tree | fb74ce8496311b34d68ae04de01c76810b1add1b /test | |
| parent | 391acd91344c833d94d89b2862b272d08643c068 (diff) | |
| parent | a772c0b85272bc20858a35af5f619983cfcb0084 (diff) | |
| download | emacs-81e58d1ce5a16fbe4cad543b1b011fe52da5d70c.tar.gz emacs-81e58d1ce5a16fbe4cad543b1b011fe52da5d70c.tar.bz2 emacs-81e58d1ce5a16fbe4cad543b1b011fe52da5d70c.zip | |
Merge from origin/emacs-28
a772c0b852 ; Fix typos: prefer US spelling.
# Conflicts:
# doc/misc/modus-themes.org
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/so-long-tests/so-long-tests.el | 4 | ||||
| -rw-r--r-- | test/src/fns-tests.el | 2 | ||||
| -rw-r--r-- | test/src/keymap-tests.el | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/lisp/so-long-tests/so-long-tests.el b/test/lisp/so-long-tests/so-long-tests.el index d83ed34e274..bf619f453d2 100644 --- a/test/lisp/so-long-tests/so-long-tests.el +++ b/test/lisp/so-long-tests/so-long-tests.el @@ -59,7 +59,7 @@ (declare-function so-long-tests-assert-and-revert "so-long-tests-helpers") (declare-function so-long-tests-predicates "so-long-tests-helpers") -;; Enable the automated behaviour for all tests. +;; Enable the automated behavior for all tests. (global-so-long-mode 1) (ert-deftest so-long-tests-threshold-under () @@ -210,7 +210,7 @@ ;; From Emacs 27 the `display-buffer' call is insufficient. ;; The various 'window change functions' are now invoked by the ;; redisplay, and redisplay does nothing at all in batch mode, - ;; so we cannot test under this revised behaviour. Refer to: + ;; so we cannot test under this revised behavior. Refer to: ;; https://lists.gnu.org/r/emacs-devel/2019-10/msg00971.html ;; For interactive (non-batch) test runs, calling `redisplay' ;; does do the trick; so do that first. diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index c080c483927..39bcc5ee38b 100644 --- a/test/src/fns-tests.el +++ b/test/src/fns-tests.el @@ -978,7 +978,7 @@ (should (equal 1 (string-distance "ab" "a我b"))) (should (equal 1 (string-distance "我" "她"))) - ;; correct behaviour with empty strings + ;; correct behavior with empty strings (should (equal 0 (string-distance "" ""))) (should (equal 0 (string-distance "" "" t))) (should (equal 1 (string-distance "x" ""))) diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el index 18f292d2153..de3012b5764 100644 --- a/test/src/keymap-tests.el +++ b/test/src/keymap-tests.el @@ -125,7 +125,7 @@ ;; ...) (ert-deftest keymap-lookup-key/mixed-case () - "Backwards compatibility behaviour (Bug#50752)." + "Backwards compatibility behavior (Bug#50752)." (let ((map (make-keymap))) (define-key map [menu-bar foo bar] 'foo) (should (eq (lookup-key map [menu-bar foo bar]) 'foo)) |