[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2a05479c22: ; Fix typos: prefer American spelling
|
From: |
Stefan Kangas |
|
Subject: |
master 2a05479c22: ; Fix typos: prefer American spelling |
|
Date: |
Thu, 14 Jul 2022 06:14:53 -0400 (EDT) |
branch: master
commit 2a05479c221d4a13b15ed731e4eb1c0de99e97ed
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
; Fix typos: prefer American spelling
---
doc/lispref/commands.texi | 2 +-
doc/lispref/modes.texi | 2 +-
doc/misc/eshell.texi | 2 +-
doc/misc/modus-themes.org | 8 ++++----
etc/NEWS | 6 +++---
etc/images/README | 2 +-
etc/themes/leuven-dark-theme.el | 2 +-
lisp/dnd.el | 8 ++++----
lisp/emacs-lisp/byte-opt.el | 2 +-
lisp/emacs-lisp/bytecomp.el | 2 +-
lisp/emacs-lisp/macroexp.el | 2 +-
lisp/erc/erc-backend.el | 2 +-
lisp/files.el | 2 +-
lisp/icomplete.el | 8 ++++----
lisp/jsonrpc.el | 12 ++++++------
lisp/net/eudc-capf.el | 2 +-
lisp/net/eudc.el | 2 +-
lisp/org/org-plot.el | 6 +++---
lisp/textmodes/texinfo.el | 2 +-
src/haiku_support.cc | 2 +-
src/keyboard.c | 2 +-
src/lread.c | 2 +-
src/nsselect.m | 2 +-
.../lisp/erc/resources/base/assoc/bouncer-history/barnet.eld | 2 +-
test/lisp/erc/resources/base/assoc/reconplay/foonet.eld | 2 +-
test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld | 2 +-
test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld | 2 +-
test/lisp/erc/resources/base/netid/bouncer/foonet.eld | 2 +-
.../erc/resources/base/renick/queries/bouncer-barnet.eld | 2 +-
.../lisp/erc/resources/base/reuse-buffers/channel/barnet.eld | 4 ++--
.../erc/resources/base/upstream-reconnect/soju-barnet.eld | 2 +-
test/lisp/erc/resources/erc-d/resources/incremental.eld | 2 +-
test/lisp/erc/resources/erc-d/resources/no-block.eld | 2 +-
test/src/keymap-tests.el | 8 ++++----
34 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 1718978a39..865fa26b27 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2977,7 +2977,7 @@ returns the key sequence as a vector, never as a string.
If an input character is upper-case (or has the shift modifier) and
has no key binding, but its lower-case equivalent has one, then
@code{read-key-sequence} converts the character to lower case. (This
-behaviour can be disabled by setting the
+behavior can be disabled by setting the
@code{translate-upper-case-key-bindings} user option to @code{nil}.)
Note that @code{lookup-key} does not perform case conversion in this
way.
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 2ba37e413c..e94093318f 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -271,7 +271,7 @@ normal-mode}), but tries to force it not to choose any
modes in
@defun clean-mode
Changing the major mode clears out most local variables, but it
-doesn't remove all artefacts in the buffer (like text properties and
+doesn't remove all artifacts in the buffer (like text properties and
overlays). It's rare to change a buffer from one major mode to
another (except from @code{fundamental-mode} to everything else), so
this is usually not a concern. It can sometimes be convenient (mostly
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index f6ec1e268a..963657f102 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1597,7 +1597,7 @@ integration: using the remote shell's pipelining avoids
copying the
data which will flow through the pipeline to local Emacs buffers and
then right back again.
-Eshell recognises a special syntax to make it easier to convert
+Eshell recognizes a special syntax to make it easier to convert
pipelines so as to bypass Eshell's pipelining. Prefixing at least one
@code{|}, @code{<} or @code{>} with an asterisk marks a command as
intended for the operating system shell. To make it harder to invoke
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 4770e3a519..d0d985705f 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -4542,7 +4542,7 @@ The =git-gutter= and =git-gutter-fr= packages default to
drawing bitmaps
for the indicators they display (e.g. bitmap of a plus sign for added
lines). In Doom Emacs, these bitmaps are replaced with contiguous lines
which may look nicer, but require a change to the foreground of the
-relevant faces to yield the desired colour combinations.
+relevant faces to yield the desired color combinations.
Since this is Doom-specific, we urge users to apply changes in their
local setup. Below is some sample code, based on what we cover at
@@ -5519,7 +5519,7 @@ interface virtually unusable.
[[#h:5808be52-361a-4d18-88fd-90129d206f9b][Option for links]].
-Again, one must exercise judgement in order to avoid discrimination,
+Again, one must exercise judgment in order to avoid discrimination,
where "discrimination" refers to:
+ The treatment of substantially different magnitudes as if they were of
@@ -5535,11 +5535,11 @@ usability beyond matters of color---they would be
making a
not-so-obvious error of treating different cases as if they were the
same.
-The Modus themes prioritise "thematic consistency" over abstract harmony
+The Modus themes prioritize "thematic consistency" over abstract harmony
or regularity among their applicable colors. In concrete terms, we do
not claim that, say, our yellows are the best complements for our blues
because we generally avoid using complementary colors side-by-side, so
-it is wrong to optimise for a decontextualised blue+yellow combination.
+it is wrong to optimize for a decontextualised blue+yellow combination.
Not to imply that our colors do not work well together because they do,
just to clarify that consistency of context is what themes must strive
for, and that requires widening the scope of the design beyond the
diff --git a/etc/NEWS b/etc/NEWS
index 19f6879a8c..57845df979 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -876,7 +876,7 @@ are met. The conditions are given by the argument, which
can be
+++
*** New user option 'rcirc-cycle-completion-flag'.
Rcirc will use the default 'completion-at-point' mechanism. The
-conventional IRC behaviour of completing by cycling through the
+conventional IRC behavior of completing by cycling through the
available options can be restored by enabling this option.
** Imenu
@@ -1221,7 +1221,7 @@ longer available after exiting the recursive edit.
This user option controls whether the 'e' (in a "*Backtrace*"
buffer or while edebugging) and 'C-x C-e' (while edebugging) commands
lead to a (further) backtrace. By default, this variable is nil,
-which is a change in behaviour from previous Emacs versions.
+which is a change in behavior from previous Emacs versions.
+++
*** 'e' in edebug can now take a prefix arg to pretty-print the results.
@@ -1452,7 +1452,7 @@ header before sending a message.
** Texinfo Mode
---
-*** 'texinfo-mode' now has a specialised 'narrow-to-defun' definition.
+*** 'texinfo-mode' now has a specialized 'narrow-to-defun' definition.
It narrows to the current node.
** EUDC
diff --git a/etc/images/README b/etc/images/README
index 72da92427b..858f33e40b 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -112,7 +112,7 @@ GNOME project). They are not part of Emacs, but are
distributed and
used by Emacs. They are licensed under either the GNU LGPL v3 or the
Creative Commons Attribution-Share Alike 3.0 United States License.
-To view a copy of the CC-BY-SA licence, visit
+To view a copy of the CC-BY-SA license, visit
http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el
index 3fbb9d6c99..0e162c8bab 100644
--- a/etc/themes/leuven-dark-theme.el
+++ b/etc/themes/leuven-dark-theme.el
@@ -792,7 +792,7 @@ more...")
`(org-example ((,class (:foreground "#ffff0b" :background "#38203d"))))
`(org-footnote ((,class (:underline t :foreground "#ff7138"))))
`(org-formula ((,class (:foreground "#0680e1"))))
- ;; org-habit colours are thanks to zenburn
+ ;; org-habit colors are thanks to zenburn
`(org-habit-ready-face ((t :background "#7F9F7F"))) ; ,zenburn-green
`(org-habit-alert-face ((t :background "#E0CF9F" :foreground "#3F3F3F"))) ;
,zenburn-yellow-1 fg ,zenburn-bg
`(org-habit-clear-face ((t :background "#5C888B"))) ;
,zenburn-blue-3
diff --git a/lisp/dnd.el b/lisp/dnd.el
index ade61917e9..70852885a8 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -327,7 +327,7 @@ in that list instead."
"Begin dragging TEXT from FRAME.
Initate a drag-and-drop operation allowing the user to drag text
from Emacs to another program (the drop target), then block until
-the drop is completed or is cancelled.
+the drop is completed or is canceled.
If the drop completed, return the action that the drop target
actually performed, which can be one of the following symbols:
@@ -341,7 +341,7 @@ actually performed, which can be one of the following
symbols:
- `private', which means the drop target chose to perform an
unspecified action.
-Return nil if the drop was cancelled.
+Return nil if the drop was canceled.
TEXT is a string containing text that will be inserted by the
program where the drop happened. FRAME is the frame where the
@@ -383,7 +383,7 @@ currently being held down. It should only be called upon a
"Begin dragging FILE from FRAME.
Initate a drag-and-drop operation allowing the user to drag a file
from Emacs to another program (the drop target), then block until
-the drop happens or is cancelled.
+the drop happens or is canceled.
Return the action that the drop target actually performed, which
can be one of the following symbols:
@@ -399,7 +399,7 @@ can be one of the following symbols:
- `private', which means the drop target chose to perform an
unspecified action.
-Return nil if the drop was cancelled.
+Return nil if the drop was canceled.
FILE is the file name that will be sent to the program where the
drop happened. If it is a remote file, Emacs will make a
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index d8a96b3f02..a24a504456 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -425,7 +425,7 @@ for speeding up processing.")
;; `unwind-protect' is a special form which here takes the shape
;; (unwind-protect EXPR :fun-body UNWIND-FUN).
;; We can treat it as if it were a plain function at this point,
- ;; although there are specific optimisations possible.
+ ;; although there are specific optimizations possible.
;; In particular, the return value of UNWIND-FUN is never used
;; so its body should really be compiled for-effect, but we
;; don't do that right now.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 8df4133b6b..86681cf4dd 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -4229,7 +4229,7 @@ This function is never called when `lexical-binding' is
nil."
(byte-defop-compiler-1 quote)
(defun byte-compile-setq (form)
- (cl-assert (= (length form) 3)) ; normalised in macroexp
+ (cl-assert (= (length form) 3)) ; normalized in macroexp
(let ((var (nth 1 form))
(expr (nth 2 form)))
(byte-compile-form expr)
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 4db50bbaa9..6a193a56d2 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -378,7 +378,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
form
`(,fn ,var ,new-expr))))
(`(setq . ,args)
- ;; Normalise to a sequence of (setq SYM EXPR).
+ ;; Normalize to a sequence of (setq SYM EXPR).
;; Malformed code is translated to code that signals an error
;; at run time.
(let ((nargs (length args)))
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index bc7a7d14dc..8be4894ecb 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1644,7 +1644,7 @@ Then display the welcome message."
"Return list of unescaped components from an \"ISUPPORT\" VALUE."
;; https://tools.ietf.org/html/draft-brocklesby-irc-isupport-03#section-2
;;
- ;; > The server SHOULD send "X", not "X="; this is the normalised form.
+ ;; > The server SHOULD send "X", not "X="; this is the normalized form.
;;
;; Note: for now, assume the server will only send non-empty values,
;; possibly with printable ASCII escapes. Though in practice, the
diff --git a/lisp/files.el b/lisp/files.el
index bdceaefb0f..25b5842364 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8000,7 +8000,7 @@ If RESTART, restart Emacs after killing the current Emacs
process."
("Close Without Saving" . no-save)
("Save All" . save-all)
("Cancel" . cancel)))
- ('cancel (user-error "Exit cancelled"))
+ ('cancel (user-error "Exit canceled"))
('save-all (save-some-buffers t)))
(save-some-buffers arg t)))
(let ((confirm confirm-kill-emacs))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 381ad5466f..b1fcf9ae71 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -840,13 +840,13 @@ by `group-function''s second \"transformation\" protocol."
while (listp r)
count 1))
repeat total-space
- for neighbour = nil
+ for neighbor = nil
if (and preds (> space-above 0)) do
- (push (setq neighbour (pop preds)) scroll-above)
+ (push (setq neighbor (pop preds)) scroll-above)
(cl-decf space-above)
else if (consp succs) collect
- (setq neighbour (pop succs)) into scroll-below-aux
- while neighbour
+ (setq neighbor (pop succs)) into scroll-below-aux
+ while neighbor
finally (setq scroll-below scroll-below-aux))
;; Halfway there...
(let* ((selected (propertize (car comps) 'icomplete-selected t))
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index b84e9b74b1..90833e1c1d 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -277,7 +277,7 @@ the function is waiting, then it exits immediately,
returning
CANCEL-ON-INPUT-RETVAL. Any future replies (normal or error) are
ignored."
(let* ((tag (cl-gensym "jsonrpc-request-catch-tag")) id-and-timer
- cancelled
+ canceled
(retval
(unwind-protect
(catch tag
@@ -287,26 +287,26 @@ ignored."
#'jsonrpc--async-request-1
connection method params
:success-fn (lambda (result)
- (unless cancelled
+ (unless canceled
(throw tag `(done ,result))))
:error-fn
(jsonrpc-lambda
(&key code message data)
- (unless cancelled
+ (unless canceled
(throw tag `(error (jsonrpc-error-code . ,code)
(jsonrpc-error-message . ,message)
(jsonrpc-error-data . ,data)))))
:timeout-fn
(lambda ()
- (unless cancelled
+ (unless canceled
(throw tag '(error (jsonrpc-error-message . "Timed
out")))))
`(,@(when deferred `(:deferred ,deferred))
,@(when timeout `(:timeout ,timeout)))))
(cond (cancel-on-input
(unwind-protect
(let ((inhibit-quit t)) (while (sit-for 30)))
- (setq cancelled t))
- `(cancelled ,cancel-on-input-retval))
+ (setq canceled t))
+ `(canceled ,cancel-on-input-retval))
(t (while t (accept-process-output nil 30)))))
;; In normal operation, cancellation is handled by the
;; timeout function and response filter, but we still have
diff --git a/lisp/net/eudc-capf.el b/lisp/net/eudc-capf.el
index 68cbfd93ff..92f0c80493 100644
--- a/lisp/net/eudc-capf.el
+++ b/lisp/net/eudc-capf.el
@@ -71,7 +71,7 @@
;; setting.
;;
;; The value of the variable `eudc-capf-modes' indicates which
-;; major modes do such a setup as part of their initialisation
+;; major modes do such a setup as part of their initialization
;; code.
;;; Code:
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 9208e40a73..5cfd4e25ec 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -926,7 +926,7 @@ non-nil, collect results from all servers."
`eudc-inline-expansion-format' is expected to return a list.")
nil))))
- ;; fallback behaviour (nil function, or non-matching type)
+ ;; fallback behavior (nil function, or non-matching type)
(t
(let ((fname (cdr (assq (nth 0 query-attrs) res)))
(lname (cdr (assq (nth 1 query-attrs) res)))
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 4507fbe7dd..7cce678a81 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -272,10 +272,10 @@ argument for the FUNCTION."
for k in keys collect
(cons k (funcall function (lookup k alist1) (lookup k alist2))))))
-(defun org--plot/item-frequencies (values &optional normalise)
+(defun org--plot/item-frequencies (values &optional normalize)
"Return an alist indicating the frequency of values in VALUES list.
-When NORMALISE is non-nil, the count is divided by the number of values."
- (let ((normaliser (if normalise (float (length values)) 1)))
+When NORMALIZE is non-nil, the count is divided by the number of values."
+ (let ((normaliser (if normalize (float (length values)) 1)))
(cl-loop for (n . m) in (seq-group-by #'identity values)
collect (cons n (/ (length m) normaliser)))))
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 5d6f5deae1..1ac59ddc5f 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -401,7 +401,7 @@ REPORT-FN is the callback function."
source beg end type msg)
into diags
finally (funcall report-fn diags)))
- (flymake-log :warning "Cancelling obsolete check %s"
+ (flymake-log :warning "Canceling obsolete check %s"
proc))
(kill-buffer (process-buffer proc)))))))
(process-send-region texinfo--flymake-proc (point-min) (point-max))
diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index a3d3b7a17d..1f7f372a9b 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -142,7 +142,7 @@ enum
struct font_selection_dialog_message
{
- /* Whether or not font selection was cancelled. */
+ /* Whether or not font selection was canceled. */
bool_bf cancel : 1;
/* Whether or not a size was explicitly specified. */
diff --git a/src/keyboard.c b/src/keyboard.c
index c729d5dfb3..2863058d63 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12982,7 +12982,7 @@ Emacs allows binding both upper and lower case key
sequences to
commands. However, if there is a lower case key sequence bound to a
command, and the user enters an upper case key sequence that is not
bound to a command, Emacs will use the lower case binding. Setting
-this variable to nil inhibits this behaviour. */);
+this variable to nil inhibits this behavior. */);
translate_upper_case_key_bindings = true;
DEFVAR_BOOL ("input-pending-p-filter-events",
diff --git a/src/lread.c b/src/lread.c
index 759cc08946..0b46a2e4ee 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4276,7 +4276,7 @@ read0 (Lisp_Object readcharfun, bool locate_syms)
/* Catch silly games like #1=#1# */
invalid_syntax ("nonsensical self-reference", readcharfun);
- /* Optimisation: since the placeholder is already
+ /* Optimization: since the placeholder is already
a cons, repurpose it as the actual value.
This allows us to skip the substitution below,
since the placeholder is already referenced
diff --git a/src/nsselect.m b/src/nsselect.m
index c46bfeaf42..5b47d74612 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -724,7 +724,7 @@ Return the action that the drop target actually chose to
perform, or
nil if no action was performed (either because there was no drop
target, or the drop was rejected). If RETURN-FRAME is the symbol
`now', also return any frame that mouse moves into during the
-drag-and-drop operation, whilst simultaneously cancelling it. Any
+drag-and-drop operation, whilst simultaneously canceling it. Any
other non-nil value means to do the same, but to wait for the mouse to
leave FRAME first.
diff --git a/test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld
b/test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld
index 4b6ccfff38..35a9a570b6 100644
--- a/test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld
+++ b/test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld
@@ -37,7 +37,7 @@
((mode 6 "MODE #chan")
(0 ":irc.barnet.org 324 tester #chan +nt")
(0 ":irc.barnet.org 329 tester #chan 1619593200")
- (0.25 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defence, by
mercy, 'tis most just.")
+ (0.25 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defense, by
mercy, 'tis most just.")
(0.25 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: The Marshal of France,
Monsieur la Far.")
(0.25 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :mike: And bide the penance of
each three years' day.")
(0.25 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: Madam, within; but
never man so chang'd.")
diff --git a/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
b/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
index 6f50ecca4e..f916fea237 100644
--- a/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
+++ b/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
@@ -28,7 +28,7 @@
(0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:35:55] alice: This is but
a custom in your tongue; you bear a graver purpose, I hope.")
(0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:16] bob: To imitate
them; faults that are rich are fair.")
(0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:18] alice: Our Romeo
hath not been in bed to-night.")
- (0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:21] bob: But, in
defence, by mercy, 'tis most just.")
+ (0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:21] bob: But, in
defense, by mercy, 'tis most just.")
(0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:25] alice: Younger than
she are happy mothers made.")
(0.0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.")
(0.0 ":irc.foonet.org 305 tester :You are no longer marked as being away"))
diff --git a/test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld
b/test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld
index 766035a524..e2fe143028 100644
--- a/test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld
+++ b/test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld
@@ -41,7 +41,7 @@
((mode 5 "MODE #chan")
(0 ":irc.barnet.org 324 tester #chan +nt")
(0 ":irc.barnet.org 329 tester #chan 1620805269")
- (0.1 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defence, by
mercy, 'tis most just.")
+ (0.1 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defense, by
mercy, 'tis most just.")
(0.1 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: The Marshal of France,
Monsieur la Far.")
(0.1 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :mike: And bide the penance of
each three years' day.")
(0.1 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: Madam, within; but never
man so chang'd.")
diff --git a/test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld
b/test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld
index e3c41e2133..b99621cc31 100644
--- a/test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld
+++ b/test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld
@@ -36,7 +36,7 @@
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: More evident than this;
for this was stol'n.")
(0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Sell when you can; you
are not for all markets.")
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: There's the fool hangs
on your back already.")
- (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Why, if you have a
stomach to't, monsieur, if you think your mystery in stratagem can bring this
instrument of honour again into its native quarter, be magnanimous in the
enterprise and go on; I will grace the attempt for a worthy exploit: if you
speed well in it, the duke shall both speak of it, and extend to you what
further becomes his greatness, even to the utmost syllable of your worthiness.")
+ (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Why, if you have a
stomach to't, monsieur, if you think your mystery in stratagem can bring this
instrument of honor again into its native quarter, be magnanimous in the
enterprise and go on; I will grace the attempt for a worthy exploit: if you
speed well in it, the duke shall both speak of it, and extend to you what
further becomes his greatness, even to the utmost syllable of your worthiness.")
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: For he hath still been
tried a holy man.")
(0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: To have the touches
dearest priz'd.")
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: And must advise the
emperor for his good.")
diff --git a/test/lisp/erc/resources/base/netid/bouncer/foonet.eld
b/test/lisp/erc/resources/base/netid/bouncer/foonet.eld
index c241c59bb8..b0964fb953 100644
--- a/test/lisp/erc/resources/base/netid/bouncer/foonet.eld
+++ b/test/lisp/erc/resources/base/netid/bouncer/foonet.eld
@@ -36,7 +36,7 @@
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: More evident than this;
for this was stol'n.")
(0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Sell when you can; you
are not for all markets.")
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: There's the fool hangs
on your back already.")
- (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Why, if you have a
stomach to't, monsieur, if you think your mystery in stratagem can bring this
instrument of honour again into its native quarter, be magnanimous in the
enterprise and go on; I will grace the attempt for a worthy exploit: if you
speed well in it, the duke shall both speak of it, and extend to you what
further becomes his greatness, even to the utmost syllable of your worthiness.")
+ (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Why, if you have a
stomach to't, monsieur, if you think your mystery in stratagem can bring this
instrument of honor again into its native quarter, be magnanimous in the
enterprise and go on; I will grace the attempt for a worthy exploit: if you
speed well in it, the duke shall both speak of it, and extend to you what
further becomes his greatness, even to the utmost syllable of your worthiness.")
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: For he hath still been
tried a holy man.")
(0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: To have the touches
dearest priz'd.")
(0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: And must advise the
emperor for his good.")
diff --git a/test/lisp/erc/resources/base/renick/queries/bouncer-barnet.eld
b/test/lisp/erc/resources/base/renick/queries/bouncer-barnet.eld
index fc6cdaafe9..0c8cdac037 100644
--- a/test/lisp/erc/resources/base/renick/queries/bouncer-barnet.eld
+++ b/test/lisp/erc/resources/base/renick/queries/bouncer-barnet.eld
@@ -35,7 +35,7 @@
((mode 5 "MODE #chan")
(0 ":irc.barnet.org 324 tester #chan +nt")
(0 ":irc.barnet.org 329 tester #chan 1622538742")
- (0.1 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :mike: By favours several which
they did bestow.")
+ (0.1 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :mike: By favors several which
they did bestow.")
(0.1 ":mike!~u@286u8jcpis84e.irc PRIVMSG #chan :joe: You, Roderigo! come,
sir, I am for you."))
((privmsg-a 5 "PRIVMSG rando :Linda said you were gonna kill me.")
diff --git a/test/lisp/erc/resources/base/reuse-buffers/channel/barnet.eld
b/test/lisp/erc/resources/base/reuse-buffers/channel/barnet.eld
index 82700c5912..efc2506fd6 100644
--- a/test/lisp/erc/resources/base/reuse-buffers/channel/barnet.eld
+++ b/test/lisp/erc/resources/base/reuse-buffers/channel/barnet.eld
@@ -27,7 +27,7 @@
(0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:16] joe: Tush! none but
minstrels like of sonneting.")
(0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:19] mike: Prithee,
nuncle, be contented; 'tis a naughty night to swim in. Now a little fire in a
wide field were like an old lecher's heart; a small spark, all the rest on's
body cold. Look! here comes a walking fire.")
(0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:22] joe: My name is
Edgar, and thy father's son.")
- (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:26] mike: Good my lord,
be good to me; your honour is accounted a merciful man; good my lord.")
+ (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:26] mike: Good my lord,
be good to me; your honor is accounted a merciful man; good my lord.")
(0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:31] joe: Thy child shall
live, and I will see it nourish'd.")
(0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:33] mike: Quick, quick;
fear nothing; I'll be at thy elbow.")
(0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.")
@@ -38,7 +38,7 @@
(0 ":irc.barnet.org 324 tester #chan +nt")
(0 ":irc.barnet.org 329 tester #chan 1620205534")
(0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: That will be given to
the loudest noise we make.")
- (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If it please your
honour, I am the poor duke's constable, and my name is Elbow: I do lean upon
justice, sir; and do bring in here before your good honour two notorious
benefactors.")
+ (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If it please your honor,
I am the poor duke's constable, and my name is Elbow: I do lean upon justice,
sir; and do bring in here before your good honor two notorious benefactors.")
(0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Following the signs,
woo'd but the sign of she.")
(0.5 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: That, sir, which I will
not report after her.")
(0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Boyet, prepare: I will
away to-night.")
diff --git a/test/lisp/erc/resources/base/upstream-reconnect/soju-barnet.eld
b/test/lisp/erc/resources/base/upstream-reconnect/soju-barnet.eld
index b8fc45e57b..3711eb8f8e 100644
--- a/test/lisp/erc/resources/base/upstream-reconnect/soju-barnet.eld
+++ b/test/lisp/erc/resources/base/upstream-reconnect/soju-barnet.eld
@@ -36,7 +36,7 @@
(0.06 ":joe!~u@6d9pasqcqwb2s.irc PRIVMSG #chan :mike: Once more I'll read the
ode that I have writ.")
(0.06 ":mike!~u@6d9pasqcqwb2s.irc PRIVMSG #chan :joe: This is the foul fiend
Flibbertigibbet: he begins at curfew, and walks till the first cock; he gives
the web and the pin, squints the eye, and makes the harelip; mildews the white
wheat, and hurts the poor creature of earth.")
(0.06 ":joe!~u@6d9pasqcqwb2s.irc PRIVMSG #chan :mike: Sir, I praise the Lord
for you, and so may my parishioners; for their sons are well tutored by you,
and their daughters profit very greatly under you: you are a good member of the
commonwealth.")
- (0.08 ":mike!~u@6d9pasqcqwb2s.irc PRIVMSG #chan :joe: If it please your
honour, I know not well what they are; but precise villains they are, that I am
sure of, and void of all profanation in the world that good Christians ought to
have.")
+ (0.08 ":mike!~u@6d9pasqcqwb2s.irc PRIVMSG #chan :joe: If it please your
honor, I know not well what they are; but precise villains they are, that I am
sure of, and void of all profanation in the world that good Christians ought to
have.")
;; Unexpected disconnect
(0.03 ":BouncerServ!BouncerServ@BouncerServ NOTICE tester :disconnected from
barnet: failed to handle messages: failed to read IRC command: read tcp
[::1]:54990->[::1]:6668: read: software caused connection abort")
;; Eventual reconnect
diff --git a/test/lisp/erc/resources/erc-d/resources/incremental.eld
b/test/lisp/erc/resources/erc-d/resources/incremental.eld
index ab940fe612..a1b48495ec 100644
--- a/test/lisp/erc/resources/erc-d/resources/incremental.eld
+++ b/test/lisp/erc/resources/erc-d/resources/incremental.eld
@@ -30,7 +30,7 @@
((mode 3 "MODE #foo")
(0.0 ":irc.foo.net 324 tester #foo +Cint")
(0.0 ":irc.foo.net 329 tester #foo 1519850102")
- (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: But, in defence, by
mercy, 'tis most just.")
+ (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: But, in defense, by
mercy, 'tis most just.")
(0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: Grows, lives, and dies,
in single blessedness.")
(0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :Look for me.")
(0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: By this hand, it will
not kill a fly. But come, now I will be your Rosalind in a more coming-on
disposition; and ask me what you will, I will grant it.")
diff --git a/test/lisp/erc/resources/erc-d/resources/no-block.eld
b/test/lisp/erc/resources/erc-d/resources/no-block.eld
index 1b1f396563..2811923d8a 100644
--- a/test/lisp/erc/resources/erc-d/resources/no-block.eld
+++ b/test/lisp/erc/resources/erc-d/resources/no-block.eld
@@ -36,7 +36,7 @@
((mode-foo 1.2 "MODE #foo")
(0.0 ":irc.example.org 324 tester #foo +Cint")
(0.0 ":irc.example.org 329 tester #foo 1519850102")
- (-0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: But, in defence, by
mercy, 'tis most just.")
+ (-0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: But, in defense, by
mercy, 'tis most just.")
(-0.2 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: Grows, lives, and dies,
in single blessedness.")
(-0.3 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: For these two hours,
Rosalind, I will leave thee.")
(-0.4 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: By this hand, it will
not kill a fly. But come, now I will be your Rosalind in a more coming-on
disposition; and ask me what you will, I will grant it.")
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index de3012b576..b0876664ed 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -135,7 +135,7 @@
(should (eq (lookup-key map [menu-bar I-bar]) 'foo))))
(ert-deftest keymap-lookup-key/mixed-case-multibyte ()
- "Backwards compatibility behaviour (Bug#50752)."
+ "Backwards compatibility behavior (Bug#50752)."
(let ((map (make-keymap)))
;; (downcase "Åäö") => "åäö"
(define-key map [menu-bar åäö bar] 'foo)
@@ -153,19 +153,19 @@
(should (eq (lookup-key map [menu-bar buffer 1]) 'foo))))
(ert-deftest keymap-lookup-keymap/with-spaces ()
- "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))))
(ert-deftest keymap-lookup-keymap/with-spaces-multibyte ()
- "Backwards compatibility behaviour (Bug#50752)."
+ "Backwards compatibility behavior (Bug#50752)."
(let ((map (make-keymap)))
(define-key map [menu-bar åäö-bar] 'foo)
(should (eq (lookup-key map [menu-bar Åäö\ Bar]) 'foo))))
(ert-deftest keymap-lookup-keymap/with-spaces-multibyte-lang-env ()
- "Backwards compatibility behaviour (Bug#50752)."
+ "Backwards compatibility behavior (Bug#50752)."
(let ((lang-env current-language-environment))
(set-language-environment "Turkish")
(let ((map (make-keymap)))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 2a05479c22: ; Fix typos: prefer American spelling,
Stefan Kangas <=