From 8ce47a9eda739348f599f3b04cc6de983d3aa022 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 4 Nov 2024 22:27:36 +0100 Subject: [PATCH] ; Fix typos (cherry picked from commit 7cb77385d38b96377d404a2ab0e778b2dfce5c77) --- admin/codespell/codespell.exclude | 8 +++++++- doc/lispref/processes.texi | 2 +- doc/misc/cc-mode.texi | 4 ++-- doc/misc/modus-themes.org | 14 +++++++------- doc/misc/tramp.texi | 2 +- etc/themes/modus-operandi-tinted-theme.el | 4 ++-- etc/themes/modus-themes.el | 2 +- exec/trace.c | 2 +- lisp/emacs-lisp/comp.el | 2 +- lisp/emacs-lisp/cond-star.el | 2 +- lisp/emacs-lisp/easy-mmode.el | 4 ++-- lisp/eshell/esh-proc.el | 2 +- lisp/net/tramp-sh.el | 7 ++++--- lisp/progmodes/cc-defs.el | 2 +- lisp/progmodes/cperl-mode.el | 2 +- lisp/progmodes/typescript-ts-mode.el | 2 +- src/w32dwrite.c | 2 +- src/w32font.c | 2 +- test/lisp/erc/erc-scenarios-log.el | 2 +- test/lisp/erc/erc-track-tests.el | 2 +- test/lisp/net/tramp-tests.el | 2 +- 21 files changed, 39 insertions(+), 32 deletions(-) diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude index f4c67ae83e8..f11918f53f3 100644 --- a/admin/codespell/codespell.exclude +++ b/admin/codespell/codespell.exclude @@ -1078,7 +1078,7 @@ decode_env_path (const char *evarname, const char *defalt, bool empty) Lisp_Object defalt; val = tbl->defalt; counts the ordinary slots and the top, defalt, parent, and purpose -verify (offsetof (struct Lisp_Char_Table, defalt) == header_size); +static_assert (offsetof (struct Lisp_Char_Table, defalt) == header_size); XCHAR_TABLE (table)->defalt = val; string, and DEFALT is a string, read from DEFALT instead of VAL. */ string_to_object (Lisp_Object val, Lisp_Object defalt) @@ -1743,3 +1743,9 @@ Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph 2a85d81c47 Add support for gathering statistics on use-package declar... (let* ((nam (buffer-substring (match-beginning 2) (match-end 2))) (setq nmlst (cons nam nmlst) + (df '((defualt :foreground "cyan")))) +All the characters whose Unicode general-category is Nd now have the +;;; Each character whose Unicode general-category is Nd gets the digit + (skipp (or (erc--memq-msg-prop 'erc--skip 'stamp) + (when (and fullp culled (not skipp) (< 1 beg 3 end)) + ((not skipp)) diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index eaa465ce7b8..850e9c197e3 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -2716,7 +2716,7 @@ If non-@code{nil}, the host's capability string. @item :type @var{symbol} The connection type: @samp{plain} or @samp{tls}. @item :error @var{symbol} -A string describing any error encountered when perfoming +A string describing any error encountered when performing @acronym{STARTTLS} upgrade. @end table diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index ad39bc2417f..2166462eca6 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -4831,9 +4831,9 @@ to make it easier to give an @code{enum} indentation like that of a @ssindex enum-intro @ssindex enum-close @ssindex enum-entry -Line 2 is assigned @code{enum-open} sytax, and line 6 +Line 2 is assigned @code{enum-open} syntax, and line 6 @code{enum-close}. The first enum element on line 3 is assigned -@code{enum-intro} sytax, and the remaining elements, on lines 4 and 5 +@code{enum-intro} syntax, and the remaining elements, on lines 4 and 5 are assigned @code{enum-entry}. When the first enum element follows the @samp{@{} of the @code{enum}, diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 76379d1a168..b33b02d98ec 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -88,7 +88,7 @@ The Modus themes consist of eight themes, divided into four subgroups. are variants of the two main themes. They slightly tone down the intensity of the background and provide a bit more color variety. ~modus-operandi-tinted~ has a set of base tones that are shades of - light ochre (earthly colors), while ~modus-vivendi-tinted~ gives a + light ocher (earthly colors), while ~modus-vivendi-tinted~ gives a night sky impression. - Deuteranopia themes :: ~modus-operandi-deuteranopia~ and its @@ -1361,7 +1361,7 @@ value in some other application. :END: #+findex: modus-themes-get-color-value -The fuction ~modus-themes-get-color-value~ can be called from Lisp to +The function ~modus-themes-get-color-value~ can be called from Lisp to return the value of a color from the active Modus theme palette. It takea a =COLOR= argument and an optional =OVERRIDES=. It also accepts a third =THEME= argument, to get the color from the given theme. @@ -2367,7 +2367,7 @@ until version 4.3.0. ;; was the default in versions of the Modus themes before 4.4.0 (setq modus-themes-common-palette-overrides '((bg-prose-block-contents unspecified) - (bg-prose-block-delimiter unspeficied) + (bg-prose-block-delimiter unspecified) (fg-prose-block-delimiter fg-dim))) #+end_src @@ -3365,7 +3365,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 @@ -5407,7 +5407,7 @@ more effective than trying to do the same with either red or blue (the latter is the least effective in that regard). When we need to work with several colors, it is always better to have -sufficient manoeuvring space, especially since we cannot pick arbitrary +sufficient maneuvering space, especially since we cannot pick arbitrary colors but only those that satisfy the accessibility objectives of the themes. @@ -5513,7 +5513,7 @@ it is already understood that one must follow the indicator or headline to view its contents and (ii) underlining everything would make the interface virtually unusable. -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 @@ -5587,7 +5587,7 @@ the themes, which is partially fleshed out in this manual. With regard to the artistic aspect (where "art" qua skill may amount to an imprecise science), there is no hard-and-fast rule in effect as it -requires one to exercize discretion and make decisions based on +requires one to exercise discretion and make decisions based on context-dependent information or constraints. As is true with most things in life, when in doubt, do not cling on to the letter of the law but try to understand its spirit. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index fdf81342432..8bf9c06a53a 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -5224,7 +5224,7 @@ Otherwise, comment out the active code, and uncomment the just commented code. Call @command{emacs}, again. Reiterate, until you find the suspicious -configuaration. +configuration. @node Frequently Asked Questions diff --git a/etc/themes/modus-operandi-tinted-theme.el b/etc/themes/modus-operandi-tinted-theme.el index a9be4374f80..2cb8dfbc80b 100644 --- a/etc/themes/modus-operandi-tinted-theme.el +++ b/etc/themes/modus-operandi-tinted-theme.el @@ -1,4 +1,4 @@ -;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ochre background -*- lexical-binding:t -*- +;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ocher background -*- lexical-binding:t -*- ;; Copyright (C) 2019-2024 Free Software Foundation, Inc. @@ -44,7 +44,7 @@ ;;;###theme-autoload (deftheme modus-operandi-tinted - "Elegant, highly legible theme with a light ochre background. + "Elegant, highly legible theme with a light ocher background. Conforms with the highest legibility standard for color contrast between background and foreground in any given piece of text, which corresponds to a minimum contrast in relative luminance of diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index 1ccd498e165..7f003be3215 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el @@ -1449,7 +1449,7 @@ color that is combined with FG-FOR-BG." :foreground fg :weight ;; If we have `bold' specifically, we inherit the face of - ;; the same name. This allows the user to customise that + ;; the same name. This allows the user to customize that ;; face, such as to change its font family. (if (and weight (not (eq weight 'bold))) weight diff --git a/exec/trace.c b/exec/trace.c index 2af6d867efe..5e1ef1f74a1 100644 --- a/exec/trace.c +++ b/exec/trace.c @@ -1917,7 +1917,7 @@ after_fork (pid_t pid) /* Request that the child stop upon the next `exec' system call, one of which is assumed to always be issued by the child, as below, but await the next stop, and examine its contents. - Anciently, the syscall-stop preceeded events marked + Anciently, the syscall-stop preceded events marked PTRACE_EVENT_SECCOMP, whereas this sequence is reversed in 4.8+, and in releases with these changes backported. */ diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 96341b0a39f..f77c017bdd2 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3667,7 +3667,7 @@ the compilation was successful return the compiled function." "Native compile if necessary all the .el files present in DIRECTORY. Each .el file is native-compiled if the corresponding .eln file is not found in any directory mentioned in `native-comp-eln-load-path'. -The search within DIRECTORY is perfomed recursively." +The search within DIRECTORY is performed recursively." (mapc (lambda (file) (unless (comp-lookup-eln file) (native-compile file))) diff --git a/lisp/emacs-lisp/cond-star.el b/lisp/emacs-lisp/cond-star.el index 0c9efcf07dc..3f371a41228 100644 --- a/lisp/emacs-lisp/cond-star.el +++ b/lisp/emacs-lisp/cond-star.el @@ -22,7 +22,7 @@ ;;; Commentary: -;; This library implements `cond*', an alternative to 'pcase'. +;; This library implements `cond*', an alternative to `pcase'. ;; Here is the list of functions the generated code is known to call: ;; car, cdr, car-safe, cdr-safe, nth, nthcdr, null, eq, equal, eql, =, diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 1466ccb8e89..5c1c4789107 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -774,7 +774,7 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX)." ;;; (defun easy-mmode--prev (re name count &optional endfun narrowfun) - "Go to the COUNT'th previous occurence of RE. + "Go to the COUNT'th previous occurrence of RE. If none, error with NAME. @@ -798,7 +798,7 @@ ENDFUN and NARROWFUN are treated like in `easy-mmode-define-navigation'." (when re-narrow (funcall narrowfun))))) (defun easy-mmode--next (re name count &optional endfun narrowfun) - "Go to the next COUNT'th occurence of RE. + "Go to the next COUNT'th occurrence of RE. If none, error with NAME. diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 87c95d39603..1f5529b07e3 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -522,7 +522,7 @@ output." ;; where this matters, using an external pipe ;; operator (`*|') may work instead. (cond - ;; Delay signalling remote processes to prevent + ;; Delay signaling remote processes to prevent ;; "Forbidden reentrant call of Tramp". ((process-get proc 'remote-pid) (run-at-time 0 nil #'signal-process proc 'SIGPIPE)) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index d81420d1b5f..8b51ee2dbf5 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3761,9 +3761,10 @@ Fall back to normal file name handler if no Tramp handler exists." ;; Default file name handlers, we don't care. (t (tramp-run-real-handler operation args)))) - ;; When `tramp-mode' is not enabled, or the file name is - ;; quoted, we don't do anything. - (tramp-run-real-handler operation args))))) + ;; When `tramp-mode' is not enabled, or the file name is not a + ;; remote file name, we don't do anything. Same for default + ;; file name handlers. + (tramp-run-real-handler operation args)))) (defun tramp-sh-handle-file-notify-add-watch (file-name flags _callback) "Like `file-notify-add-watch' for Tramp files." diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 23dea22d138..55f268980e2 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1569,7 +1569,7 @@ Return the position of the first removed property, or nil." (defmacro c-clear-syntax-table-with-value-trim-caches (from to value) "Remove all `syntax-table' text-properties with value VALUE from [FROM, TO) -and invalidate the four caches from the first postion, if any, where a +and invalidate the four caches from the first position, if any, where a property was removed. Return the position of the first property removed, if any, else nil. POINT and the match data remain unchanged." (declare (debug t)) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index ccd750620a7..f37ab070ad5 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -7886,7 +7886,7 @@ LEVEL us the current level during the recursive calls." ;;"[*/+-|&<.]+=" ) "\\|") - "Lisp Regular expression for things regularly occuring in a Perl regex. + "Lisp Regular expression for things regularly occurring in a Perl regex. If matches at the start of match found by `my-bad-c-style-regexp', insertion of a whitespace will not help.") diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index f3c60e5c0e7..5900fd81d5a 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -87,7 +87,7 @@ (defun typescript-ts-mode--check-dialect (dialect) (unless (or (eq dialect 'typescript) (eq dialect 'tsx)) (signal 'typescript-ts-mode-wrong-dialect-error - (list "Unsupported dialect for typescript-ts-mode suplied" dialect)))) + (list "Unsupported dialect for typescript-ts-mode supplied" dialect)))) (defun tsx-ts-mode--indent-compatibility-b893426 () "Indent rules helper, to handle different releases of tree-sitter-tsx. diff --git a/src/w32dwrite.c b/src/w32dwrite.c index 29f9d5f1fed..26ad4e9f9a2 100644 --- a/src/w32dwrite.c +++ b/src/w32dwrite.c @@ -722,7 +722,7 @@ get_bitmap_render_target (HDC hdc, int width, int height) if (!verify_hr (hr, "Failed to CreateBitmapRenderTarget")) return NULL; - /* We handle high dpi displays by incresing font size, so override + /* We handle high dpi displays by increasing font size, so override PixelsPerDip. */ brt->lpVtbl->SetPixelsPerDip (brt, 1.0); diff --git a/src/w32font.c b/src/w32font.c index 48968a28fbd..2e6f8bed3e7 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -892,7 +892,7 @@ w32font_otf_drive (struct font *font, Lisp_Object features, Windows fonts in Emacs's sources, this cannot be fixed in the the default fontset setup provided by Emacs: we cannot arrange for the "good" fonts to be used in all such cases, because that would mean - naming those fonts. The solution for thes issues is to customize the + naming those fonts. The solution for these issues is to customize the default fontset using set-fontset-font, to force Emacs to use a font known to support some characters. diff --git a/test/lisp/erc/erc-scenarios-log.el b/test/lisp/erc/erc-scenarios-log.el index 4ff1b956aea..06fbc37a08a 100644 --- a/test/lisp/erc/erc-scenarios-log.el +++ b/test/lisp/erc/erc-scenarios-log.el @@ -267,7 +267,7 @@ (should (string= (buffer-name) (format "127.0.0.1:%d" port))) (should-not (file-exists-p logserv)) (should-not (file-exists-p logchan)) - ;; Verify that truncation actally happens where it should. + ;; Verify that truncation actually happens where it should. (funcall assert-truncation expect) (should (file-exists-p logserv)))) diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el index c830c8b2016..59b200a2fe8 100644 --- a/test/lisp/erc/erc-track-tests.el +++ b/test/lisp/erc/erc-track-tests.el @@ -314,7 +314,7 @@ (push (list (point)) bounds) (insert ; JOIN - ts " " ; iniital `fill' indentation lacks properties + ts " " ; initial `fill' indentation lacks properties #("*** You have joined channel #chan" 0 33 (font-lock-face erc-notice-face)) "\n") diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 7af8915bc67..3a770648b25 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -7747,7 +7747,7 @@ process sentinels. They shall not disturb each other." ;; We want to see the timeout message. (tramp--test-instrument-test-case 3 (sleep-for 2)) - ;; Session cancelled, no password in cache. + ;; Session canceled, no password in cache. (should-not (password-in-cache-p (auth-source-format-cache-entry -- 2.39.5