aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2024-06-04 22:13:47 -0700
committerPaul Eggert2024-06-04 22:16:28 -0700
commit3dcac22dd4225fdec0b97408da38f74de2a77bef (patch)
treec79a8563efbed67aae0bba5d46b628c1e8a5b69b
parent636461686f1d36388d4523cbb10eb7ec3bbbd63e (diff)
downloademacs-3dcac22dd4225fdec0b97408da38f74de2a77bef.tar.gz
emacs-3dcac22dd4225fdec0b97408da38f74de2a77bef.zip
Spelling fixes
-rw-r--r--ChangeLog.32
-rw-r--r--ChangeLog.42
-rw-r--r--admin/notes/kind-communication2
-rw-r--r--doc/lispref/commands.texi2
-rw-r--r--doc/lispref/parsing.texi2
-rw-r--r--doc/lispref/peg.texi2
-rw-r--r--doc/misc/eshell.texi2
-rw-r--r--doc/misc/modus-themes.org16
-rw-r--r--doc/misc/transient.texi2
-rw-r--r--etc/themes/modus-themes.el2
-rw-r--r--java/AndroidManifest.xml.in2
-rw-r--r--java/INSTALL2
-rw-r--r--java/org/gnu/emacs/EmacsDesktopNotification.java2
-rw-r--r--java/org/gnu/emacs/EmacsGC.java2
-rw-r--r--java/org/gnu/emacs/EmacsTileObject.java2
-rw-r--r--java/org/gnu/emacs/EmacsWindowManager.java6
-rw-r--r--lisp/completion-preview.el2
-rw-r--r--lisp/emacs-lisp/comp.el2
-rw-r--r--lisp/emacs-lisp/package.el2
-rw-r--r--lisp/emacs-lisp/track-changes.el6
-rw-r--r--lisp/eshell/em-script.el2
-rw-r--r--lisp/eshell/esh-io.el2
-rw-r--r--lisp/image.el4
-rw-r--r--lisp/net/dictionary.el2
-rw-r--r--lisp/net/eww.el2
-rw-r--r--lisp/net/tramp-container.el2
-rw-r--r--lisp/net/tramp-sh.el2
-rw-r--r--lisp/net/tramp.el2
-rw-r--r--lisp/outline.el2
-rw-r--r--lisp/progmodes/c-ts-common.el2
-rw-r--r--lisp/progmodes/flymake.el4
-rw-r--r--lisp/progmodes/xref.el2
-rw-r--r--lisp/term/android-win.el2
-rw-r--r--lisp/thingatpt.el2
-rw-r--r--lisp/transient.el2
-rw-r--r--lisp/treesit.el2
-rw-r--r--lisp/url/url-util.el2
-rw-r--r--lisp/window-tool-bar.el6
-rw-r--r--src/androidselect.c2
-rw-r--r--src/fns.c2
-rw-r--r--src/itree.c2
-rw-r--r--src/json.c2
-rw-r--r--src/macros.c4
-rw-r--r--src/sort.c2
-rw-r--r--src/xdisp.c4
-rw-r--r--test/lisp/erc/erc-goodies-tests.el4
-rw-r--r--test/lisp/progmodes/peg-tests.el2
47 files changed, 65 insertions, 65 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index 2d20f535a1c..ef63f674b59 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -222922,7 +222922,7 @@
222922 222922
2229232016-07-09 Jürgen Hötzel <juergen@archlinux.org> 2229232016-07-09 Jürgen Hötzel <juergen@archlinux.org>
222924 222924
222925 Wrap around error in coreutil's ls 222925 Wrap around error in coreutils ls
222926 222926
222927 * lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory): Add switch 222927 * lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory): Add switch
222928 "--quoting-style=literal" if remote host supports quoting style. 222928 "--quoting-style=literal" if remote host supports quoting style.
diff --git a/ChangeLog.4 b/ChangeLog.4
index e3950461f5f..3eb2c16d6b1 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -81723,7 +81723,7 @@
81723 81723
81724 * src/xfns.c (x_make_gc): Don't set FillOpaqueStippled on cursor 81724 * src/xfns.c (x_make_gc): Don't set FillOpaqueStippled on cursor
81725 GC. The reason is that some X servers break on such a fill 81725 GC. The reason is that some X servers break on such a fill
81726 style if the operation being performed is not a stiple 81726 style if the operation being performed is not a stipple
81727 operation. 81727 operation.
81728 81728
817292022-02-09 Po Lu <luangruo@yahoo.com> 817292022-02-09 Po Lu <luangruo@yahoo.com>
diff --git a/admin/notes/kind-communication b/admin/notes/kind-communication
index 80b2afb27b2..cacb5d40c25 100644
--- a/admin/notes/kind-communication
+++ b/admin/notes/kind-communication
@@ -7,7 +7,7 @@ views.
7People are sometimes discouraged from participating in GNU development 7People are sometimes discouraged from participating in GNU development
8because of certain patterns of communication that strike them as 8because of certain patterns of communication that strike them as
9unfriendly, unwelcoming, rejecting, or harsh. This discouragement 9unfriendly, unwelcoming, rejecting, or harsh. This discouragement
10particularly affects members of disprivileged demographics, but it is 10particularly affects members of unprivileged demographics, but it is
11not limited to them. Therefore, we ask all contributors to make a 11not limited to them. Therefore, we ask all contributors to make a
12conscious effort, in GNU Project discussions, to communicate in ways 12conscious effort, in GNU Project discussions, to communicate in ways
13that avoid that outcome — to avoid practices that will predictably and 13that avoid that outcome — to avoid practices that will predictably and
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 3425281febd..a9da6c75367 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2354,7 +2354,7 @@ window within a frame can also switch the selected window. @xref{Mouse
2354Window Auto-selection}, which describes the behavior for different 2354Window Auto-selection}, which describes the behavior for different
2355values. When the mouse is moved over a new window, a focus event for 2355values. When the mouse is moved over a new window, a focus event for
2356switching windows is generated. Focus events for windows are 2356switching windows is generated. Focus events for windows are
2357reperesented in Lisp as lists that look like this: 2357represented in Lisp as lists that look like this:
2358 2358
2359@example 2359@example
2360(select-window @var{new-window}) 2360(select-window @var{new-window})
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index c8c2fe80c03..1e91100e0d4 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1582,7 +1582,7 @@ Here's an example @var{treesit-thing-settings} for C and C++:
1582@end example 1582@end example
1583 1583
1584@noindent 1584@noindent
1585Note that this example is modified for didactical purposes, and isn't 1585Note that this example is modified for didactic purposes, and isn't
1586exactly how C and C@t{++} modes define things. 1586exactly how C and C@t{++} modes define things.
1587@end defvar 1587@end defvar
1588 1588
diff --git a/doc/lispref/peg.texi b/doc/lispref/peg.texi
index b85d0de048d..e496e1cf817 100644
--- a/doc/lispref/peg.texi
+++ b/doc/lispref/peg.texi
@@ -14,7 +14,7 @@ from regular expressions (@pxref{Regular Expressions}) to full
14left-to-right (a.k.a.@: @acronym{LL}) grammar parsers (@pxref{Top,, 14left-to-right (a.k.a.@: @acronym{LL}) grammar parsers (@pxref{Top,,
15Bovine parser development,bovine}). @dfn{Parsing Expression Grammars} 15Bovine parser development,bovine}). @dfn{Parsing Expression Grammars}
16(@acronym{PEG}) are another approach to text parsing that offer more 16(@acronym{PEG}) are another approach to text parsing that offer more
17structure and composibility than regular expressions, but less 17structure and composability than regular expressions, but less
18complexity than context-free grammars. 18complexity than context-free grammars.
19 19
20A Parsing Expression Grammar (@acronym{PEG}) describes a formal language 20A Parsing Expression Grammar (@acronym{PEG}) describes a formal language
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index c8a04bfa33f..69f94fab469 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1549,7 +1549,7 @@ also specify the absolute path to the program, e.g.@:
1549program whose file name would be interpreted as an explicitly-remote 1549program whose file name would be interpreted as an explicitly-remote
1550command, you can use @kbd{/:} to quote the name, e.g.@: 1550command, you can use @kbd{/:} to quote the name, e.g.@:
1551@samp{/:/ssh:user@@remote:whoami} (@pxref{Quoted File Names,,, emacs, 1551@samp{/:/ssh:user@@remote:whoami} (@pxref{Quoted File Names,,, emacs,
1552The GNU Emacs Manual}). To disable explicity-remote commands entirely, 1552The GNU Emacs Manual}). To disable explicitly-remote commands entirely,
1553you can set the option @code{eshell-explicit-remote-commands} to 1553you can set the option @code{eshell-explicit-remote-commands} to
1554@code{nil}. 1554@code{nil}.
1555 1555
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index c3de15c35ad..33443487066 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -1251,7 +1251,7 @@ value in some other application.
1251:END: 1251:END:
1252 1252
1253#+findex: modus-themes-get-color-value 1253#+findex: modus-themes-get-color-value
1254The fuction ~modus-themes-get-color-value~ can be called from Lisp to 1254The function ~modus-themes-get-color-value~ can be called from Lisp to
1255return the value of a color from the active Modus theme palette. It 1255return the value of a color from the active Modus theme palette. It
1256takea a =COLOR= argument and an optional =OVERRIDES=. It also accepts 1256takea a =COLOR= argument and an optional =OVERRIDES=. It also accepts
1257a third =THEME= argument, to get the color from the given theme. 1257a third =THEME= argument, to get the color from the given theme.
@@ -2162,7 +2162,7 @@ until version 4.3.0.
2162;; was the default in versions of the Modus themes before 4.4.0 2162;; was the default in versions of the Modus themes before 4.4.0
2163(setq modus-themes-common-palette-overrides 2163(setq modus-themes-common-palette-overrides
2164 '((bg-prose-block-contents unspecified) 2164 '((bg-prose-block-contents unspecified)
2165 (bg-prose-block-delimiter unspeficied) 2165 (bg-prose-block-delimiter unspecified)
2166 (fg-prose-block-delimiter fg-dim))) 2166 (fg-prose-block-delimiter fg-dim)))
2167#+end_src 2167#+end_src
2168 2168
@@ -2806,7 +2806,7 @@ above:
2806The reason we no longer provide this option is because it depends on a 2806The reason we no longer provide this option is because it depends on a
2807non-~nil~ value for ~x-underline-at-descent-line~. That variable 2807non-~nil~ value for ~x-underline-at-descent-line~. That variable
2808affects ALL underlines, including those of links. The effect is 2808affects ALL underlines, including those of links. The effect is
2809intrusive and looks awkard in prose. 2809intrusive and looks awkward in prose.
2810 2810
2811As such, the Modus themes no longer provide that option but instead 2811As such, the Modus themes no longer provide that option but instead
2812offer this piece of documentation to make the user fully aware of the 2812offer this piece of documentation to make the user fully aware of the
@@ -3160,7 +3160,7 @@ specification of that variable looks like this:
3160 3160
3161With the exception of ~org-verbatim~ and ~org-code~ faces, everything else 3161With the exception of ~org-verbatim~ and ~org-code~ faces, everything else
3162uses the corresponding type of emphasis: a bold typographic weight, or 3162uses the corresponding type of emphasis: a bold typographic weight, or
3163italicised, underlined, and struck through text. 3163italicized, underlined, and struck through text.
3164 3164
3165The best way for users to add some extra attributes, such as a 3165The best way for users to add some extra attributes, such as a
3166foreground color, is to define their own faces and assign them to the 3166foreground color, is to define their own faces and assign them to the
@@ -5074,7 +5074,7 @@ more effective than trying to do the same with either red or blue (the
5074latter is the least effective in that regard). 5074latter is the least effective in that regard).
5075 5075
5076When we need to work with several colors, it is always better to have 5076When we need to work with several colors, it is always better to have
5077sufficient manoeuvring space, especially since we cannot pick arbitrary 5077sufficient maneuvering space, especially since we cannot pick arbitrary
5078colors but only those that satisfy the accessibility objectives of the 5078colors but only those that satisfy the accessibility objectives of the
5079themes. 5079themes.
5080 5080
@@ -5128,7 +5128,7 @@ each of the three channels of light (red, green, blue). For example:
5128: xrandr --output LVDS1 --brightness 1.0 --gamma 0.76:0.75:0.68 5128: xrandr --output LVDS1 --brightness 1.0 --gamma 0.76:0.75:0.68
5129 5129
5130Typography is another variable. Some font families are blurry at small 5130Typography is another variable. Some font families are blurry at small
5131point sizes. Others may have a regular weight that is lighter (thiner) 5131point sizes. Others may have a regular weight that is lighter (thinner)
5132than that of their peers which may, under certain circumstances, cause a 5132than that of their peers which may, under certain circumstances, cause a
5133halo effect around each glyph. 5133halo effect around each glyph.
5134 5134
@@ -5180,7 +5180,7 @@ it is already understood that one must follow the indicator or headline
5180to view its contents and (ii) underlining everything would make the 5180to view its contents and (ii) underlining everything would make the
5181interface virtually unusable. 5181interface virtually unusable.
5182 5182
5183Again, one must exercise judgement in order to avoid discrimination, 5183Again, one must exercise judgment in order to avoid discrimination,
5184where "discrimination" refers to: 5184where "discrimination" refers to:
5185 5185
5186+ The treatment of substantially different magnitudes as if they were of 5186+ The treatment of substantially different magnitudes as if they were of
@@ -5254,7 +5254,7 @@ the themes, which is partially fleshed out in this manual.
5254 5254
5255With regard to the artistic aspect (where "art" qua skill may amount to 5255With regard to the artistic aspect (where "art" qua skill may amount to
5256an imprecise science), there is no hard-and-fast rule in effect as it 5256an imprecise science), there is no hard-and-fast rule in effect as it
5257requires one to exercize discretion and make decisions based on 5257requires one to exercise discretion and make decisions based on
5258context-dependent information or constraints. As is true with most 5258context-dependent information or constraints. As is true with most
5259things in life, when in doubt, do not cling on to the letter of the law 5259things in life, when in doubt, do not cling on to the letter of the law
5260but try to understand its spirit. 5260but try to understand its spirit.
diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index 3a6486903bf..0aa520237f7 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -1210,7 +1210,7 @@ described below. If you use the latter approach, you can use the
1210transform them from the convenient to the expected form. 1210transform them from the convenient to the expected form.
1211 1211
1212If you explicitly specify children and then transform them using 1212If you explicitly specify children and then transform them using
1213@code{:setup-chilren}, then the class of the group is determined as usual, 1213@code{:setup-children}, then the class of the group is determined as usual,
1214based on explicitly specified children. 1214based on explicitly specified children.
1215 1215
1216If you do not explicitly specify children and thus rely solely on 1216If you do not explicitly specify children and thus rely solely on
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index b776f12671e..b8be7f07a57 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -1389,7 +1389,7 @@ color that is combined with FG-FOR-BG."
1389 :foreground fg 1389 :foreground fg
1390 :weight 1390 :weight
1391 ;; If we have `bold' specifically, we inherit the face of 1391 ;; If we have `bold' specifically, we inherit the face of
1392 ;; the same name. This allows the user to customise that 1392 ;; the same name. This allows the user to customize that
1393 ;; face, such as to change its font family. 1393 ;; face, such as to change its font family.
1394 (if (and weight (not (eq weight 'bold))) 1394 (if (and weight (not (eq weight 'bold)))
1395 weight 1395 weight
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index ff811ddf3f1..644f154b53b 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -20,7 +20,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
20<!-- targetSandboxVersion must be 1, for otherwise fascist security 20<!-- targetSandboxVersion must be 1, for otherwise fascist security
21 restrictions prevent Emacs from making HTTP connections. 21 restrictions prevent Emacs from making HTTP connections.
22 22
23 Futhermore, versionCode should remain constant, rather than increase 23 Furthermore, versionCode should remain constant, rather than increase
24 with each major release, because it is impossible to downgrade an 24 with each major release, because it is impossible to downgrade an
25 installation with a greater value to an older version of Emacs. --> 25 installation with a greater value to an older version of Emacs. -->
26 26
diff --git a/java/INSTALL b/java/INSTALL
index 94bf0b01a96..a4cc97e7710 100644
--- a/java/INSTALL
+++ b/java/INSTALL
@@ -170,7 +170,7 @@ In normal circumstances, Emacs should automatically detect and configure
170one of the C++ standard libraries part of the NDK when such a library is 170one of the C++ standard libraries part of the NDK when such a library is
171required to build a dependency specified under `--with-ndk-path'. 171required to build a dependency specified under `--with-ndk-path'.
172 172
173Nevertheless, this process is not infalliable, and with certain versions 173Nevertheless, this process is not infallible, and with certain versions
174of the NDK is liable to fail to locate a C++ compiler, requiring that 174of the NDK is liable to fail to locate a C++ compiler, requiring that
175you run the `make_standalone_toolchain.py' script in the NDK 175you run the `make_standalone_toolchain.py' script in the NDK
176distribution to create a ``standalone toolchain'' and substitute the 176distribution to create a ``standalone toolchain'' and substitute the
diff --git a/java/org/gnu/emacs/EmacsDesktopNotification.java b/java/org/gnu/emacs/EmacsDesktopNotification.java
index 72569631a8c..2bbfd867afa 100644
--- a/java/org/gnu/emacs/EmacsDesktopNotification.java
+++ b/java/org/gnu/emacs/EmacsDesktopNotification.java
@@ -83,7 +83,7 @@ public final class EmacsDesktopNotification
83 notification. */ 83 notification. */
84 public final String[] actions, titles; 84 public final String[] actions, titles;
85 85
86 /* Delay in miliseconds after which this notification should be 86 /* Delay in milliseconds after which this notification should be
87 automatically dismissed. */ 87 automatically dismissed. */
88 public final long delay; 88 public final long delay;
89 89
diff --git a/java/org/gnu/emacs/EmacsGC.java b/java/org/gnu/emacs/EmacsGC.java
index d400c23e067..0b0f09c7ab9 100644
--- a/java/org/gnu/emacs/EmacsGC.java
+++ b/java/org/gnu/emacs/EmacsGC.java
@@ -55,7 +55,7 @@ public final class EmacsGC extends EmacsHandleObject
55 public EmacsPixmap clip_mask, stipple; 55 public EmacsPixmap clip_mask, stipple;
56 public Paint gcPaint; 56 public Paint gcPaint;
57 57
58 /* Drawable object for rendering the stiple bitmap. */ 58 /* Drawable object for rendering the stipple bitmap. */
59 public EmacsTileObject tileObject; 59 public EmacsTileObject tileObject;
60 60
61 /* ID incremented every time the clipping rectangles of any GC 61 /* ID incremented every time the clipping rectangles of any GC
diff --git a/java/org/gnu/emacs/EmacsTileObject.java b/java/org/gnu/emacs/EmacsTileObject.java
index a79ae826d51..93b09f5a8bc 100644
--- a/java/org/gnu/emacs/EmacsTileObject.java
+++ b/java/org/gnu/emacs/EmacsTileObject.java
@@ -27,7 +27,7 @@ import android.graphics.Paint;
27import android.graphics.Rect; 27import android.graphics.Rect;
28import android.graphics.Shader.TileMode; 28import android.graphics.Shader.TileMode;
29 29
30/* This is a crude facsimilie of the BitmapDrawable class implementing 30/* This is a crude facsimile of the BitmapDrawable class implementing
31 just enough of its functionality to support displaying stipples in 31 just enough of its functionality to support displaying stipples in
32 EmacsGC. */ 32 EmacsGC. */
33 33
diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java
index 23dc71dbd29..03487e853fb 100644
--- a/java/org/gnu/emacs/EmacsWindowManager.java
+++ b/java/org/gnu/emacs/EmacsWindowManager.java
@@ -137,7 +137,7 @@ public final class EmacsWindowManager
137 /* Don't attach this window to CONSUMER if incompatible. */ 137 /* Don't attach this window to CONSUMER if incompatible. */
138 && isWindowEligible (consumer, window)) 138 && isWindowEligible (consumer, window))
139 { 139 {
140 /* Permantly bind this window to the consumer. */ 140 /* Permanently bind this window to the consumer. */
141 window.attachmentToken = consumer.getAttachmentToken (); 141 window.attachmentToken = consumer.getAttachmentToken ();
142 window.previouslyAttached = true; 142 window.previouslyAttached = true;
143 consumer.attachWindow (window); 143 consumer.attachWindow (window);
@@ -166,7 +166,7 @@ public final class EmacsWindowManager
166 if (consumer.getAttachedWindow () == null 166 if (consumer.getAttachedWindow () == null
167 && isWindowEligible (consumer, window)) 167 && isWindowEligible (consumer, window))
168 { 168 {
169 /* Permantly bind this window to the consumer. */ 169 /* Permanently bind this window to the consumer. */
170 window.attachmentToken = consumer.getAttachmentToken (); 170 window.attachmentToken = consumer.getAttachmentToken ();
171 window.previouslyAttached = true; 171 window.previouslyAttached = true;
172 consumer.attachWindow (window); 172 consumer.attachWindow (window);
@@ -186,7 +186,7 @@ public final class EmacsWindowManager
186 intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); 186 intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK);
187 187
188 /* Intent.FLAG_ACTIVITY_NEW_DOCUMENT is lamentably unavailable on 188 /* Intent.FLAG_ACTIVITY_NEW_DOCUMENT is lamentably unavailable on
189 older systems than Lolipop. */ 189 older systems than Lollipop. */
190 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) 190 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
191 { 191 {
192 intent.addFlags (Intent.FLAG_ACTIVITY_NEW_DOCUMENT 192 intent.addFlags (Intent.FLAG_ACTIVITY_NEW_DOCUMENT
diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el
index 17d9ca938a8..933ee24b620 100644
--- a/lisp/completion-preview.el
+++ b/lisp/completion-preview.el
@@ -465,7 +465,7 @@ completions list."
465 (funcall efn string status))))) 465 (funcall efn string status)))))
466 ;; The predicate is meant for the original completion 466 ;; The predicate is meant for the original completion
467 ;; candidates, which may be symbols or cons cells, but 467 ;; candidates, which may be symbols or cons cells, but
468 ;; now we only have strings, so it might be unapplicable. 468 ;; now we only have strings, so it might not be applicable.
469 (props (plist-put props :predicate nil)) 469 (props (plist-put props :predicate nil))
470 (completion-at-point-functions 470 (completion-at-point-functions
471 (list (lambda () `(,beg ,end ,col ,@props))))) 471 (list (lambda () `(,beg ,end ,col ,@props)))))
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 1627294199a..032e49840a8 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -207,7 +207,7 @@ Useful to hook into pass checkers.")
207;; cl-macs.el. We can't use `cl-deftype-satisfies' directly as the 207;; cl-macs.el. We can't use `cl-deftype-satisfies' directly as the
208;; relation type <-> predicate is not bijective (bug#45576). 208;; relation type <-> predicate is not bijective (bug#45576).
209(defconst comp-known-predicates 209(defconst comp-known-predicates
210 ;; FIXME: Auto-generate (most of) it from `cl-deftype-satifies'? 210 ;; FIXME: Auto-generate (most of) it from `cl-deftype-satisfies'?
211 '((arrayp array) 211 '((arrayp array)
212 (atom atom) 212 (atom atom)
213 (bool-vector-p bool-vector) 213 (bool-vector-p bool-vector)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fda855d2143..fac824d44a4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2646,7 +2646,7 @@ will be deleted."
2646 (message "Nothing to autoremove"))))) 2646 (message "Nothing to autoremove")))))
2647 2647
2648(defun package-isolate (packages &optional temp-init) 2648(defun package-isolate (packages &optional temp-init)
2649 "Start an uncustomised Emacs and only load a set of PACKAGES. 2649 "Start an uncustomized Emacs and only load a set of PACKAGES.
2650If TEMP-INIT is non-nil, or when invoked with a prefix argument, 2650If TEMP-INIT is non-nil, or when invoked with a prefix argument,
2651the Emacs user directory is set to a temporary directory." 2651the Emacs user directory is set to a temporary directory."
2652 (interactive 2652 (interactive
diff --git a/lisp/emacs-lisp/track-changes.el b/lisp/emacs-lisp/track-changes.el
index 958def17a2f..92d14959763 100644
--- a/lisp/emacs-lisp/track-changes.el
+++ b/lisp/emacs-lisp/track-changes.el
@@ -177,7 +177,7 @@ This is used to try and detect cases where buffer modifications are \"lost\".")
177 ;; presume that these might be too old to receive fixes, so better not 177 ;; presume that these might be too old to receive fixes, so better not
178 ;; annoy the user too much about errors. 178 ;; annoy the user too much about errors.
179 (string-match "\\..*\\." emacs-version) 179 (string-match "\\..*\\." emacs-version)
180 "If non-nil, keep track of errors in `before/after-chage-functions' calls. 180 "If non-nil, keep track of errors in `before/after-change-functions' calls.
181The errors are kept in `track-changes--error-log'.") 181The errors are kept in `track-changes--error-log'.")
182 182
183(cl-defun track-changes-register ( signal &key nobefore disjoint immediate) 183(cl-defun track-changes-register ( signal &key nobefore disjoint immediate)
@@ -500,9 +500,9 @@ Details logged to `track-changes--error-log'")
500 500
501 (if track-changes--before-clean 501 (if track-changes--before-clean
502 (progn 502 (progn
503 ;; Detect disjointness with previous changes here as well, 503 ;; Detect disjointedness with previous changes here as well,
504 ;; so that if a client calls `track-changes-fetch' all the time, 504 ;; so that if a client calls `track-changes-fetch' all the time,
505 ;; it doesn't prevent others from getting a disjointness signal. 505 ;; it doesn't prevent others from getting a disjointedness signal.
506 (when (and track-changes--before-beg 506 (when (and track-changes--before-beg
507 (let ((found nil)) 507 (let ((found nil))
508 (dolist (tracker track-changes--disjoint-trackers) 508 (dolist (tracker track-changes--disjoint-trackers)
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 6e2ca7ca781..88dad840eaa 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -85,7 +85,7 @@ This includes when running `eshell-command'."
85 t)))) 85 t))))
86 86
87(defun eshell--source-file (file &optional args subcommand-p) 87(defun eshell--source-file (file &optional args subcommand-p)
88 "Return a Lisp form for executig the Eshell commands in FILE, passing ARGS. 88 "Return a Lisp form for executing the Eshell commands in FILE, passing ARGS.
89If SUBCOMMAND-P is non-nil, execute this as a subcommand." 89If SUBCOMMAND-P is non-nil, execute this as a subcommand."
90 (let ((cmd (eshell-parse-command `(:file . ,file)))) 90 (let ((cmd (eshell-parse-command `(:file . ,file))))
91 (when subcommand-p 91 (when subcommand-p
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index c7017ee1d70..0fe177d4c60 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -150,7 +150,7 @@ slot, passing the exit status of the redirected command.
150If PASS-MODE is non-nil, Eshell will pass the redirection mode as an 150If PASS-MODE is non-nil, Eshell will pass the redirection mode as an
151argument (which is the symbol `overwrite', `append' or `insert') to 151argument (which is the symbol `overwrite', `append' or `insert') to
152OUTPUT-FUNCTION, which should return the real output function (either an 152OUTPUT-FUNCTION, which should return the real output function (either an
153ordinary function or `eshell-generic-target' as desribed above)." 153ordinary function or `eshell-generic-target' as described above)."
154 :version "30.1" 154 :version "30.1"
155 :type '(repeat 155 :type '(repeat
156 (list (string :tag "Target") 156 (list (string :tag "Target")
diff --git a/lisp/image.el b/lisp/image.el
index c155cda125e..c75c8ff765a 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -568,7 +568,7 @@ loaded."
568 (rotation (plist-get props :rotation))) 568 (rotation (plist-get props :rotation)))
569 (cond 569 (cond
570 ;; The scale of the image won't be available until 570 ;; The scale of the image won't be available until
571 ;; `image_set_transform', and as such, defer to its judgement. 571 ;; `image_set_transform', and as such, defer to its judgment.
572 ((eq scaling 'default) 'lambda) 572 ((eq scaling 'default) 'lambda)
573 ;; We always smooth when scaling down and small upwards scaling. 573 ;; We always smooth when scaling down and small upwards scaling.
574 ((and scaling (< scaling 2)) 574 ((and scaling (< scaling 2))
@@ -812,7 +812,7 @@ where FILE is the file from which to load the image, and DATA is a
812string containing the actual image data. If the property `:type TYPE' 812string containing the actual image data. If the property `:type TYPE'
813is omitted or nil, try to determine the image type from its first few 813is omitted or nil, try to determine the image type from its first few
814bytes of image data. If that doesn't work, and the property `:file 814bytes of image data. If that doesn't work, and the property `:file
815FILE' provide a file name, use its file extension as idication of the 815FILE' provide a file name, use its file extension as indication of the
816image type. If `:type TYPE' is provided, it must match the actual type 816image type. If `:type TYPE' is provided, it must match the actual type
817determined for FILE or DATA by `create-image'. 817determined for FILE or DATA by `create-image'.
818 818
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 9fb8b8ffaed..b12f3fa4368 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -1424,7 +1424,7 @@ via `dictionary-dictionaries'."
1424 ;; This function runs from the tooltip timer. We don't want to 1424 ;; This function runs from the tooltip timer. We don't want to
1425 ;; signal errors from the timer due to "Unknown server answers", 1425 ;; signal errors from the timer due to "Unknown server answers",
1426 ;; we prefer not to show anything in that case. FIXME: Perhaps 1426 ;; we prefer not to show anything in that case. FIXME: Perhaps
1427 ;; use with-demoted-errors, to show the unknonw answers in the 1427 ;; use with-demoted-errors, to show the unknown answers in the
1428 ;; echo-area? 1428 ;; echo-area?
1429 (ignore-errors 1429 (ignore-errors
1430 (let* ((word (dictionary-word-at-mouse-event 1430 (let* ((word (dictionary-word-at-mouse-event
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 32e24f9e2e5..977210e9cc8 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -2463,7 +2463,7 @@ If ERROR-OUT, signal user-error if there are no bookmarks."
2463 2463
2464(defun eww-save-history () 2464(defun eww-save-history ()
2465 "Save the current page's data to the history. 2465 "Save the current page's data to the history.
2466If the current page is a historial one loaded from 2466If the current page is a historical one loaded from
2467`eww-history' (e.g. by calling `eww-back-url'), this will update the 2467`eww-history' (e.g. by calling `eww-back-url'), this will update the
2468page's entry in `eww-history' and return nil. Otherwise, add a new 2468page's entry in `eww-history' and return nil. Otherwise, add a new
2469entry to `eww-history' and return t." 2469entry to `eww-history' and return t."
diff --git a/lisp/net/tramp-container.el b/lisp/net/tramp-container.el
index d0edbfea1e8..f29d55d78d9 100644
--- a/lisp/net/tramp-container.el
+++ b/lisp/net/tramp-container.el
@@ -168,7 +168,7 @@ If it is nil, the default context will be used."
168 168
169;;;###tramp-autoload 169;;;###tramp-autoload
170(defcustom tramp-distrobox-program "distrobox" 170(defcustom tramp-distrobox-program "distrobox"
171 "Name of the Distrobxx client program." 171 "Name of the Distrobox client program."
172 :group 'tramp 172 :group 'tramp
173 :version "30.1" 173 :version "30.1"
174 :type '(choice (const "distrobox") 174 :type '(choice (const "distrobox")
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 87c1bc0b460..106149f5dce 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2705,7 +2705,7 @@ The method used must be an out-of-band method."
2705 (let ((dired (tramp-get-ls-command-with v "--dired"))) 2705 (let ((dired (tramp-get-ls-command-with v "--dired")))
2706 (when (stringp switches) 2706 (when (stringp switches)
2707 (setq switches (split-string switches))) 2707 (setq switches (split-string switches)))
2708 ;; Newer coreutil versions of ls (9.5 and up) imply long format 2708 ;; Newer coreutils versions of ls (9.5 and up) imply long format
2709 ;; output when "--dired" is given. Suppress this implicit rule. 2709 ;; output when "--dired" is given. Suppress this implicit rule.
2710 (when dired 2710 (when dired
2711 (let ((tem switches) 2711 (let ((tem switches)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 21d563d6bfa..5c90f3680c1 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4851,7 +4851,7 @@ a connection-local variable."
4851(defvar tramp-direct-async-process nil 4851(defvar tramp-direct-async-process nil
4852 "Whether direct asynchronous processes should be used. 4852 "Whether direct asynchronous processes should be used.
4853It is not recommended to change this variable globally. Instead, it 4853It is not recommended to change this variable globally. Instead, it
4854should be set conmnection-local.") 4854should be set connection-local.")
4855 4855
4856(defun tramp-direct-async-process-p (&rest args) 4856(defun tramp-direct-async-process-p (&rest args)
4857 "Whether direct async `make-process' can be called." 4857 "Whether direct async `make-process' can be called."
diff --git a/lisp/outline.el b/lisp/outline.el
index 373902e3f59..4d74b30dba4 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1726,7 +1726,7 @@ under `outline-minor-mode' is reverted by `revert-buffer'."
1726 1726
1727(defun outline-revert-buffer-rehighlight () 1727(defun outline-revert-buffer-rehighlight ()
1728 "Rehighlight outlines when reverting buffer under `outline-minor-mode'. 1728 "Rehighlight outlines when reverting buffer under `outline-minor-mode'.
1729This function rehighlightes outlines after the buffer under 1729This function rehighlights outlines after the buffer under
1730`outline-minor-mode' is reverted by `revert-buffer' when font-lock 1730`outline-minor-mode' is reverted by `revert-buffer' when font-lock
1731can't update highlighting for `outline-minor-mode-highlight'." 1731can't update highlighting for `outline-minor-mode-highlight'."
1732 (when (and outline-minor-mode-highlight 1732 (when (and outline-minor-mode-highlight
diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
index f027fc28c04..3882a697c48 100644
--- a/lisp/progmodes/c-ts-common.el
+++ b/lisp/progmodes/c-ts-common.el
@@ -291,7 +291,7 @@ and /* */ comments. SOFT works the same as in
291 ;; I want to experiment with explicitly listing out all each cases and 291 ;; I want to experiment with explicitly listing out all each cases and
292 ;; handle them separately, as opposed to fiddling with `comment-start' 292 ;; handle them separately, as opposed to fiddling with `comment-start'
293 ;; and friends. This will have more duplicate code and will be less 293 ;; and friends. This will have more duplicate code and will be less
294 ;; generic, but in the same time might save us from writting cryptic 294 ;; generic, but in the same time might save us from writing cryptic
295 ;; code to handle all sorts of edge cases. 295 ;; code to handle all sorts of edge cases.
296 ;; 296 ;;
297 ;; For this command, let's try to make it basic: if the current line 297 ;; For this command, let's try to make it basic: if the current line
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 2e602658ea7..6301b77beca 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -188,7 +188,7 @@ See `flymake-error-bitmap' and `flymake-warning-bitmap'."
188The value can be nil (don't indicate errors but just highlight them), 188The value can be nil (don't indicate errors but just highlight them),
189fringes (use fringes) or margins (use margins) 189fringes (use fringes) or margins (use margins)
190 190
191Difference between fringes and margin is that fringes support diplaying 191Difference between fringes and margin is that fringes support displaying
192bitmaps on graphical displays and margins display text in a blank area 192bitmaps on graphical displays and margins display text in a blank area
193from current buffer that works in both graphical and text displays. 193from current buffer that works in both graphical and text displays.
194 194
@@ -788,7 +788,7 @@ Return to original margin width if ORIG-WIDTH is non-nil."
788 left-margin-width 2) 788 left-margin-width 2)
789 (setq-local flymake--original-margin-width right-margin-width 789 (setq-local flymake--original-margin-width right-margin-width
790 right-margin-width 2)))) 790 right-margin-width 2))))
791 ;; Apply margin to all windows avalaibles 791 ;; Apply margin to all windows available.
792 (mapc (lambda (x) 792 (mapc (lambda (x)
793 (set-window-buffer x (window-buffer x))) 793 (set-window-buffer x (window-buffer x)))
794 (get-buffer-window-list nil nil 'visible)))) 794 (get-buffer-window-list nil nil 'visible))))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 0025f1f9479..beea2b8c1d6 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -2117,7 +2117,7 @@ Such as the current syntax table and the applied syntax properties."
2117 ;; Using the temporary buffer is both a performance and a buffer 2117 ;; Using the temporary buffer is both a performance and a buffer
2118 ;; management optimization. 2118 ;; management optimization.
2119 (with-current-buffer tmp-buffer 2119 (with-current-buffer tmp-buffer
2120 ;; This let is fairly dangerouns, but improves performance 2120 ;; This let is fairly dangerous, but improves performance
2121 ;; for large lists, see https://debbugs.gnu.org/53749#227 2121 ;; for large lists, see https://debbugs.gnu.org/53749#227
2122 (let ((inhibit-modification-hooks t)) 2122 (let ((inhibit-modification-hooks t))
2123 (erase-buffer) 2123 (erase-buffer)
diff --git a/lisp/term/android-win.el b/lisp/term/android-win.el
index 3538f41aa84..bab6b6b9ff0 100644
--- a/lisp/term/android-win.el
+++ b/lisp/term/android-win.el
@@ -305,7 +305,7 @@ names which represent them."
305 (new-uri-list nil) 305 (new-uri-list nil)
306 (dnd-unescape-file-uris t)) 306 (dnd-unescape-file-uris t))
307 (dolist (uri uri-list) 307 (dolist (uri uri-list)
308 ;; If the URI is a preprepared file name, insert it directly. 308 ;; If the URI is a prepared file name, insert it directly.
309 (if (string-match-p "^/content/by-authority\\(-named\\)?/" uri) 309 (if (string-match-p "^/content/by-authority\\(-named\\)?/" uri)
310 (setq uri (concat "file:" uri) 310 (setq uri (concat "file:" uri)
311 dnd-unescape-file-uris nil) 311 dnd-unescape-file-uris nil)
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index fe9f5003f0b..a593b6c6241 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -792,7 +792,7 @@ Signal an error if the entire string was not used."
792 792
793(defvar thing-at-point-hexadecimal-regexp 793(defvar thing-at-point-hexadecimal-regexp
794 "\\(0x\\|#x\\)\\([a-fA-F0-9]+\\)" 794 "\\(0x\\|#x\\)\\([a-fA-F0-9]+\\)"
795 "A regexp matchin a hexadecimal number.") 795 "A regexp matching a hexadecimal number.")
796 796
797;;;###autoload 797;;;###autoload
798(defun number-at-point () 798(defun number-at-point ()
diff --git a/lisp/transient.el b/lisp/transient.el
index c3b9448e2c4..c9b6e457d00 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -3645,7 +3645,7 @@ have a history of their own.")
3645 (propertize "\n" 'face face 'line-height t)))) 3645 (propertize "\n" 'face face 'line-height t))))
3646 3646
3647(defmacro transient-with-shadowed-buffer (&rest body) 3647(defmacro transient-with-shadowed-buffer (&rest body)
3648 "While in the transient buffer, temporarly make the shadowed buffer current." 3648 "While in the transient buffer, temporarily make the shadowed buffer current."
3649 (declare (indent 0) (debug t)) 3649 (declare (indent 0) (debug t))
3650 `(with-current-buffer (or transient--shadowed-buffer (current-buffer)) 3650 `(with-current-buffer (or transient--shadowed-buffer (current-buffer))
3651 ,@body)) 3651 ,@body))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index aa3beb86174..bcabf98f1d1 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -830,7 +830,7 @@ t, nil, append, prepend, keep. See more in
830`treesit-font-lock-rules'.") 830`treesit-font-lock-rules'.")
831 831
832(defsubst treesit--font-lock-setting-feature (setting) 832(defsubst treesit--font-lock-setting-feature (setting)
833 "Reutrn the feature of SETTING. 833 "Return the feature of SETTING.
834SETTING should be a setting in `treesit-font-lock-settings'." 834SETTING should be a setting in `treesit-font-lock-settings'."
835 (nth 2 setting)) 835 (nth 2 setting))
836 836
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 4d2609cbb95..f41c5b07ffa 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -377,7 +377,7 @@ These characters are specified in RFC 3986, Appendix A.")
377 (aset vec ?& nil) 377 (aset vec ?& nil)
378 (aset vec ?\; nil) 378 (aset vec ?\; nil)
379 vec) 379 vec)
380 "Allowed-charcter byte mask for keys and values in the query segment of a URI. 380 "Allowed-character byte mask for keys and values in the query segment of a URI.
381url-query-allowed-chars minus '=', '&', and ';'.") 381url-query-allowed-chars minus '=', '&', and ';'.")
382 382
383;;;###autoload 383;;;###autoload
diff --git a/lisp/window-tool-bar.el b/lisp/window-tool-bar.el
index 395aa3aa9cc..a9d10650b98 100644
--- a/lisp/window-tool-bar.el
+++ b/lisp/window-tool-bar.el
@@ -66,7 +66,7 @@
66;; like to also generally make tool bars better. 66;; like to also generally make tool bars better.
67;; 67;;
68;; Targeting 0.3: 68;; Targeting 0.3:
69;; * Properly support reamining less frequently used tool bar item specs. From 69;; * Properly support remaining less frequently used tool bar item specs. From
70;; `parse_tool_bar_item': 70;; `parse_tool_bar_item':
71;; * :visible 71;; * :visible
72;; * :filter 72;; * :filter
@@ -102,7 +102,7 @@
102;; lot of garbage. So this benchmarking focuses on garbage 102;; lot of garbage. So this benchmarking focuses on garbage
103;; generation. Since it has to run after most commands, generating 103;; generation. Since it has to run after most commands, generating
104;; significantly more garbage will cause noticeable performance 104;; significantly more garbage will cause noticeable performance
105;; degration. 105;; degradation.
106;; 106;;
107;; The refresh has two steps: 107;; The refresh has two steps:
108;; 108;;
@@ -111,7 +111,7 @@
111;; bar string. 111;; bar string.
112;; 112;;
113;; Additionally, we keep track of the percentage of commands that 113;; Additionally, we keep track of the percentage of commands that
114;; acutally created a refresh. 114;; actually created a refresh.
115(defvar window-tool-bar--memory-use-delta-step1 (make-list 7 0) 115(defvar window-tool-bar--memory-use-delta-step1 (make-list 7 0)
116 "Absolute delta of memory use counters during step 1. 116 "Absolute delta of memory use counters during step 1.
117This is a list in the same structure as `memory-use-counts'.") 117This is a list in the same structure as `memory-use-counts'.")
diff --git a/src/androidselect.c b/src/androidselect.c
index 50982738743..d5783b75417 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -945,7 +945,7 @@ keywords is understood:
945 No more than three actions defined here will be 945 No more than three actions defined here will be
946 displayed, not counting any with "default" as its 946 displayed, not counting any with "default" as its
947 key. 947 key.
948 :timeout Number of miliseconds from the display of the 948 :timeout Number of milliseconds from the display of the
949 notification at which it will be automatically 949 notification at which it will be automatically
950 dismissed, or a value of zero or smaller if it 950 dismissed, or a value of zero or smaller if it
951 is to remain until user action is taken to dismiss 951 is to remain until user action is taken to dismiss
diff --git a/src/fns.c b/src/fns.c
index 48607b2c5d0..371d2ae3a3a 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5359,7 +5359,7 @@ hash_string (char const *ptr, ptrdiff_t len)
5359 hash = sxhash_combine (hash, c); 5359 hash = sxhash_combine (hash, c);
5360 } 5360 }
5361 while (p + sizeof hash <= end); 5361 while (p + sizeof hash <= end);
5362 /* Hash the last wordful of bytes in the string, because that is 5362 /* Hash the last word's worth of bytes in the string, because that is
5363 is often the part where strings differ. This may cause some 5363 is often the part where strings differ. This may cause some
5364 bytes to be hashed twice but we assume that's not a big problem. */ 5364 bytes to be hashed twice but we assume that's not a big problem. */
5365 EMACS_UINT c; 5365 EMACS_UINT c;
diff --git a/src/itree.c b/src/itree.c
index da51b3c61fd..9dae279db90 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -1211,7 +1211,7 @@ itree_node_intersects (const struct itree_node *node,
1211 `ITER->begin..ITER->end`) so it will also return some nodes which aren't in 1211 `ITER->begin..ITER->end`) so it will also return some nodes which aren't in
1212 that narrowing simply because they may have children which are. 1212 that narrowing simply because they may have children which are.
1213 1213
1214 The code itself is very unsatifactory because the code of each one 1214 The code itself is very unsatisfactory because the code of each one
1215 of the supported traversals seems completely different from the others. 1215 of the supported traversals seems completely different from the others.
1216 If someone knows how to make it more uniform and "obviously correct", 1216 If someone knows how to make it more uniform and "obviously correct",
1217 please make yourself heard. */ 1217 please make yourself heard. */
diff --git a/src/json.c b/src/json.c
index 140c3625d4d..21066d21328 100644
--- a/src/json.c
+++ b/src/json.c
@@ -405,7 +405,7 @@ json_out_nest (json_out_t *jo)
405{ 405{
406 --jo->maxdepth; 406 --jo->maxdepth;
407 if (jo->maxdepth < 0) 407 if (jo->maxdepth < 0)
408 error ("Maximum JSON serialisation depth exceeded"); 408 error ("Maximum JSON serialization depth exceeded");
409} 409}
410 410
411static void 411static void
diff --git a/src/macros.c b/src/macros.c
index 230195d9488..a4df125aafd 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -343,14 +343,14 @@ buffer before the macro is executed. */)
343 restore Vexecuting_kbd_macro and executing_kbd_macro_index, and 343 restore Vexecuting_kbd_macro and executing_kbd_macro_index, and
344 run 'kbd-macro-termination-hook'. 344 run 'kbd-macro-termination-hook'.
345 345
346 If read_char happens to be called at the end of a macro interation, 346 If read_char happens to be called at the end of a macro iteration,
347 but before read_key_sequence could handle the end (e.g., when lisp 347 but before read_key_sequence could handle the end (e.g., when lisp
348 code calls 'read-event', 'read-char', or 'read-char-exclusive'), 348 code calls 'read-event', 'read-char', or 'read-char-exclusive'),
349 read_char will simply continue reading other available input 349 read_char will simply continue reading other available input
350 (Bug#68272). Vexecuting_kbd_macro and executing_kbd_macro remain 350 (Bug#68272). Vexecuting_kbd_macro and executing_kbd_macro remain
351 untouched until the end of the iteration is handled. 351 untouched until the end of the iteration is handled.
352 352
353 This is similar (in observable behavior) to a posibly simpler 353 This is similar (in observable behavior) to a possibly simpler
354 implementation of keyboard macros in which this function pushed all 354 implementation of keyboard macros in which this function pushed all
355 characters of the macro into the incoming event queue and returned 355 characters of the macro into the incoming event queue and returned
356 immediately. Maybe this is the implementation that we ideally 356 immediately. Maybe this is the implementation that we ideally
diff --git a/src/sort.c b/src/sort.c
index dc9f49016aa..24c3e94f50c 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -1130,7 +1130,7 @@ tim_sort (Lisp_Object predicate, Lisp_Object keyfunc,
1130 keys[i] = call1 (keyfunc, seq[i]); 1130 keys[i] = call1 (keyfunc, seq[i]);
1131 1131
1132 /* FIXME: This is where we would check the keys for interesting 1132 /* FIXME: This is where we would check the keys for interesting
1133 properties for more optimised comparison (such as all being fixnums 1133 properties for more optimized comparison (such as all being fixnums
1134 etc). */ 1134 etc). */
1135 1135
1136 /* March over the array once, left to right, finding natural runs, 1136 /* March over the array once, left to right, finding natural runs,
diff --git a/src/xdisp.c b/src/xdisp.c
index 3d8651f4086..4df76baf92b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19173,7 +19173,7 @@ try_scrolling (Lisp_Object window, bool just_this_one_p,
19173 /* Maybe forget recorded base line for line number display. */ 19173 /* Maybe forget recorded base line for line number display. */
19174 /* FIXME: Why do we need this? `try_scrolling` can only be called from 19174 /* FIXME: Why do we need this? `try_scrolling` can only be called from
19175 `redisplay_window` which should have flushed this cache already when 19175 `redisplay_window` which should have flushed this cache already when
19176 eeded. */ 19176 needed. */
19177 if (!BASE_LINE_NUMBER_VALID_P (w)) 19177 if (!BASE_LINE_NUMBER_VALID_P (w))
19178 w->base_line_number = 0; 19178 w->base_line_number = 0;
19179 19179
@@ -35810,7 +35810,7 @@ note_fringe_highlight (struct frame *f, Lisp_Object window, int x, int y,
35810 35810
35811 /* NOTE: iterating over glyphs can only find text properties coming 35811 /* NOTE: iterating over glyphs can only find text properties coming
35812 from visible text. This means that zero-length overlays and 35812 from visible text. This means that zero-length overlays and
35813 invisibile text are NOT inspected. */ 35813 invisible text are NOT inspected. */
35814 for (; glyph_num; glyph_num--, glyph++) 35814 for (; glyph_num; glyph_num--, glyph++)
35815 { 35815 {
35816 Lisp_Object pos = make_fixnum (glyph->charpos); 35816 Lisp_Object pos = make_fixnum (glyph->charpos);
diff --git a/test/lisp/erc/erc-goodies-tests.el b/test/lisp/erc/erc-goodies-tests.el
index ead0bf5a979..038434b3880 100644
--- a/test/lisp/erc/erc-goodies-tests.el
+++ b/test/lisp/erc/erc-goodies-tests.el
@@ -157,7 +157,7 @@
157 (search-forward "BlackOn") 157 (search-forward "BlackOn")
158 (should (eq (get-text-property (point) 'mouse-face) 158 (should (eq (get-text-property (point) 'mouse-face)
159 'erc-spoiler-face))) 159 'erc-spoiler-face)))
160 ;; Start wtih ERC default face. 160 ;; Start with ERC default face.
161 (erc-goodies-tests--assert-face 161 (erc-goodies-tests--assert-face
162 0 "BEGIN " 'erc-default-face 162 0 "BEGIN " 'erc-default-face
163 '(fg:erc-color-face0 bg:erc-color-face0)) 163 '(fg:erc-color-face0 bg:erc-color-face0))
@@ -168,7 +168,7 @@
168 ;; Masked in all black. 168 ;; Masked in all black.
169 (erc-goodies-tests--assert-face 169 (erc-goodies-tests--assert-face
170 20 "BlackOnBlack" '(fg:erc-color-face1 bg:erc-color-face1) nil) 170 20 "BlackOnBlack" '(fg:erc-color-face1 bg:erc-color-face1) nil)
171 ;; Explicit "default" code ignoerd. 171 ;; Explicit "default" code ignored.
172 (erc-goodies-tests--assert-face 172 (erc-goodies-tests--assert-face
173 34 "Default" '(erc-default-face) 173 34 "Default" '(erc-default-face)
174 '(fg:erc-color-face1 bg:erc-color-face1)) 174 '(fg:erc-color-face1 bg:erc-color-face1))
diff --git a/test/lisp/progmodes/peg-tests.el b/test/lisp/progmodes/peg-tests.el
index e666e6f19d2..8fab549bcab 100644
--- a/test/lisp/progmodes/peg-tests.el
+++ b/test/lisp/progmodes/peg-tests.el
@@ -199,7 +199,7 @@ resp. succeeded instead of signaling an error."
199 199
200;; peg-ex-parse-int recognizes integers and computes the corresponding 200;; peg-ex-parse-int recognizes integers and computes the corresponding
201;; value. The grammar is the same as for `peg-ex-recognize-int' 201;; value. The grammar is the same as for `peg-ex-recognize-int'
202;; augmented with parsing actions. Unfortunaletly, the actions add 202;; augmented with parsing actions. Unfortunately, the actions add
203;; quite a bit of clutter. 203;; quite a bit of clutter.
204;; 204;;
205;; The actions for the sign rule push -1 on the stack for a minus sign 205;; The actions for the sign rule push -1 on the stack for a minus sign