procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix typos: prefer American spelling

Browse source
This commit is contained in:
Stefan Kangas 2022-07-14 11:55:52 +02:00
parent ddecd864cf
commit 2a05479c22
34 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/lispref/commands.texi
View file

@ -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.

2
doc/lispref/modes.texi
View file

@ -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

2
doc/misc/eshell.texi
View file

@ -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

8
doc/misc/modus-themes.org
View file

@ -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

6
etc/NEWS
View file

@ -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

2
etc/images/README
View file

@ -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.

2
etc/themes/leuven-dark-theme.el
View file

@ -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

8
lisp/dnd.el
View file

@ -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

2
lisp/emacs-lisp/byte-opt.el
View file

@ -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.

2
lisp/emacs-lisp/bytecomp.el
View file

@ -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)

2
lisp/emacs-lisp/macroexp.el
View file

@ -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)))

2
lisp/erc/erc-backend.el
View file

@ -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

2
lisp/files.el
View file

@ -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))

8
lisp/icomplete.el
View file

@ -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))

12
lisp/jsonrpc.el
View file

@ -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

2
lisp/net/eudc-capf.el
View file

@ -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:

2
lisp/net/eudc.el
View file

@ -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)))

6
lisp/org/org-plot.el
View file

@ -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)))))

2
lisp/textmodes/texinfo.el
View file

@ -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))

2
src/haiku_support.cc
View file

@ -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. */

2
src/keyboard.c
View file

@ -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",

2
src/lread.c
View file

@ -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

2
src/nsselect.m
View file

@ -724,7 +724,7 @@ Updated by Christian Limpach (chris@nice.ch)
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.

2
test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld
View file

@ -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.")

2
test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
View file

@ -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"))

2
test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld
View file

@ -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.")

2
test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld
View file

@ -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.")

2
test/lisp/erc/resources/base/netid/bouncer/foonet.eld
View file

@ -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.")

2
test/lisp/erc/resources/base/renick/queries/bouncer-barnet.eld
View file

@ -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.")

4
test/lisp/erc/resources/base/reuse-buffers/channel/barnet.eld
View file

@ -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.")

2
test/lisp/erc/resources/base/upstream-reconnect/soju-barnet.eld
View file

@ -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

2
test/lisp/erc/resources/erc-d/resources/incremental.eld
View file

@ -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.")

2
test/lisp/erc/resources/erc-d/resources/no-block.eld
View file

@ -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.")

8
test/src/keymap-tests.el
View file

@ -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)))