aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2019-12-10 20:04:36 -0800
committerPaul Eggert2019-12-10 20:05:49 -0800
commitb0f20651e3cbb8a66f11ffae4c18634019c20cd4 (patch)
tree067bcb8fa529b4afee6d189f409faf16bd437810
parent0940296ebe56ebdf9c32e94191d4f0b18006a910 (diff)
downloademacs-b0f20651e3cbb8a66f11ffae4c18634019c20cd4.tar.gz
emacs-b0f20651e3cbb8a66f11ffae4c18634019c20cd4.zip
; Spelling fixes
-rw-r--r--ChangeLog.22
-rw-r--r--ChangeLog.36
-rwxr-xr-xadmin/nt/dist-build/build-dep-zips.py2
-rw-r--r--doc/lispref/display.texi8
-rw-r--r--doc/lispref/searching.texi4
-rw-r--r--doc/lispref/windows.texi2
-rw-r--r--doc/misc/dired-x.texi2
-rw-r--r--doc/misc/org.texi4
-rw-r--r--etc/NEWS4
-rw-r--r--etc/ORG-NEWS2
-rw-r--r--lisp/ChangeLog.76
-rw-r--r--lisp/auth-source-pass.el2
-rw-r--r--lisp/button.el2
-rw-r--r--lisp/cedet/ChangeLog.12
-rw-r--r--lisp/gnus/gnus-cus.el2
-rw-r--r--lisp/gnus/nnimap.el2
-rw-r--r--lisp/icomplete.el2
-rw-r--r--lisp/net/newst-backend.el2
-rw-r--r--lisp/org/org-attach.el4
-rw-r--r--lisp/org/org.el4
-rw-r--r--lisp/progmodes/cc-langs.el2
-rw-r--r--lisp/progmodes/flymake.el2
-rw-r--r--lisp/progmodes/hideshow.el8
-rw-r--r--lisp/progmodes/python.el4
-rw-r--r--lisp/so-long.el24
-rw-r--r--lisp/subr.el2
-rw-r--r--lisp/thingatpt.el2
-rw-r--r--src/hbfont.c6
-rw-r--r--src/window.c2
-rw-r--r--src/xdisp.c4
-rw-r--r--test/lisp/abbrev-tests.el2
-rw-r--r--test/lisp/cedet/semantic-utest-ia.el2
-rw-r--r--test/lisp/cedet/srecode-utest-getset.el1
-rw-r--r--test/lisp/emacs-lisp/cl-macs-tests.el4
-rw-r--r--test/lisp/emacs-lisp/regexp-opt-tests.el2
-rw-r--r--test/lisp/vc/log-edit-tests.el21
-rw-r--r--test/manual/cedet/tests/test-fmt.cpp10
-rw-r--r--test/manual/cedet/tests/test.srt2
-rw-r--r--test/manual/etags/cp-src/functions.cpp6
-rw-r--r--test/src/buffer-tests.el6
-rw-r--r--test/src/fns-tests.el8
41 files changed, 91 insertions, 93 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index 453889de295..c713d8a5a81 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -15300,7 +15300,7 @@
15300 15300
15301 * lisp/progmodes/cc-langs.el (c++-template-syntax-table) 15301 * lisp/progmodes/cc-langs.el (c++-template-syntax-table)
15302 (c-no-parens-syntax-table): Add extra "(eval ..)"s around "'(lambda ..)" 15302 (c-no-parens-syntax-table): Add extra "(eval ..)"s around "'(lambda ..)"
15303 forms to remove the superflous quotes. 15303 forms to remove the superfluous quotes.
15304 15304
153052015-11-24 Eli Zaretskii <eliz@gnu.org> 153052015-11-24 Eli Zaretskii <eliz@gnu.org>
15306 15306
diff --git a/ChangeLog.3 b/ChangeLog.3
index 43c7e23f485..27df42cec4d 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -16432,7 +16432,7 @@
16432 Loading flymake-elisp.el doesn't setup flymake-mode to turn on 16432 Loading flymake-elisp.el doesn't setup flymake-mode to turn on
16433 automatically, but it affects emacs-lisp-mode-hook so that 16433 automatically, but it affects emacs-lisp-mode-hook so that
16434 flymake-diagnostic-functions is setup with a suitable buffer-local 16434 flymake-diagnostic-functions is setup with a suitable buffer-local
16435 value. The variable flymake-diagnostic-funtions in every live 16435 value. The variable flymake-diagnostic-functions in every live
16436 emacs-lisp-mode buffer is also adjusted. 16436 emacs-lisp-mode buffer is also adjusted.
16437 16437
16438 * lisp/progmodes/flymake.el (top): Require flymake-elisp. 16438 * lisp/progmodes/flymake.el (top): Require flymake-elisp.
@@ -66449,8 +66449,8 @@
66449 (verilog-modi-cache-results, verilog-save-buffer-state) 66449 (verilog-modi-cache-results, verilog-save-buffer-state)
66450 (verilog-save-font-no-change-functions): When internally suppressing change 66450 (verilog-save-font-no-change-functions): When internally suppressing change
66451 functions, use `inhibit-modification-hooks' and call 66451 functions, use `inhibit-modification-hooks' and call
66452 `after-change-funtions' to more nicely work with user hooks. Reported by 66452 `after-change-functions' to more nicely work with user hooks.
66453 Stefan Monnier. 66453 Reported by Stefan Monnier.
66454 66454
66455 (verilog-auto, verilog-delete-auto, verilog-delete-auto-buffer): 66455 (verilog-auto, verilog-delete-auto, verilog-delete-auto-buffer):
66456 Create `verilog-delete-auto-buffer' to avoid double-calling 66456 Create `verilog-delete-auto-buffer' to avoid double-calling
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 5698f5179c8..b538d851513 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -78,7 +78,7 @@ def immediate_deps(pkg):
78 ## Split into dependencies 78 ## Split into dependencies
79 dependencies = dependencies.strip().split(" ") 79 dependencies = dependencies.strip().split(" ")
80 80
81 ## Remove > signs TODO can we get any other punctation here? 81 ## Remove > signs TODO can we get any other punctuation here?
82 dependencies = [d.split(">")[0] for d in dependencies if d] 82 dependencies = [d.split(">")[0] for d in dependencies if d]
83 dependencies = [d for d in dependencies if not d == "None"] 83 dependencies = [d for d in dependencies if not d == "None"]
84 84
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7f77d11d928..06032729a50 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5917,7 +5917,7 @@ Draw vertical lines.
5917@deffn Command curveto coordinate-sets 5917@deffn Command curveto coordinate-sets
5918Using the first element in @var{coordinate-sets}, draw a cubic Bézier 5918Using the first element in @var{coordinate-sets}, draw a cubic Bézier
5919curve from the current point. If there are multiple coordinate sets, 5919curve from the current point. If there are multiple coordinate sets,
5920draw a polybézier. Each coordinate set is a list of the form 5920draw a polybezier. Each coordinate set is a list of the form
5921@code{(@var{x1} @var{y1} @var{x2} @var{y2} @var{x} @var{y})}, where 5921@code{(@var{x1} @var{y1} @var{x2} @var{y2} @var{x} @var{y})}, where
5922@w{(@var{x}, @var{y})} is the curve’s end point. @w{(@var{x1}, 5922@w{(@var{x}, @var{y})} is the curve’s end point. @w{(@var{x1},
5923@var{y1})} and @w{(@var{x2}, @var{y2})} are control points at the 5923@var{y1})} and @w{(@var{x2}, @var{y2})} are control points at the
@@ -5934,7 +5934,7 @@ beginning and at the end, respectively.
5934@deffn Command smooth-curveto coordinate-sets 5934@deffn Command smooth-curveto coordinate-sets
5935Using the first element in @var{coordinate-sets}, draw a cubic Bézier 5935Using the first element in @var{coordinate-sets}, draw a cubic Bézier
5936curve from the current point. If there are multiple coordinate sets, 5936curve from the current point. If there are multiple coordinate sets,
5937draw a polybézier. Each coordinate set is a list of the form 5937draw a polybezier. Each coordinate set is a list of the form
5938@code{(@var{x2} @var{y2} @var{x} @var{y})}, where @w{(@var{x}, 5938@code{(@var{x2} @var{y2} @var{x} @var{y})}, where @w{(@var{x},
5939@var{y})} is the curve’s end point and @w{(@var{x2}, @var{y2})} is the 5939@var{y})} is the curve’s end point and @w{(@var{x2}, @var{y2})} is the
5940corresponding control point. The first control point is the 5940corresponding control point. The first control point is the
@@ -5954,7 +5954,7 @@ coincides with the current point.
5954@deffn Command quadratic-bezier-curveto coordinate-sets 5954@deffn Command quadratic-bezier-curveto coordinate-sets
5955Using the first element in @var{coordinate-sets}, draw a quadratic 5955Using the first element in @var{coordinate-sets}, draw a quadratic
5956Bézier curve from the current point. If there are multiple coordinate 5956Bézier curve from the current point. If there are multiple coordinate
5957sets, draw a polybézier. Each coordinate set is a list of the form 5957sets, draw a polybezier. Each coordinate set is a list of the form
5958@code{(@var{x1} @var{y1} @var{x} @var{y})}, where @w{(@var{x}, 5958@code{(@var{x1} @var{y1} @var{x} @var{y})}, where @w{(@var{x},
5959@var{y})} is the curve’s end point and @w{(@var{x1}, @var{y1})} is the 5959@var{y})} is the curve’s end point and @w{(@var{x1}, @var{y1})} is the
5960control point. 5960control point.
@@ -5972,7 +5972,7 @@ control point.
5972@deffn Command smooth-quadratic-bezier-curveto coordinate-sets 5972@deffn Command smooth-quadratic-bezier-curveto coordinate-sets
5973Using the first element in @var{coordinate-sets}, draw a quadratic 5973Using the first element in @var{coordinate-sets}, draw a quadratic
5974Bézier curve from the current point. If there are multiple coordinate 5974Bézier curve from the current point. If there are multiple coordinate
5975sets, draw a polybézier. Each coordinate set is a list of the form 5975sets, draw a polybezier. Each coordinate set is a list of the form
5976@code{(@var{x} @var{y})}, where @w{(@var{x}, @var{y})} is the curve’s 5976@code{(@var{x} @var{y})}, where @w{(@var{x}, @var{y})} is the curve’s
5977end point. The control point is the reflection of the control point 5977end point. The control point is the reflection of the control point
5978of the previous command relative to the current point, if that command 5978of the previous command relative to the current point, if that command
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 5bf3c5b067f..bf18f80f63f 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1551,7 +1551,7 @@ notation, @pxref{Extending Rx}.
1551@subsubsection Defining new @code{rx} forms 1551@subsubsection Defining new @code{rx} forms
1552 1552
1553The @code{rx} notation can be extended by defining new symbols and 1553The @code{rx} notation can be extended by defining new symbols and
1554parametrised forms in terms of other @code{rx} expressions. This is 1554parameterized forms in terms of other @code{rx} expressions. This is
1555handy for sharing parts between several regexps, and for making 1555handy for sharing parts between several regexps, and for making
1556complex ones easier to build and understand by putting them together 1556complex ones easier to build and understand by putting them together
1557from smaller pieces. 1557from smaller pieces.
@@ -1608,7 +1608,7 @@ defined as a plain symbol to be replaced with @var{rx-form}. Example:
1608@end example 1608@end example
1609 1609
1610If @var{arglist} is present, it must be a list of zero or more 1610If @var{arglist} is present, it must be a list of zero or more
1611argument names, and @var{name} is then defined as a parametrised form. 1611argument names, and @var{name} is then defined as a parameterized form.
1612When used in an @code{rx} expression as @code{(@var{name} @var{arg}@dots{})}, 1612When used in an @code{rx} expression as @code{(@var{name} @var{arg}@dots{})},
1613each @var{arg} will replace the corresponding argument name inside 1613each @var{arg} will replace the corresponding argument name inside
1614@var{rx-form}. 1614@var{rx-form}.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index fdba259bf71..9ddd69ab7e7 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2874,7 +2874,7 @@ Ordering}).
2874A major client of this is @code{display-buffer-reuse-window}, but all 2874A major client of this is @code{display-buffer-reuse-window}, but all
2875other action functions that try to reuse a window are affected as 2875other action functions that try to reuse a window are affected as
2876well. @code{display-buffer-in-previous-window} consults it when 2876well. @code{display-buffer-in-previous-window} consults it when
2877searching for a window that previosuly displayed the buffer on another 2877searching for a window that previously displayed the buffer on another
2878frame. 2878frame.
2879 2879
2880@vindex inhibit-switch-frame@r{, a buffer display action alist entry} 2880@vindex inhibit-switch-frame@r{, a buffer display action alist entry}
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index f6f1a3ce485..2973dcc5b25 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -376,7 +376,7 @@ case-insensitive.
376@defvar dired-omit-localp 376@defvar dired-omit-localp
377This variable determines the @var{localp} argument 377This variable determines the @var{localp} argument
378@code{dired-omit-expunge} passes to @code{dired-get-filename}. If it 378@code{dired-omit-expunge} passes to @code{dired-get-filename}. If it
379is @code{no-dir}, teh default, omitting is much faster, but you can 379is @code{no-dir}, the default, omitting is much faster, but you can
380only match against the non-directory part of the file name. Set it to 380only match against the non-directory part of the file name. Set it to
381@code{nil} if you need to match the whole file name or @code{t} to 381@code{nil} if you need to match the whole file name or @code{t} to
382match the file name relative to the buffer's top-level directory. 382match the file name relative to the buffer's top-level directory.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 7866fcfd5f6..4d4ca40061d 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -8641,7 +8641,7 @@ image @samp{1.jpg}, since the link is inside a sub-heading to @samp{Chapter
8641 8641
8642Inheritance works the same way for both @samp{ID} and @samp{DIR} property. If 8642Inheritance works the same way for both @samp{ID} and @samp{DIR} property. If
8643both properties are defined on the same headline then @samp{DIR} takes 8643both properties are defined on the same headline then @samp{DIR} takes
8644precedance. This is also true if inheritance is enabled. If @samp{DIR} 8644precedence. This is also true if inheritance is enabled. If @samp{DIR}
8645is inherited from a parent node in the outline, that property still 8645is inherited from a parent node in the outline, that property still
8646takes precedence over an @samp{ID} property defined on the node itself. 8646takes precedence over an @samp{ID} property defined on the node itself.
8647 8647
@@ -21389,7 +21389,7 @@ Before updating a dynamic block, Org removes content between the
21389previous content of the dynamic block becomes erased from the buffer 21389previous content of the dynamic block becomes erased from the buffer
21390and appended to the plist under @code{:content}. 21390and appended to the plist under @code{:content}.
21391 21391
21392The syntax for naming a writer function with a dynamic block labelled 21392The syntax for naming a writer function with a dynamic block labeled
21393@samp{myblock} is: @code{org-dblock-write:myblock}. 21393@samp{myblock} is: @code{org-dblock-write:myblock}.
21394 21394
21395The following is an example of a dynamic block and a block writer function 21395The following is an example of a dynamic block and a block writer function
diff --git a/etc/NEWS b/etc/NEWS
index 69b51b7f44e..7602a2e56a1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -722,7 +722,7 @@ You can use this new user option to control indentation of arguments of
722 722
723** byte compiler 723** byte compiler
724*** 'byte-compile-dynamic' is now obsolete. 724*** 'byte-compile-dynamic' is now obsolete.
725This is because on the one hand it suffers from various misbehaviors in corner 725This is because on the one hand it suffers from misbehavior in corner
726cases that have plagued it for years, and on the other experiments indicated 726cases that have plagued it for years, and on the other experiments indicated
727that it doesn't bring any measurable benefit. 727that it doesn't bring any measurable benefit.
728 728
@@ -1237,7 +1237,7 @@ early init file.
1237A new function has been added which allows users to filter the 1237A new function has been added which allows users to filter the
1238packages list by name: 'package-menu-filter-by-name'. By default, it 1238packages list by name: 'package-menu-filter-by-name'. By default, it
1239is bound to '/ n'. Additionally, the function 1239is bound to '/ n'. Additionally, the function
1240'package-menu-fiter-by-keyword' has been renamed from 1240'package-menu-filter-by-keyword' has been renamed from
1241'package-menu-filter'. Its keybinding has also been changed to '/ k' 1241'package-menu-filter'. Its keybinding has also been changed to '/ k'
1242(from 'f'). To clear any of the two filters, the user can now call 1242(from 'f'). To clear any of the two filters, the user can now call
1243the 'package-menu-clear-filter' function, bound to '/ /' by default. 1243the 'package-menu-clear-filter' function, bound to '/ /' by default.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 4ce8e9b1c2c..6f7227b41cd 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -311,7 +311,7 @@ matches the same structures than 'latex but it calls
311org-src-font-lock-fontify-block instead, thus bringing about full 311org-src-font-lock-fontify-block instead, thus bringing about full
312LaTeX font locking. 312LaTeX font locking.
313 313
314*** ~org-clone-subtree-with-time-shift~ learnt to shift backward in time 314*** ~org-clone-subtree-with-time-shift~ learned to shift backward in time
315 315
316=<C-c C-x c>= (~org-clone-subtree-with-time-shift~) now takes a 316=<C-c C-x c>= (~org-clone-subtree-with-time-shift~) now takes a
317negative value as a valid repeater to shift time stamps in backward 317negative value as a valid repeater to shift time stamps in backward
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 2fe98e8f00d..2c2aabd94b5 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -17104,8 +17104,8 @@
17104 the rewrite of `hs-inside-comment-p'. 17104 the rewrite of `hs-inside-comment-p'.
17105 (hs-inside-comment-p): Rewritten from scratch. Semantics changed 17105 (hs-inside-comment-p): Rewritten from scratch. Semantics changed
17106 when returning non-nil. We can be inside a comment, but that 17106 when returning non-nil. We can be inside a comment, but that
17107 comment might not be hidable (the car of the return value should 17107 comment might not be hideable (the car of the return value should
17108 be non-nil to be hidable). 17108 be non-nil to be hideable).
17109 (hs-grok-mode-type): Rewrite to be more understandable. 17109 (hs-grok-mode-type): Rewrite to be more understandable.
17110 `hs-c-end-regexp' does not exist any more. 17110 `hs-c-end-regexp' does not exist any more.
17111 Initialize `hs-c-start-regexp' from the alist if specified there. 17111 Initialize `hs-c-start-regexp' from the alist if specified there.
@@ -17117,7 +17117,7 @@
17117 block, go to their end and look there for the overlays. 17117 block, go to their end and look there for the overlays.
17118 (java-hs-adjust-block-beginning): New function. 17118 (java-hs-adjust-block-beginning): New function.
17119 (hs-hide-all): Hide a comment block only if `hs-inside-comment-p' 17119 (hs-hide-all): Hide a comment block only if `hs-inside-comment-p'
17120 says is hidable. 17120 says is hideable.
17121 (hs-hide-block): Simplify. Handle properly the result of 17121 (hs-hide-block): Simplify. Handle properly the result of
17122 `hs-inside-comment-p'. 17122 `hs-inside-comment-p'.
17123 (hs-show-block): Likewise. 17123 (hs-show-block): Likewise.
diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index 45d5a6ce81b..7201a2d1a2c 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -292,7 +292,7 @@ components, from longest to shortest."
292(defun auth-source-pass--name-port-user-suffixes (name user port) 292(defun auth-source-pass--name-port-user-suffixes (name user port)
293 "Return a list of possible path suffixes for NAME, USER, & PORT. 293 "Return a list of possible path suffixes for NAME, USER, & PORT.
294 294
295The resulting list is ordered from most specifc to least 295The resulting list is ordered from most specific to least
296specific, with paths matching all of NAME, USER, & PORT first, 296specific, with paths matching all of NAME, USER, & PORT first,
297then NAME & USER, then NAME & PORT, then just NAME." 297then NAME & USER, then NAME & PORT, then just NAME."
298 (seq-mapcat 298 (seq-mapcat
diff --git a/lisp/button.el b/lisp/button.el
index ac6af0be4f8..d5aaf1b42ee 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -243,7 +243,7 @@ overlay, a buffer position, or (for buttons in the mode-line or
243header-line) a string. 243header-line) a string.
244 244
245If BUTTON has a `button-data' value, call the function with this 245If BUTTON has a `button-data' value, call the function with this
246value instad of BUTTON. 246value instead of BUTTON.
247 247
248This function only works when BUTTON is in the current buffer." 248This function only works when BUTTON is in the current buffer."
249 (let ((action (or (and use-mouse-action (button-get button 'mouse-action)) 249 (let ((action (or (and use-mouse-action (button-get button 'mouse-action))
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index 1d34219daa0..cf8d6c4f6c6 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -453,7 +453,7 @@
453 453
454 * semantic/ctxt.el (semantic-get-local-variables-default): 454 * semantic/ctxt.el (semantic-get-local-variables-default):
455 Also try to parse local variables for buffers which are currently 455 Also try to parse local variables for buffers which are currently
456 marked as unparseable. Otherwise, it is often impossible to 456 marked as unparsable. Otherwise, it is often impossible to
457 complete local variables. 457 complete local variables.
458 458
459 * semantic/scope.el (semantic-analyze-scoped-types-default): If we 459 * semantic/scope.el (semantic-analyze-scoped-types-default): If we
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index 5291d1d64d1..57e7f7c8c35 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -257,7 +257,7 @@ Server-assigned value attached to IMAP groups, used to maintain consistency.")
257 (modseq (choice :tag "modseq" 257 (modseq (choice :tag "modseq"
258 (const :tag "None" nil) 258 (const :tag "None" nil)
259 (string :tag "Sequence number")) 259 (string :tag "Sequence number"))
260 "Modification seqence number") 260 "Modification sequence number")
261 (active (cons :tag "active" (integer :tag "min") (integer :tag "max")) 261 (active (cons :tag "active" (integer :tag "min") (integer :tag "max"))
262 "active") 262 "active")
263 (permanent-flags (repeat :tag "Permanent Flags" (symbol :tag "Flag")) 263 (permanent-flags (repeat :tag "Permanent Flags" (symbol :tag "Flag"))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index bbbca8f4193..f02c2e5c1f1 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -233,7 +233,7 @@ textual parts.")
233 'headers)) 233 'headers))
234 234
235(defun nnimap-transform-headers () 235(defun nnimap-transform-headers ()
236 "Transform server's FETCH response into parseable headers." 236 "Transform server's FETCH response into parsable headers."
237 (goto-char (point-min)) 237 (goto-char (point-min))
238 (let (seen-articles article lines size string labels) 238 (let (seen-articles article lines size string labels)
239 (cl-block nil 239 (cl-block nil
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 16167ea21e1..cd20064be02 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -69,7 +69,7 @@ When nil, show candidates in full."
69 :version "24.4") 69 :version "24.4")
70 70
71(defvar icomplete-tidy-shadowed-file-names nil 71(defvar icomplete-tidy-shadowed-file-names nil
72 "If non-nil, automatically delete superflous parts of file names. 72 "If non-nil, automatically delete superfluous parts of file names.
73For example, if the user types ~/ after a long path name, 73For example, if the user types ~/ after a long path name,
74everything preceding the ~/ is discarded so the interactive 74everything preceding the ~/ is discarded so the interactive
75selection process starts again from the user's $HOME.") 75selection process starts again from the user's $HOME.")
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 9c24dec2a1e..792ddbbf0b7 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -1598,7 +1598,7 @@ This function calls `message' with arguments STRING and ARGS, if
1598(defun newsticker--decode-iso8601-date (string) 1598(defun newsticker--decode-iso8601-date (string)
1599 "Return ISO8601-STRING in format like `encode-time'. 1599 "Return ISO8601-STRING in format like `encode-time'.
1600Converts from ISO-8601 to Emacs representation. If no time zone 1600Converts from ISO-8601 to Emacs representation. If no time zone
1601is present, this fuction defaults to universal time." 1601is present, this function defaults to universal time."
1602 (if string 1602 (if string
1603 (condition-case nil 1603 (condition-case nil
1604 (encode-time (decoded-time-set-defaults (iso8601-parse string) 0)) 1604 (encode-time (decoded-time-set-defaults (iso8601-parse string) 0))
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index bc49be7fe74..d3e1c78b7da 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -187,7 +187,7 @@ attachment folders based on ID."
187 "Hook that is invoked by `org-attach-open'. 187 "Hook that is invoked by `org-attach-open'.
188 188
189Created mostly to be compatible with org-attach-git after removing 189Created mostly to be compatible with org-attach-git after removing
190git-funtionality from this file.") 190git-functionality from this file.")
191 191
192(defcustom org-attach-commands 192(defcustom org-attach-commands
193 '(((?a ?\C-a) org-attach-attach 193 '(((?a ?\C-a) org-attach-attach
@@ -231,7 +231,7 @@ directory in dired and delete from there.\n")
231Each entry in this list is a list of three elements: 231Each entry in this list is a list of three elements:
232- A list of keys (characters) to select the command (the fist 232- A list of keys (characters) to select the command (the fist
233 character in the list is shown in the attachment dispatcher's 233 character in the list is shown in the attachment dispatcher's
234 splash buffer and minubuffer prompt). 234 splash buffer and minibuffer prompt).
235- A command that is called interactively when one of these keys 235- A command that is called interactively when one of these keys
236 is pressed. 236 is pressed.
237- A docstring for this command in the attachment dispatcher's 237- A docstring for this command in the attachment dispatcher's
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 11bc3641022..c289d5425ec 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9854,9 +9854,9 @@ Elements of length one have a tab appended. Elements of length
9854two are kept as is. Longer elements are truncated to length two. 9854two are kept as is. Longer elements are truncated to length two.
9855 9855
9856If an element cannot be made unique, an error is raised." 9856If an element cannot be made unique, an error is raised."
9857 (let ((orderd-keys (cl-sort (copy-sequence keys) #'< :key #'length)) 9857 (let ((ordered-keys (cl-sort (copy-sequence keys) #'< :key #'length))
9858 menu-keys) 9858 menu-keys)
9859 (dolist (key orderd-keys) 9859 (dolist (key ordered-keys)
9860 (let ((potential-key 9860 (let ((potential-key
9861 (cl-case (length key) 9861 (cl-case (length key)
9862 (1 (concat key "\t")) 9862 (1 (concat key "\t"))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 44d0d49df5b..da3fc6b318e 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1416,7 +1416,7 @@ template opener followed by the \"::\" operator - usually."
1416 (c-lang-const c-<-pseudo-digraph-cont-regexp)) 1416 (c-lang-const c-<-pseudo-digraph-cont-regexp))
1417 1417
1418(c-lang-defconst c-<-pseudo-digraph-cont-len 1418(c-lang-defconst c-<-pseudo-digraph-cont-len
1419 "The maximum length of the main bit of a `c-<pseudp-digraph-cont-regexp' match. 1419 "The maximum length of the main bit of a `c-<-pseudo-digraph-cont-regexp' match.
1420This doesn't count the merely contextual bits of the regexp match." 1420This doesn't count the merely contextual bits of the regexp match."
1421 t 0 1421 t 0
1422 c++ 2) 1422 c++ 2)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index f052e002df7..d980d675d4d 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -708,7 +708,7 @@ backend is operating normally.")
708 "Tell if Flymake has running backends in this buffer." 708 "Tell if Flymake has running backends in this buffer."
709 (flymake-running-backends)) 709 (flymake-running-backends))
710 710
711;; FIXME: clone of `isearch-intesects-p'! Make this an util. 711;; FIXME: clone of `isearch-intersects-p'! Make this an util.
712(defun flymake--intersects-p (start0 end0 start1 end1) 712(defun flymake--intersects-p (start0 end0 start1 end1)
713 "Return t if regions START0..END0 and START1..END1 intersect." 713 "Return t if regions START0..END0 and START1..END1 intersect."
714 (or (and (>= start0 start1) (< start0 end1)) 714 (or (and (>= start0 start1) (< start0 end1))
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 53235ea573b..8f8b79af74b 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -610,7 +610,7 @@ as cdr."
610 (forward-comment (- (buffer-size))) 610 (forward-comment (- (buffer-size)))
611 (skip-chars-forward " \t\n\f") 611 (skip-chars-forward " \t\n\f")
612 (let ((p (point)) 612 (let ((p (point))
613 (hidable t)) 613 (hideable t))
614 (beginning-of-line) 614 (beginning-of-line)
615 (unless (looking-at (concat "[ \t]*" hs-c-start-regexp)) 615 (unless (looking-at (concat "[ \t]*" hs-c-start-regexp))
616 ;; we are in this situation: (example) 616 ;; we are in this situation: (example)
@@ -636,13 +636,13 @@ as cdr."
636 (when (or (not (looking-at hs-c-start-regexp)) 636 (when (or (not (looking-at hs-c-start-regexp))
637 (> (point) q)) 637 (> (point) q))
638 ;; we cannot hide this comment block 638 ;; we cannot hide this comment block
639 (setq hidable nil))) 639 (setq hideable nil)))
640 ;; goto the end of the comment 640 ;; goto the end of the comment
641 (forward-comment (buffer-size)) 641 (forward-comment (buffer-size))
642 (skip-chars-backward " \t\n\f") 642 (skip-chars-backward " \t\n\f")
643 (end-of-line) 643 (end-of-line)
644 (when (>= (point) q) 644 (when (>= (point) q)
645 (list (and hidable p) (point)))))))) 645 (list (and hideable p) (point))))))))
646 646
647(defun hs-grok-mode-type () 647(defun hs-grok-mode-type ()
648 "Set up hideshow variables for new buffers. 648 "Set up hideshow variables for new buffers.
@@ -741,7 +741,7 @@ and `case-fold-search' are both t."
741 (save-excursion 741 (save-excursion
742 (let ((c-reg (hs-inside-comment-p))) 742 (let ((c-reg (hs-inside-comment-p)))
743 (if (and c-reg (nth 0 c-reg)) 743 (if (and c-reg (nth 0 c-reg))
744 ;; point is inside a comment, and that comment is hidable 744 ;; point is inside a comment, and that comment is hideable
745 (goto-char (nth 0 c-reg)) 745 (goto-char (nth 0 c-reg))
746 (end-of-line) 746 (end-of-line)
747 (when (and (not c-reg) 747 (when (and (not c-reg)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0eed7acd0d7..b0d3174eabc 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3856,8 +3856,8 @@ Returns the tracked buffer."
3856 3856
3857(defun python-pdbtrack-comint-input-filter-function (input) 3857(defun python-pdbtrack-comint-input-filter-function (input)
3858 "Finish tracking session depending on command in INPUT. 3858 "Finish tracking session depending on command in INPUT.
3859Commands that must finish tracking session is listed in 3859Commands that must finish the tracking session are listed in
3860`python-pdbtrack-untracking-commands'." 3860`python-pdbtrack-exit-command'."
3861 (when (and python-pdbtrack-tracked-buffer 3861 (when (and python-pdbtrack-tracked-buffer
3862 ;; Empty input is sent by C-d or `comint-send-eof' 3862 ;; Empty input is sent by C-d or `comint-send-eof'
3863 (or (string-empty-p input) 3863 (or (string-empty-p input)
diff --git a/lisp/so-long.el b/lisp/so-long.el
index 3df2de97297..160a945f657 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -69,7 +69,7 @@
69;; the long lines. In such circumstances you may find that `longlines-mode' is 69;; the long lines. In such circumstances you may find that `longlines-mode' is
70;; the most helpful facility. 70;; the most helpful facility.
71;; 71;;
72;; Note also that the mitigations are automatically triggered when visiting a 72;; Note also that the mitigation is automatically triggered when visiting a
73;; file. The library does not automatically detect if long lines are inserted 73;; file. The library does not automatically detect if long lines are inserted
74;; into an existing buffer (although the `so-long' command can be invoked 74;; into an existing buffer (although the `so-long' command can be invoked
75;; manually in such situations). 75;; manually in such situations).
@@ -386,7 +386,7 @@
386;; - Added sgml-mode and nxml-mode to `so-long-target-modes'. 386;; - Added sgml-mode and nxml-mode to `so-long-target-modes'.
387;; 0.7.4 - Refactored the handling of `whitespace-mode'. 387;; 0.7.4 - Refactored the handling of `whitespace-mode'.
388;; 0.7.3 - Added customize group `so-long' with user options. 388;; 0.7.3 - Added customize group `so-long' with user options.
389;; - Added `so-long-original-values' to generalise the storage and 389;; - Added `so-long-original-values' to generalize the storage and
390;; restoration of values from the original mode upon `so-long-revert'. 390;; restoration of values from the original mode upon `so-long-revert'.
391;; - Added `so-long-revert-hook'. 391;; - Added `so-long-revert-hook'.
392;; 0.7.2 - Remember the original major mode even with M-x `so-long-mode'. 392;; 0.7.2 - Remember the original major mode even with M-x `so-long-mode'.
@@ -421,7 +421,7 @@
421Has no effect if `global-so-long-mode' is not enabled.") 421Has no effect if `global-so-long-mode' is not enabled.")
422 422
423(defvar-local so-long--active nil ; internal use 423(defvar-local so-long--active nil ; internal use
424 "Non-nil when `so-long' mitigations are in effect.") 424 "Non-nil when `so-long' mitigation is in effect.")
425 425
426(defvar so-long--set-auto-mode nil ; internal use 426(defvar so-long--set-auto-mode nil ; internal use
427 "Non-nil while `set-auto-mode' is executing.") 427 "Non-nil while `set-auto-mode' is executing.")
@@ -740,7 +740,7 @@ was established."
740 ) 740 )
741 ;; It's not clear to me whether all of these would be problematic, but they 741 ;; It's not clear to me whether all of these would be problematic, but they
742 ;; seemed like reasonable targets. Some are certainly excessive in smaller 742 ;; seemed like reasonable targets. Some are certainly excessive in smaller
743 ;; buffers of minified code, but we should be aiming to maximise performance 743 ;; buffers of minified code, but we should be aiming to maximize performance
744 ;; by default, so that Emacs is as responsive as we can manage in even very 744 ;; by default, so that Emacs is as responsive as we can manage in even very
745 ;; large buffers of minified code. 745 ;; large buffers of minified code.
746 "List of buffer-local minor modes to explicitly disable. 746 "List of buffer-local minor modes to explicitly disable.
@@ -781,7 +781,7 @@ If `so-long-revert' is subsequently invoked, then the variables are restored
781to their original states. 781to their original states.
782 782
783The combination of `line-move-visual' (enabled) and `truncate-lines' (disabled) 783The combination of `line-move-visual' (enabled) and `truncate-lines' (disabled)
784is important for maximising responsiveness when moving vertically within an 784is important for maximizing responsiveness when moving vertically within an
785extremely long line, as otherwise the full length of the line may need to be 785extremely long line, as otherwise the full length of the line may need to be
786scanned to find the next position." 786scanned to find the next position."
787 :type '(alist :key-type (variable :tag "Variable") 787 :type '(alist :key-type (variable :tag "Variable")
@@ -822,12 +822,12 @@ If nil, no mode line indicator will be displayed."
822 822
823(defface so-long-mode-line-active 823(defface so-long-mode-line-active
824 '((t :inherit mode-line-emphasis)) 824 '((t :inherit mode-line-emphasis))
825 "Face for `so-long-mode-line-info' when mitigations are active." 825 "Face for `so-long-mode-line-info' when mitigation is active."
826 :package-version '(so-long . "1.0")) 826 :package-version '(so-long . "1.0"))
827 827
828(defface so-long-mode-line-inactive 828(defface so-long-mode-line-inactive
829 '((t :inherit mode-line-inactive)) 829 '((t :inherit mode-line-inactive))
830 "Face for `so-long-mode-line-info' when mitigations have been reverted." 830 "Face for `so-long-mode-line-info' when mitigation has been reverted."
831 :package-version '(so-long . "1.0")) 831 :package-version '(so-long . "1.0"))
832 832
833;; Modes that go slowly and line lengths excessive 833;; Modes that go slowly and line lengths excessive
@@ -983,7 +983,7 @@ Displayed as part of `mode-line-misc-info'.
983 983
984`so-long-mode-line-label' defines the text to be displayed (if any). 984`so-long-mode-line-label' defines the text to be displayed (if any).
985 985
986Face `so-long-mode-line-active' is used while mitigations are active, and 986Face `so-long-mode-line-active' is used while mitigation is active, and
987`so-long-mode-line-inactive' is used if `so-long-revert' is called. 987`so-long-mode-line-inactive' is used if `so-long-revert' is called.
988 988
989Not displayed when `so-long-mode' is enabled, as the major mode construct 989Not displayed when `so-long-mode' is enabled, as the major mode construct
@@ -1659,7 +1659,7 @@ Equivalent to calling (global-so-long-mode 0)"
1659 1659
1660;;;###autoload 1660;;;###autoload
1661(define-minor-mode global-so-long-mode 1661(define-minor-mode global-so-long-mode
1662 "Toggle automated performance mitigations for files with long lines. 1662 "Toggle automated performance mitigation for files with long lines.
1663 1663
1664Many Emacs modes struggle with buffers which contain excessively long lines, 1664Many Emacs modes struggle with buffers which contain excessively long lines,
1665and may consequently cause unacceptable performance issues. 1665and may consequently cause unacceptable performance issues.
@@ -1861,11 +1861,11 @@ If it appears in `%s', you should remove it."
1861; LocalWords: initialized profiler boolean minified pre redisplay config keymap 1861; LocalWords: initialized profiler boolean minified pre redisplay config keymap
1862; LocalWords: noerror selectable mapc sgml nxml hl flydiff defs arg Phil Sainty 1862; LocalWords: noerror selectable mapc sgml nxml hl flydiff defs arg Phil Sainty
1863; LocalWords: defadvice nadvice whitespace ie bos eos eobp origmode un Un setq 1863; LocalWords: defadvice nadvice whitespace ie bos eos eobp origmode un Un setq
1864; LocalWords: docstring auf wiedersehen longlines alist autoload Refactored Inc 1864; LocalWords: docstring auf Wiedersehen longlines alist autoload Refactored Inc
1865; LocalWords: MERCHANTABILITY RET REGEXP VAR ELPA WS mitigations EmacsWiki eval 1865; LocalWords: MERCHANTABILITY RET REGEXP VAR ELPA WS EmacsWiki eval
1866; LocalWords: rx filename filenames 1866; LocalWords: rx filename filenames
1867 1867
1868;; So long, farewell, auf wiedersehen, goodbye 1868;; So long, farewell, auf Wiedersehen, goodbye
1869;; You have to go, this code is minified 1869;; You have to go, this code is minified
1870;; Goodbye! 1870;; Goodbye!
1871 1871
diff --git a/lisp/subr.el b/lisp/subr.el
index ca5af0f0ab7..1b2a1d643fb 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1572,7 +1572,7 @@ be a list of the form returned by `event-start' and `event-end'."
1572;; individual bytes at known offsets from the string beginning. 1572;; individual bytes at known offsets from the string beginning.
1573;; (make-obsolete 'string-to-unibyte "use `encode-coding-string'." "26.1") 1573;; (make-obsolete 'string-to-unibyte "use `encode-coding-string'." "26.1")
1574;; string-to-multibyte is also sometimes useful (and there's no good 1574;; string-to-multibyte is also sometimes useful (and there's no good
1575;; general replacement for it), so it's also been unobsoleted in Emacs 27.1. 1575;; general replacement for it), so it's also been revived in Emacs 27.1.
1576;; (make-obsolete 'string-to-multibyte "use `decode-coding-string'." "26.1") 1576;; (make-obsolete 'string-to-multibyte "use `decode-coding-string'." "26.1")
1577;; bug#23850 1577;; bug#23850
1578(make-obsolete 'string-as-unibyte "use `encode-coding-string'." "26.1") 1578(make-obsolete 'string-as-unibyte "use `encode-coding-string'." "26.1")
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 1ce4b98fd1b..c33fb174a58 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -634,7 +634,7 @@ Signal an error if the entire string was not used."
634(defun number-at-point () 634(defun number-at-point ()
635 "Return the number at point, or nil if none is found. 635 "Return the number at point, or nil if none is found.
636Decimal numbers like \"14\" or \"-14.5\", as well as hex numbers 636Decimal numbers like \"14\" or \"-14.5\", as well as hex numbers
637like \"0xBEEF09\" or \"#xBEEF09\", are regognized." 637like \"0xBEEF09\" or \"#xBEEF09\", are recognized."
638 (when (thing-at-point-looking-at 638 (when (thing-at-point-looking-at
639 "\\(-?[0-9]+\\.?[0-9]*\\)\\|\\(0x\\|#x\\)\\([a-zA-Z0-9]+\\)" 500) 639 "\\(-?[0-9]+\\.?[0-9]*\\)\\|\\(0x\\|#x\\)\\([a-zA-Z0-9]+\\)" 500)
640 (if (match-beginning 1) 640 (if (match-beginning 1)
diff --git a/src/hbfont.c b/src/hbfont.c
index 5a057c26a1d..2150b6656e1 100644
--- a/src/hbfont.c
+++ b/src/hbfont.c
@@ -358,8 +358,8 @@ get_hb_unicode_funcs (void)
358 hb_unicode_funcs_set_general_category_func (funcs, uni_general, NULL, NULL); 358 hb_unicode_funcs_set_general_category_func (funcs, uni_general, NULL, NULL);
359 hb_unicode_funcs_set_mirroring_func (funcs, uni_mirroring, NULL, NULL); 359 hb_unicode_funcs_set_mirroring_func (funcs, uni_mirroring, NULL, NULL);
360 360
361 /* Use default implmentation for Unicode composition/decomposition, we might 361 /* Use default implementation for Unicode composition/decomposition.
362 * want to revisit this later. 362 We might want to revisit this later.
363 hb_unicode_funcs_set_compose_func (funcs, uni_compose, NULL, NULL); 363 hb_unicode_funcs_set_compose_func (funcs, uni_compose, NULL, NULL);
364 hb_unicode_funcs_set_decompose_func (funcs, uni_decompose, NULL, NULL); 364 hb_unicode_funcs_set_decompose_func (funcs, uni_decompose, NULL, NULL);
365 */ 365 */
@@ -379,7 +379,7 @@ get_hb_unicode_funcs (void)
379 (N+1)th element of LGSTRING is nil, input of shaping is from the 379 (N+1)th element of LGSTRING is nil, input of shaping is from the
380 1st to (N)th elements. In each input glyph, FROM, TO, CHAR, and 380 1st to (N)th elements. In each input glyph, FROM, TO, CHAR, and
381 CODE are already set, but FROM and TO need adjustments according 381 CODE are already set, but FROM and TO need adjustments according
382 to the glyphs produced by the shaping fuinction. 382 to the glyphs produced by the shaping function.
383 DIRECTION is either L2R or R2L, or nil if unknown. During 383 DIRECTION is either L2R or R2L, or nil if unknown. During
384 redisplay, this comes from applying the UBA, is passed from 384 redisplay, this comes from applying the UBA, is passed from
385 composition_reseat_it, and is used by the HarfBuzz shaper. 385 composition_reseat_it, and is used by the HarfBuzz shaper.
diff --git a/src/window.c b/src/window.c
index 1984a540add..c52a8ca2855 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7617,7 +7617,7 @@ set_window_fringes (struct window *w,
7617 else 7617 else
7618 failed = true; 7618 failed = true;
7619 7619
7620 /* Placing fringes ouside margins. */ 7620 /* Placing fringes outside margins. */
7621 if (outside != w->fringes_outside_margins) 7621 if (outside != w->fringes_outside_margins)
7622 { 7622 {
7623 w->fringes_outside_margins = outside; 7623 w->fringes_outside_margins = outside;
diff --git a/src/xdisp.c b/src/xdisp.c
index 2467b336f4a..08c6927052c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21693,7 +21693,7 @@ extend_face_to_end_of_line (struct it *it)
21693 && indicator_column < it->last_visible_x) 21693 && indicator_column < it->last_visible_x)
21694 { 21694 {
21695 21695
21696 /* Here we substract char_width because we want the 21696 /* Here we subtract char_width because we want the
21697 column indicator in the column INDICATOR_COLUMN, 21697 column indicator in the column INDICATOR_COLUMN,
21698 not after it. */ 21698 not after it. */
21699 const int stretch_width = 21699 const int stretch_width =
@@ -21865,7 +21865,7 @@ extend_face_to_end_of_line (struct it *it)
21865 /* We need to subtract 1 to the indicator_column here because we 21865 /* We need to subtract 1 to the indicator_column here because we
21866 will add the indicator IN the column indicator number, not 21866 will add the indicator IN the column indicator number, not
21867 after it. We compare the variable it->current_x before 21867 after it. We compare the variable it->current_x before
21868 producing the glyph. When FRAME_WINDOW_P we substract 21868 producing the glyph. When FRAME_WINDOW_P we subtract
21869 CHAR_WIDTH calculating STRETCH_WIDTH for the same reason. */ 21869 CHAR_WIDTH calculating STRETCH_WIDTH for the same reason. */
21870 const int indicator_column = 21870 const int indicator_column =
21871 fill_column_indicator_column (it, 1) - 1; 21871 fill_column_indicator_column (it, 1) - 1;
diff --git a/test/lisp/abbrev-tests.el b/test/lisp/abbrev-tests.el
index 2750e9a6263..8eee0712c22 100644
--- a/test/lisp/abbrev-tests.el
+++ b/test/lisp/abbrev-tests.el
@@ -283,7 +283,7 @@
283 (inverse-add-abbrev table "Global" 1))) 283 (inverse-add-abbrev table "Global" 1)))
284 (should (string= (abbrev-expansion "foo" table) "bar")))) 284 (should (string= (abbrev-expansion "foo" table) "bar"))))
285 285
286(ert-deftest inverse-add-abbrev-skips-trailing-nonword/postiive-arg () 286(ert-deftest inverse-add-abbrev-skips-trailing-nonword/positive-arg ()
287 "Test that adding an inverse abbrev skips trailing nonword characters." 287 "Test that adding an inverse abbrev skips trailing nonword characters."
288 (let ((table (make-abbrev-table))) 288 (let ((table (make-abbrev-table)))
289 (with-temp-buffer 289 (with-temp-buffer
diff --git a/test/lisp/cedet/semantic-utest-ia.el b/test/lisp/cedet/semantic-utest-ia.el
index 61d7ea370e2..515275591f9 100644
--- a/test/lisp/cedet/semantic-utest-ia.el
+++ b/test/lisp/cedet/semantic-utest-ia.el
@@ -115,7 +115,7 @@
115 (should (file-exists-p tst)) 115 (should (file-exists-p tst))
116 (should-not (semantic-ia-utest tst)))) 116 (should-not (semantic-ia-utest tst))))
117 117
118(ert-deftest semantic-utest-ia-varnamse.java () 118(ert-deftest semantic-utest-ia-varnames.java ()
119 (let ((tst (expand-file-name "testvarnames.java" semantic-utest-test-directory))) 119 (let ((tst (expand-file-name "testvarnames.java" semantic-utest-test-directory)))
120 (should (file-exists-p tst)) 120 (should (file-exists-p tst))
121 (should-not (semantic-ia-utest tst)))) 121 (should-not (semantic-ia-utest tst))))
diff --git a/test/lisp/cedet/srecode-utest-getset.el b/test/lisp/cedet/srecode-utest-getset.el
index d69a195a128..2e82fc9c90a 100644
--- a/test/lisp/cedet/srecode-utest-getset.el
+++ b/test/lisp/cedet/srecode-utest-getset.el
@@ -21,7 +21,6 @@
21;; 21;;
22;; Unit tests for the getset inserter application. 22;; Unit tests for the getset inserter application.
23 23
24;;(require 'cedet-uutil)
25(require 'srecode/semantic) 24(require 'srecode/semantic)
26 25
27;;; Code: 26;;; Code:
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el
index 85230447148..d3b9732b74d 100644
--- a/test/lisp/emacs-lisp/cl-macs-tests.el
+++ b/test/lisp/emacs-lisp/cl-macs-tests.el
@@ -569,14 +569,14 @@ collection clause."
569 finally return result) 569 finally return result)
570 '(2 1 0))) 570 '(2 1 0)))
571 571
572 ;; this nonintuitive result is replicated by clisp 572 ;; this unintuitive result is replicated by clisp
573 (should (equal (cl-loop with result 573 (should (equal (cl-loop with result
574 for x below 3 574 for x below 3
575 and y = (progn (push x result)) 575 and y = (progn (push x result))
576 finally return result) 576 finally return result)
577 '(2 1 0 0))) 577 '(2 1 0 0)))
578 578
579 ;; this nonintuitive result is replicated by clisp 579 ;; this unintuitive result is replicated by clisp
580 (should (equal (cl-loop with result 580 (should (equal (cl-loop with result
581 for x below 3 581 for x below 3
582 and y = (progn (push x result)) then (progn (push (1+ x) result)) 582 and y = (progn (push x result)) then (progn (push (1+ x) result))
diff --git a/test/lisp/emacs-lisp/regexp-opt-tests.el b/test/lisp/emacs-lisp/regexp-opt-tests.el
index 3658964faac..6b94ccb2d5b 100644
--- a/test/lisp/emacs-lisp/regexp-opt-tests.el
+++ b/test/lisp/emacs-lisp/regexp-opt-tests.el
@@ -66,7 +66,7 @@
66 (opt (regexp-opt-test--match-all perm opt-re))) 66 (opt (regexp-opt-test--match-all perm opt-re)))
67 (concat "\n" 67 (concat "\n"
68 (format "Naïve regexp: %s\n" ref-re) 68 (format "Naïve regexp: %s\n" ref-re)
69 (format "Optimised regexp: %s\n" opt-re) 69 (format "Optimized regexp: %s\n" opt-re)
70 (format "Got: %s\n" opt) 70 (format "Got: %s\n" opt)
71 (format "Expected: %s\n" ref)))) 71 (format "Expected: %s\n" ref))))
72 72
diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el
index 7d77eca87d2..72d5488ec2e 100644
--- a/test/lisp/vc/log-edit-tests.el
+++ b/test/lisp/vc/log-edit-tests.el
@@ -37,7 +37,7 @@
37\(fun6): 37\(fun6):
38\(fun7): Some prose. 38\(fun7): Some prose.
39\(fun8): A longer description of a complicated change.\ 39\(fun8): A longer description of a complicated change.\
40 Spread over a couple of sentencences.\ 40 Spread over a couple of sentences.\
41 Long enough to be filled for several lines. 41 Long enough to be filled for several lines.
42\(fun9): Etc.") 42\(fun9): Etc.")
43 (goto-char (point-min)) 43 (goto-char (point-min))
@@ -46,7 +46,7 @@
46* dir/file.ext (fun1, fun2, fun3): 46* dir/file.ext (fun1, fun2, fun3):
47* file2.txt (fun4, fun5, fun6, fun7): Some prose. 47* file2.txt (fun4, fun5, fun6, fun7): Some prose.
48\(fun8): A longer description of a complicated change. Spread over a 48\(fun8): A longer description of a complicated change. Spread over a
49couple of sentencences. Long enough to be filled for several lines. 49couple of sentences. Long enough to be filled for several lines.
50\(fun9): Etc.")) 50\(fun9): Etc."))
51 (let ((fill-column 20)) (log-edit-fill-entry)) 51 (let ((fill-column 20)) (log-edit-fill-entry))
52 (should (equal (buffer-string) "\ 52 (should (equal (buffer-string) "\
@@ -59,10 +59,9 @@ Some prose.
59description of a 59description of a
60complicated change. 60complicated change.
61Spread over a couple 61Spread over a couple
62of sentencences. 62of sentences. Long
63Long enough to be 63enough to be filled
64filled for several 64for several lines.
65lines.
66\(fun9): Etc.")) 65\(fun9): Etc."))
67 (let ((fill-column 40)) (log-edit-fill-entry)) 66 (let ((fill-column 40)) (log-edit-fill-entry))
68 (should (equal (buffer-string) "\ 67 (should (equal (buffer-string) "\
@@ -71,21 +70,21 @@ lines.
71Some prose. 70Some prose.
72\(fun8): A longer description of a 71\(fun8): A longer description of a
73complicated change. Spread over a 72complicated change. Spread over a
74couple of sentencences. Long enough to 73couple of sentences. Long enough to be
75be filled for several lines. 74filled for several lines.
76\(fun9): Etc.")))) 75\(fun9): Etc."))))
77 76
78(ert-deftest log-edit-fill-entry-trailing-prose () 77(ert-deftest log-edit-fill-entry-trailing-prose ()
79 (with-temp-buffer 78 (with-temp-buffer
80 (insert "\ 79 (insert "\
81* dir/file.ext (fun1): A longer description of a complicated change.\ 80* dir/file.ext (fun1): A longer description of a complicated change.\
82 Spread over a couple of sentencences.\ 81 Spread over a couple of sentences.\
83 Long enough to be filled for several lines.") 82 Long enough to be filled for several lines.")
84 (let ((fill-column 72)) (log-edit-fill-entry)) 83 (let ((fill-column 72)) (log-edit-fill-entry))
85 (should (equal (buffer-string) "\ 84 (should (equal (buffer-string) "\
86* dir/file.ext (fun1): A longer description of a complicated change. 85* dir/file.ext (fun1): A longer description of a complicated change.
87Spread over a couple of sentencences. Long enough to be filled for 86Spread over a couple of sentences. Long enough to be filled for several
88several lines.")))) 87lines."))))
89 88
90(ert-deftest log-edit-fill-entry-joining () 89(ert-deftest log-edit-fill-entry-joining ()
91 ;; Join short enough function names on the same line. 90 ;; Join short enough function names on the same line.
diff --git a/test/manual/cedet/tests/test-fmt.cpp b/test/manual/cedet/tests/test-fmt.cpp
index c94bcfafbca..6ae373de359 100644
--- a/test/manual/cedet/tests/test-fmt.cpp
+++ b/test/manual/cedet/tests/test-fmt.cpp
@@ -56,12 +56,12 @@ struct moose {
56 * ## uml-prototype "moose{} : struct" 56 * ## uml-prototype "moose{} : struct"
57 */ 57 */
58 58
59struct moose strct_fcn ( struct moose in, char *out); 59struct moose struct_fcn ( struct moose in, char *out);
60/* 60/*
61 * ## name "strct_fcn" 61 * ## name "struct_fcn"
62 * ## abbreviate "strct_fcn()" 62 * ## abbreviate "struct_fcn()"
63 * ## prototype "struct moose strct_fcn (struct moose in,char* out)" 63 * ## prototype "struct moose struct_fcn (struct moose in,char* out)"
64 * ## uml-prototype "strct_fcn (in : struct moose,out : char*) : struct moose" 64 * ## uml-prototype "struct_fcn (in : struct moose,out : char*) : struct moose"
65 */ 65 */
66 66
67struct moose *var_one = NULL; 67struct moose *var_one = NULL;
diff --git a/test/manual/cedet/tests/test.srt b/test/manual/cedet/tests/test.srt
index b77cd4fbe29..cbc8c3f1ba1 100644
--- a/test/manual/cedet/tests/test.srt
+++ b/test/manual/cedet/tests/test.srt
@@ -57,7 +57,7 @@ template testarea :blank
57---- 57----
58 58
59;; This is a bad hack - In order for the text to parse, but also get a completion 59;; This is a bad hack - In order for the text to parse, but also get a completion
60;; monicker into the right spot, we need to pretend a comment is the same as the 60;; moniker into the right spot, we need to pretend a comment is the same as the
61;; escape_end. 61;; escape_end.
62;; Local variables: 62;; Local variables:
63;; comment-start-skip: "}}" 63;; comment-start-skip: "}}"
diff --git a/test/manual/etags/cp-src/functions.cpp b/test/manual/etags/cp-src/functions.cpp
index 764498d4084..7c353d161a1 100644
--- a/test/manual/etags/cp-src/functions.cpp
+++ b/test/manual/etags/cp-src/functions.cpp
@@ -28,7 +28,7 @@ void Date::setDate ( int d , int m , int y ){
28 t = mktime ( date ) ; 28 t = mktime ( date ) ;
29} 29}
30 30
31// Addition operation ::: Warning ::: A combination of addition and substraction does not give a proper result 31// Addition operation ::: Warning ::: A combination of addition and subtraction does not give a proper result
32void Date::plus ( int days , int month , int year ){ 32void Date::plus ( int days , int month , int year ){
33 if ( ! set () ) 33 if ( ! set () )
34 return; 34 return;
@@ -38,7 +38,7 @@ void Date::plus ( int days , int month , int year ){
38 mktime ( date ); 38 mktime ( date );
39} 39}
40 40
41//Substraction operation ::: Warning ::: A combination of addition and substraction does not give a proper result 41//Subtraction operation ::: Warning ::: A combination of addition and subtraction does not give a proper result
42void Date::minus ( int days , int month , int year ){ 42void Date::minus ( int days , int month , int year ){
43 if ( ! set () ) 43 if ( ! set () )
44 return; 44 return;
@@ -74,7 +74,7 @@ Date & Date::operator += ( int days ){
74 return(*this); 74 return(*this);
75} 75}
76 76
77// Substract number of days 77// Subtract number of days
78Date & Date::operator -= ( int days ){ 78Date & Date::operator -= ( int days ){
79 if ( set () ){ 79 if ( set () ){
80 date->tm_mday -= days ; 80 date->tm_mday -= days ;
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 5fd37520f70..3a9b43ec4ee 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -565,7 +565,7 @@ with parameters from the *Messages* buffer modification."
565(deftest-previous-overlay-change-1 o 25 20 (30 30) (20 30)) 565(deftest-previous-overlay-change-1 o 25 20 (30 30) (20 30))
566(deftest-previous-overlay-change-1 p 30 20 (20 20) (20 30)) 566(deftest-previous-overlay-change-1 p 30 20 (20 20) (20 30))
567(deftest-previous-overlay-change-1 q 40 30 (20 20) (20 30)) 567(deftest-previous-overlay-change-1 q 40 30 (20 20) (20 30))
568;; 1 empty, 1 non-empty, intersectig in the middle 568;; 1 empty, 1 non-empty, intersecting in the middle
569(deftest-previous-overlay-change-1 r 10 1 (25 25) (20 30)) 569(deftest-previous-overlay-change-1 r 10 1 (25 25) (20 30))
570(deftest-previous-overlay-change-1 s 20 1 (25 25) (20 30)) 570(deftest-previous-overlay-change-1 s 20 1 (25 25) (20 30))
571(deftest-previous-overlay-change-1 t 25 20 (25 25) (20 30)) 571(deftest-previous-overlay-change-1 t 25 20 (25 25) (20 30))
@@ -969,7 +969,7 @@ with parameters from the *Messages* buffer modification."
969 (should (= 25 (overlay-start right))) 969 (should (= 25 (overlay-start right)))
970 (should (= 75 (overlay-end right))) 970 (should (= 75 (overlay-end right)))
971 ;; Try to detect the error, by removing left. The should fail 971 ;; Try to detect the error, by removing left. The should fail
972 ;; an eassert, since it won't be found by a reular tree 972 ;; an eassert, since it won't be found by a regular tree
973 ;; traversal - in theory. 973 ;; traversal - in theory.
974 (delete-overlay left) 974 (delete-overlay left)
975 (should (= 2 (length (overlays-in 1 (point-max)))))))) 975 (should (= 2 (length (overlays-in 1 (point-max))))))))
@@ -1045,7 +1045,7 @@ with parameters from the *Messages* buffer modification."
1045;; | make-indirect-buffer 1045;; | make-indirect-buffer
1046;; +==========================================================================+ 1046;; +==========================================================================+
1047 1047
1048;; Check if overlays are cloned/seperate from indirect buffer. 1048;; Check if overlays are cloned/separate from indirect buffer.
1049(ert-deftest test-make-indirect-buffer-1 () 1049(ert-deftest test-make-indirect-buffer-1 ()
1050 (with-temp-buffer 1050 (with-temp-buffer
1051 (dotimes (_ 10) (make-overlay 1 1)) 1051 (dotimes (_ 10) (make-overlay 1 1))
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index 93f7f63847f..bcc652a8053 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -269,7 +269,7 @@
269 (should (equal (base64-encode-string "\x14\xfb\x9c\x03\xd9\x7f") "FPucA9l/"))) 269 (should (equal (base64-encode-string "\x14\xfb\x9c\x03\xd9\x7f") "FPucA9l/")))
270 270
271(ert-deftest fns-test-base64url-encode-region () 271(ert-deftest fns-test-base64url-encode-region ()
272 ;; url variant wih padding 272 ;; url variant with padding
273 (should (equal (fns-tests--with-region base64url-encode-region "") "")) 273 (should (equal (fns-tests--with-region base64url-encode-region "") ""))
274 (should (equal (fns-tests--with-region base64url-encode-region "f") "Zg==")) 274 (should (equal (fns-tests--with-region base64url-encode-region "f") "Zg=="))
275 (should (equal (fns-tests--with-region base64url-encode-region "fo") "Zm8=")) 275 (should (equal (fns-tests--with-region base64url-encode-region "fo") "Zm8="))
@@ -311,7 +311,7 @@
311 (fns-tests--string-repeat "FPucA9l_" 10)))) 311 (fns-tests--string-repeat "FPucA9l_" 10))))
312 312
313(ert-deftest fns-test-base64url-encode-string () 313(ert-deftest fns-test-base64url-encode-string ()
314 ;; url variant wih padding 314 ;; url variant with padding
315 (should (equal (base64url-encode-string "") "")) 315 (should (equal (base64url-encode-string "") ""))
316 (should (equal (base64url-encode-string "f") "Zg==")) 316 (should (equal (base64url-encode-string "f") "Zg=="))
317 (should (equal (base64url-encode-string "fo") "Zm8=")) 317 (should (equal (base64url-encode-string "fo") "Zm8="))
@@ -356,7 +356,7 @@
356 (should (equal (base64-decode-string "FPucA9l+") "\x14\xfb\x9c\x03\xd9\x7e")) 356 (should (equal (base64-decode-string "FPucA9l+") "\x14\xfb\x9c\x03\xd9\x7e"))
357 (should (equal (base64-decode-string "FPucA9l/") "\x14\xfb\x9c\x03\xd9\x7f")) 357 (should (equal (base64-decode-string "FPucA9l/") "\x14\xfb\x9c\x03\xd9\x7f"))
358 358
359 ;; no paddign 359 ;; no padding
360 (should (equal (base64-decode-string "" t) "")) 360 (should (equal (base64-decode-string "" t) ""))
361 (should (equal (base64-decode-string "Zg" t) "f")) 361 (should (equal (base64-decode-string "Zg" t) "f"))
362 (should (equal (base64-decode-string "Zm8" t) "fo")) 362 (should (equal (base64-decode-string "Zm8" t) "fo"))
@@ -365,7 +365,7 @@
365 (should (equal (base64-decode-string "Zm9vYmE" t) "fooba")) 365 (should (equal (base64-decode-string "Zm9vYmE" t) "fooba"))
366 (should (equal (base64-decode-string "Zm9vYmFy" t) "foobar")) 366 (should (equal (base64-decode-string "Zm9vYmFy" t) "foobar"))
367 367
368 ;; url variant wih padding 368 ;; url variant with padding
369 (should (equal (base64-decode-string "") "")) 369 (should (equal (base64-decode-string "") ""))
370 (should (equal (base64-decode-string "Zg==" t) "f") ) 370 (should (equal (base64-decode-string "Zg==" t) "f") )
371 (should (equal (base64-decode-string "Zm8=" t) "fo")) 371 (should (equal (base64-decode-string "Zm8=" t) "fo"))