From f7ee6609ae3b9cbafd48c89bad160b4e17f5b386 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 18 Nov 2022 13:06:55 +0100 Subject: [PATCH] ; Fix typos (prefer US spelling) --- ChangeLog.3 | 32 ++++++++++++++-------------- doc/lispref/errors.texi | 2 +- doc/lispref/functions.texi | 2 +- doc/lispref/minibuf.texi | 2 +- doc/misc/modus-themes.org | 2 +- doc/misc/ses.texi | 4 ++-- doc/misc/tramp.texi | 2 +- etc/NEWS.28 | 2 +- lisp/calc/calc-graph.el | 2 +- lisp/emacs-lisp/ert.el | 2 +- lisp/emacs-lisp/package.el | 4 ++-- lisp/gnus/gnus-search.el | 2 +- lisp/leim/quail/indian.el | 2 +- lisp/mail/ietf-drums-date.el | 4 ++-- lisp/progmodes/cc-engine.el | 2 +- lisp/so-long.el | 4 ++-- lisp/subr.el | 2 +- lisp/vc/diff-mode.el | 2 +- lisp/x-dnd.el | 4 ++-- src/eval.c | 4 ++-- src/frame.c | 2 +- src/haikuselect.c | 2 +- test/lisp/emacs-lisp/syntax-tests.el | 2 +- test/lisp/net/dbus-tests.el | 4 ++-- 24 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ChangeLog.3 b/ChangeLog.3 index b76431fbbdd..a78f53f377b 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -5557,7 +5557,7 @@ Fix ert errors when there's a test that binds `debug-on-error' * lisp/emacs-lisp/ert.el (ert--run-test-internal): Don't infloop - on errors when signalling errors (bug#51131). + on errors when signaling errors (bug#51131). 2021-10-10 Paul Eggert @@ -41213,7 +41213,7 @@ 2021-02-02 Lars Ingebrigtsen - Fix up invalid_syntax error signalling + Fix up invalid_syntax error signaling * src/lread.c (invalid_syntax_lisp): Instead of putting the line/column in a string, signal an error containing the numbers as @@ -63478,7 +63478,7 @@ user-error when there's a wrong password (bug#43704). (epa--wrong-password-p): New function. (epa-file-insert-file-contents): Use it, and stash the error away - for later signalling. + for later signaling. * lisp/emacs-lisp/subr-x.el (if-let): Autoload. @@ -73089,7 +73089,7 @@ * lisp/textmodes/tex-mode.el (tex-font-lock-keywords-2): End the expression before the terminating $ in constructions like $\it identifiername$ - (bug#28277). This avoids italicising the final $ character. + (bug#28277). This avoids italicizing the final $ character. This fixes the final $ of the final test case here: @@ -73421,7 +73421,7 @@ 2020-08-08 Lars Ingebrigtsen - Modernise a code example in os.texi + Modernize a code example in os.texi * doc/lispref/os.texi (Session Management): Use with-current-buffer in the example instead of save+switch (bug#40341). @@ -75687,7 +75687,7 @@ * lisp/net/eww.el (eww-list-bookmarks): Don't show buffer if there are no bookmarks. (Bug#41385) - (eww-bookmark-prepare): Move signalling an error if there are no + (eww-bookmark-prepare): Move signaling an error if there are no bookmarks from here... (eww-read-bookmarks): ...to here. Add new argument `error-out' to control this. @@ -101483,7 +101483,7 @@ (Create_Pixmap_From_Bitmap_Data): (xpm_load): Use new function. * src/xterm.c (x_composite_image): Use PictOpOver when there is a mask - so the transparency is honoured. + so the transparency is honored. (x_draw_image_foreground_1): Use x_composite_image. 2019-11-29 Stefan Monnier @@ -113664,7 +113664,7 @@ Make the NSM not pop up an X dialogue on non-mouse actions * lisp/emacs-lisp/rmc.el (read-multiple-choice): Don't pop up X - dialogues on (url-retrieve "https://expired.badssl.com/" #'ignore) + dialogs on (url-retrieve "https://expired.badssl.com/" #'ignore) and the like. 2019-09-04 Lars Ingebrigtsen @@ -115157,7 +115157,7 @@ 2019-08-21 Lars Ingebrigtsen - Make hide-ifdef-mode-prefix-key customisable + Make hide-ifdef-mode-prefix-key customizable * lisp/progmodes/hideif.el (hide-ifdef-mode-prefix-key): Make into a defcustom since it seems like this is something that should be @@ -130710,7 +130710,7 @@ Fix diff-mode face problem when used in terminals (Bug#35695) In a terminal supporting 256 colors, both diff-added and diff-removed - was mapped to the same greyish color. + was mapped to the same grayish color. * lisp/vc/diff-mode.el: Modify the colors of diff-removed, diff-added, diff-refine-removed, and diff-refine-added when @@ -158744,7 +158744,7 @@ 2018-04-17 Basil L. Contovounesios - Modernise face specs and set version tags in eww/shr + Modernize face specs and set version tags in eww/shr * lisp/net/shr.el (shr-strike-through, shr-link, shr-selected-link): Set :version tag (bug#31200). @@ -159218,10 +159218,10 @@ 2018-04-14 Lars Ingebrigtsen - Modernise a Gnus function a bit + Modernize a Gnus function a bit * lisp/gnus/gnus-start.el (gnus-update-active-hashtb-from-killed): - Modernise code a bit. + Modernize code a bit. 2018-04-14 Lars Ingebrigtsen @@ -166738,7 +166738,7 @@ 5a7d009 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete al... e019c35 FOR_EACH_FRAME no longer assumes frame-list d64b88d * src/font.c (Ffont_info): Doc fix. (Bug#29682) - 92b2604 Modernise message.el face spec syntax + 92b2604 Modernize message.el face spec syntax b1efbe6 Update message.el obsolete face aliases 2494c14 ; * lisp/comint.el (comint-terminfo-terminal): Add a :version... 12ad276 Improve documentation of TERM environment variable @@ -167034,7 +167034,7 @@ 5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete... e019c35df6 FOR_EACH_FRAME no longer assumes frame-list d64b88da2f * src/font.c (Ffont_info): Doc fix. (Bug#29682) - 92b2604a7f Modernise message.el face spec syntax + 92b2604a7f Modernize message.el face spec syntax b1efbe6564 Update message.el obsolete face aliases 2494c14e76 ; * lisp/comint.el (comint-terminfo-terminal): Add a :vers... 12ad276d15 Improve documentation of TERM environment variable @@ -181827,7 +181827,7 @@ 2017-12-15 Basil L. Contovounesios - Modernise message.el face spec syntax + Modernize message.el face spec syntax * lisp/gnus/message.el (message-header-to, message-header-cc) (message-header-subject, message-header-newsgroups) diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index 44a62dcebca..cb05290abd1 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi @@ -242,7 +242,7 @@ The message is @samp{Cannot determine image type}. @xref{Images}. @item inhibited-interaction The message is @samp{User interaction while inhibited}. This error is -signalled when @code{inhibit-interaction} is non-@code{nil} and a user +signaled when @code{inhibit-interaction} is non-@code{nil} and a user interaction function (like @code{read-from-minibuffer}) is called. @end table diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 7ffde7d43d1..9d5a2661916 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -734,7 +734,7 @@ a list of symbols representing the function alias chain, else @result{} (b c) @end example -If there's a loop in the definitions, an error will be signalled. If +If there's a loop in the definitions, an error will be signaled. If @var{noerror} is non-@code{nil}, the non-looping parts of the chain is returned instead. @end defun diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 089ae41f32e..332a453619c 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -2745,7 +2745,7 @@ Here's a typical use case: If @code{my-client-handling-function} ends up calling something that asks the user for something (via @code{y-or-n-p} or @code{read-from-minibuffer} or the like), an -@code{inhibited-interaction} error is signalled instead. The server +@code{inhibited-interaction} error is signaled instead. The server code then catches that error and reports it to the client. @node Minibuffer Misc diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 56ba5fd3485..db92dfb4817 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -3649,7 +3649,7 @@ specification of that variable looks like this: With the exception of ~org-verbatim~ and ~org-code~ faces, everything else uses the corresponding type of emphasis: a bold typographic weight, or -italicised, underlined, and struck through text. +italicized, underlined, and struck through text. The best way for users to add some extra attributes, such as a foreground color, is to define their own faces and assign them to the diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 6d0415cdbbb..e3ef11ebc02 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -750,13 +750,13 @@ when you pass a cell name to the @command{ses-jump} command (@kbd{j}), it changes the entered cell name to that where to jump. The default setting @code{upcase} allows you to enter the cell name in low case. Another use of @code{ses-jump-cell-name-function} could be some -internationalisation to convert non latin characters into latin +internationalization to convert non latin characters into latin equivalents to name the cell. Instead of a cell name, the function may return cell coordinates in the form of a cons, for instance @code{(0 . 0)} for cell @code{A1}, @code{(1 . 0)} for cell @code{A2}, etc. @vindex ses-jump-prefix-function -@code{ses-jump-prefix-function} is a customisable variable by default +@code{ses-jump-prefix-function} is a customizable variable by default set to the @code{ses-jump-prefix} function. This function is called when you give a prefix argument to the @command{ses-jump} command (@kbd{j}). It returns a cell name or cell coordinates corresponding to diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 99a268367b8..19f82b2447b 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -4225,7 +4225,7 @@ non-@code{nil}, or invoke that command with a negative argument like @value{tramp}'s implementation of @code{make-process} and @code{start-file-process} requires a serious overhead for initialization, every process invocation. This is needed for handling -interactive dialogues when connecting the remote host (like providing +interactive dialogs when connecting the remote host (like providing a password), and initial environment setup. Sometimes, this is not needed. Instead of starting a remote shell and diff --git a/etc/NEWS.28 b/etc/NEWS.28 index 8eab05a7634..9982296aaab 100644 --- a/etc/NEWS.28 +++ b/etc/NEWS.28 @@ -2771,7 +2771,7 @@ If non-nil, it is a regexp that should match a valid cover image. *** 'shell-script-mode' now supports 'outline-minor-mode'. The outline headings have lines that start with "###". -*** fileloop will now skip missing files instead of signalling an error. +*** fileloop will now skip missing files instead of signaling an error. *** 'tabulated-list-mode' can now restore original display order. Many commands (like 'C-x C-b') are derived from 'tabulated-list-mode', diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index a95967bef4e..5735126bf50 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -1414,7 +1414,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (defun calc-gnuplot-command (&rest args) "Send ARGS to Gnuplot. -Returns nil if Gnuplot signalled an error." +Returns nil if Gnuplot signaled an error." (calc-graph-init) (let ((cmd (concat (mapconcat 'identity args " ") "\n"))) (or (calc-graph-w32-p) diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 047b0069bb9..c25ade22d6f 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -208,7 +208,7 @@ is run. If a macro (possibly with side effects) is to be tested, it has to be wrapped in `(eval (quote ...))'. If NAME is already defined as a test and Emacs is running -in batch mode, an error is signalled. +in batch mode, an error is signaled. \(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ [:tags \\='(TAG...)] BODY...)" diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f9786febf4e..2f19573e3cd 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -4536,8 +4536,8 @@ DESC must be a `package-desc' object." "Return an email address for the maintainers of PKG-DESC. The email address may contain commas, if there are multiple maintainers. If no maintainers are found, an error will be -signalled. If the optional argument NO-ERROR is non-nil no error -will be signalled in that case." +signaled. If the optional argument NO-ERROR is non-nil no error +will be signaled in that case." (unless pkg-desc (error "Invalid package description")) (let* ((extras (package-desc-extras pkg-desc)) diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el index b8f7e7a08f0..7941496be61 100644 --- a/lisp/gnus/gnus-search.el +++ b/lisp/gnus/gnus-search.el @@ -1943,7 +1943,7 @@ Assume \"size\" key is equal to \"larger\"." (thread (alist-get 'thread query))) (with-slots (switches config-directory) engine `("find" ; command must come first - "--nocolor" ; mu will always give coloured output otherwise + "--nocolor" ; mu will always give colored output otherwise ,(format "--muhome=%s" config-directory) ,@switches ,(if thread "-r" "") diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el index deef00b4c29..8fe81a22173 100644 --- a/lisp/leim/quail/indian.el +++ b/lisp/leim/quail/indian.el @@ -373,7 +373,7 @@ Full key sequences are listed below:") ;; Define the input method straight away. (quail-define-package "tamil-phonetic" "Tamil" "à®´" t - "Customisable Tamil phonetic input method. + "Customizable Tamil phonetic input method. To change the translation rules of the input method, customize `tamil-translation-rules'. diff --git a/lisp/mail/ietf-drums-date.el b/lisp/mail/ietf-drums-date.el index ddef7f11b66..034854dce5a 100644 --- a/lisp/mail/ietf-drums-date.el +++ b/lisp/mail/ietf-drums-date.el @@ -126,7 +126,7 @@ treat them as whitespace (per RFC822)." (defun ietf-drums-parse-date-string (time-string &optional error no-822) "Parse an RFC5322 or RFC822 date, passed as TIME-STRING. The optional ERROR parameter causes syntax errors to be flagged -by signalling an instance of the date-parse-error condition. The +by signaling an instance of the date-parse-error condition. The optional NO-822 parameter disables the more lax RFC822 syntax, which is permitted by default. @@ -162,7 +162,7 @@ DST is returned as -1)." (time (list nil nil nil nil nil nil nil -1 nil))) (cl-labels ((set-matched-slot (slot index token) ;; Assign a slot value from match data if index is - ;; non-nil, else from token, signalling an error if + ;; non-nil, else from token, signaling an error if ;; enabled and it's out of range. (let ((value (if index (cl-parse-integer (match-string index token)) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 8813ec4686b..7e6dd431756 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -12626,7 +12626,7 @@ comment at the start of cc-engine.el for more info." (defun c-laomib-fix-elt (lwm elt paren-state) ;; Correct a c-laomib-cache entry ELT with respect to buffer changes, either - ;; doing nothing, signalling it is to be deleted, or replacing its start + ;; doing nothing, signaling it is to be deleted, or replacing its start ;; point with one lower in the buffer than LWM. PAREN-STATE is the paren ;; state at LWM. Return the corrected entry, or nil (if it needs deleting). ;; Note that corrections are made by `setcar'ing the original structure, diff --git a/lisp/so-long.el b/lisp/so-long.el index 75201fefcad..661f5ee57a9 100644 --- a/lisp/so-long.el +++ b/lisp/so-long.el @@ -839,7 +839,7 @@ was established." ) ;; It's not clear to me whether all of these would be problematic, but they ;; seemed like reasonable targets. Some are certainly excessive in smaller - ;; buffers of minified code, but we should be aiming to maximise performance + ;; buffers of minified code, but we should be aiming to maximize performance ;; by default, so that Emacs is as responsive as we can manage in even very ;; large buffers of minified code. "List of buffer-local minor modes to explicitly disable. @@ -880,7 +880,7 @@ If `so-long-revert' is subsequently invoked, then the variables are restored to their original states. The combination of `line-move-visual' (enabled) and `truncate-lines' (disabled) -is important for maximising responsiveness when moving vertically within an +is important for maximizing responsiveness when moving vertically within an extremely long line, as otherwise the full length of the line may need to be scanned to find the next position. diff --git a/lisp/subr.el b/lisp/subr.el index adaa0a91355..a42b61d9b61 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -6911,7 +6911,7 @@ string will be displayed only if BODY takes longer than TIMEOUT seconds. If FUNC is a function alias, return the function alias chain. If the function alias chain contains loops, an error will be -signalled. If NOERROR, the non-loop parts of the chain is returned." +signaled. If NOERROR, the non-loop parts of the chain is returned." (declare (side-effect-free t)) (let ((chain nil) (orig-func func)) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index a9591c9d82e..357ce001b3c 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -306,7 +306,7 @@ well." ;; terminal supporting 24 bit colors) doesn't render well in terminal ;; supporting only 256 colors. Concretely, both #ffeeee ;; (diff-removed) and #eeffee (diff-added) are mapped to the same -;; greyish color. "min-colors 257" ensures that those colors are not +;; grayish color. "min-colors 257" ensures that those colors are not ;; used terminals supporting only 256 colors. However, any number ;; between 257 and 2^24 (16777216) would do. diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 058ab99f5cb..b3465e757a9 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -818,7 +818,7 @@ has been pressed." (let ((inhibit-message t)) (funcall function amt)) ;; Do not error at buffer limits. Show a message instead. - ;; This is especially important here because signalling an + ;; This is especially important here because signaling an ;; error will mess up the drag-and-drop operation. (beginning-of-buffer (message (error-message-string '(beginning-of-buffer)))) @@ -1468,7 +1468,7 @@ instead of returning \"E\".") (dnd-get-local-file-name local-file-uri)))) (if (not local-name) '(STRING . "F") - ;; We want errors to be signalled immediately during ERT + ;; We want errors to be signaled immediately during ERT ;; testing, instead of being silently handled. (bug#56712) (if x-dnd-xds-testing (prog1 '(STRING . "S") diff --git a/src/eval.c b/src/eval.c index 78e606267f6..7327d681f9a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1329,7 +1329,7 @@ Then the value of the last BODY form is returned from the `condition-case' expression. The special handler (:success BODY...) is invoked if BODYFORM terminated -without signalling an error. BODY is then evaluated with VAR bound to +without signaling an error. BODY is then evaluated with VAR bound to the value returned by BODYFORM. See also the function `signal' for more info. @@ -1809,7 +1809,7 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit) unbind_to (count, Qnil); } - /* If an error is signalled during a Lisp hook in redisplay, write a + /* If an error is signaled during a Lisp hook in redisplay, write a backtrace into the buffer *Redisplay-trace*. */ if (!debugger_called && !NILP (error_symbol) && backtrace_on_redisplay_error diff --git a/src/frame.c b/src/frame.c index bfdd03e5013..f63a19e7dcf 100644 --- a/src/frame.c +++ b/src/frame.c @@ -5953,7 +5953,7 @@ DEFUN ("reconsider-frame-fonts", Freconsider_frame_fonts, Sreconsider_frame_fonts, 1, 1, 0, doc: /* Recreate FRAME's default font using updated font parameters. Signal an error if FRAME is not a window system frame. This should be -called after a `config-changed' event is received, signalling that the +called after a `config-changed' event is received, signaling that the parameters (such as pixel density) used by the system to open fonts have changed. */) (Lisp_Object frame) diff --git a/src/haikuselect.c b/src/haikuselect.c index bd004f4900a..e8d3b5f0f7f 100644 --- a/src/haikuselect.c +++ b/src/haikuselect.c @@ -1260,7 +1260,7 @@ syms_of_haikuselect (void) { DEFVAR_BOOL ("haiku-signal-invalid-refs", haiku_signal_invalid_refs, doc: /* If nil, silently ignore invalid file names in system messages. -Otherwise, an error will be signalled if adding a file reference to a +Otherwise, an error will be signaled if adding a file reference to a system message failed. */); haiku_signal_invalid_refs = true; diff --git a/test/lisp/emacs-lisp/syntax-tests.el b/test/lisp/emacs-lisp/syntax-tests.el index f266db5c702..d8fc5c4fa82 100644 --- a/test/lisp/emacs-lisp/syntax-tests.el +++ b/test/lisp/emacs-lisp/syntax-tests.el @@ -56,7 +56,7 @@ "\\(?2:[abc]+\\)foo\\(\\2\\)" 2) "\\(?4:[abc]+\\)foo\\(\\4\\)")) ;; Emacs supports only the back-references \1,...,\9, so when a - ;; shift would result in \10 or more, an error must be signalled. + ;; shift would result in \10 or more, an error must be signaled. (should-error (syntax-propertize--shift-groups-and-backrefs "\\(a\\)\\3" 7))) diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el index 76318429181..558799286f5 100644 --- a/test/lisp/net/dbus-tests.el +++ b/test/lisp/net/dbus-tests.el @@ -1093,7 +1093,7 @@ is in progress." (dbus-unregister-service :session dbus--test-service))) (ert-deftest dbus-test06-register-property-emits-signal () - "Check property registration for an own service, including signalling." + "Check property registration for an own service, including signaling." (skip-unless dbus--test-enabled-session-bus) (dbus-ignore-errors (dbus-unregister-service :session dbus--test-service)) @@ -1136,7 +1136,7 @@ is in progress." dbus--test-interface property) "foo")) - ;; Set property. The new value shall be signalled. + ;; Set property. The new value shall be signaled. (setq dbus--test-signal-received nil) (should (equal -- 2.39.2