aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2022-11-20 12:59:39 +0100
committerStefan Kangas2022-11-20 12:59:39 +0100
commit16318bfb518aa7bc06e502e6fad7e53ec91067f9 (patch)
treee27122c0a061762bc483ed245ca62ac8d957f881
parent6082ab9697fa8c18e9049d24840d07efe6f95625 (diff)
downloademacs-16318bfb518aa7bc06e502e6fad7e53ec91067f9.tar.gz
emacs-16318bfb518aa7bc06e502e6fad7e53ec91067f9.zip
; Fix typos
-rw-r--r--ChangeLog.330
-rw-r--r--admin/cus-test.el2
-rw-r--r--admin/grammars/srecode-template.wy2
-rw-r--r--admin/last-chance.el2
-rw-r--r--admin/notes/bug-triage2
-rw-r--r--doc/misc/ede.texi4
-rw-r--r--doc/misc/org.org2
-rw-r--r--doc/misc/srecode.texi2
-rw-r--r--etc/NEXTSTEP2
-rw-r--r--etc/themes/dichromacy-theme.el38
-rw-r--r--lisp/ChangeLog.122
-rw-r--r--lisp/ChangeLog.152
-rw-r--r--lisp/ChangeLog.162
-rw-r--r--lisp/cedet/ChangeLog.12
-rw-r--r--lisp/cedet/ede/makefile-edit.el2
-rw-r--r--lisp/cedet/ede/proj.el4
-rw-r--r--lisp/cedet/ede/project-am.el4
-rw-r--r--lisp/cedet/semantic.el10
-rw-r--r--lisp/cedet/semantic/analyze/fcn.el2
-rw-r--r--lisp/cedet/semantic/bovine/c.el4
-rw-r--r--lisp/cedet/semantic/complete.el2
-rw-r--r--lisp/cedet/semantic/db-ebrowse.el2
-rw-r--r--lisp/cedet/semantic/db-find.el2
-rw-r--r--lisp/cedet/semantic/decorate/include.el2
-rw-r--r--lisp/cedet/semantic/edit.el2
-rw-r--r--lisp/cedet/semantic/idle.el2
-rw-r--r--lisp/cedet/semantic/scope.el2
-rw-r--r--lisp/cedet/semantic/symref/list.el2
-rw-r--r--lisp/cedet/semantic/util-modes.el2
-rw-r--r--lisp/cedet/srecode/document.el3
-rw-r--r--lisp/cedet/srecode/extract.el2
-rw-r--r--lisp/cedet/srecode/semantic.el4
-rw-r--r--lisp/emacs-lisp/checkdoc.el4
-rw-r--r--lisp/emacs-lisp/package-vc.el2
-rw-r--r--lisp/erc/ChangeLog.15
-rw-r--r--lisp/eshell/esh-proc.el2
-rw-r--r--lisp/gnus/mml.el2
-rw-r--r--lisp/mail/feedmail.el6
-rw-r--r--lisp/mail/rfc6068.el4
-rw-r--r--lisp/mail/rmail.el2
-rw-r--r--lisp/mail/supercite.el2
-rw-r--r--lisp/man.el2
-rw-r--r--lisp/org/ChangeLog.14
-rw-r--r--lisp/progmodes/eglot.el10
-rw-r--r--lisp/progmodes/hideshow.el4
-rw-r--r--lisp/progmodes/prog-mode.el2
-rw-r--r--lisp/progmodes/verilog-mode.el2
-rw-r--r--lisp/subr.el2
-rw-r--r--lisp/url/ChangeLog.12
-rw-r--r--lisp/vc/vc-rcs.el2
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/ChangeLog.122
-rw-r--r--src/ChangeLog.82
-rw-r--r--src/dbusbind.c4
-rw-r--r--src/font.h6
-rw-r--r--src/itree.c2
-rw-r--r--src/xselect.c2
-rw-r--r--src/xsettings.c2
-rw-r--r--test/lisp/auth-source-pass-tests.el8
-rw-r--r--test/lisp/cedet/srecode/fields-tests.el2
-rw-r--r--test/lisp/net/dbus-tests.el2
-rw-r--r--test/lisp/vc/vc-tests.el2
-rw-r--r--test/src/comp-resources/comp-test-funcs.el8
-rw-r--r--test/src/comp-tests.el4
-rw-r--r--test/src/eval-tests.el2
65 files changed, 129 insertions, 127 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index 3ebe74e76b3..d27a14d4279 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -12670,7 +12670,7 @@
12670 12670
126712021-09-03 Lars Ingebrigtsen <larsi@gnus.org> 126712021-09-03 Lars Ingebrigtsen <larsi@gnus.org>
12672 12672
12673 Fix `describe-function' for autoloaded adviced functions 12673 Fix `describe-function' for autoloaded advised functions
12674 12674
12675 * lisp/emacs-lisp/nadvice.el (advice--make-single-doc): Factor 12675 * lisp/emacs-lisp/nadvice.el (advice--make-single-doc): Factor
12676 out. 12676 out.
@@ -21063,7 +21063,7 @@
21063 Fix prompting for large files when loading literally 21063 Fix prompting for large files when loading literally
21064 21064
21065 * lisp/files.el (find-file-noselect): Don't include "literally" in 21065 * lisp/files.el (find-file-noselect): Don't include "literally" in
21066 the "large file" prompt if we're gonna load literally anyway 21066 the "large file" prompt if we're going to load literally anyway
21067 (bug#49144). 21067 (bug#49144).
21068 21068
210692021-06-21 Lars Ingebrigtsen <larsi@gnus.org> 210692021-06-21 Lars Ingebrigtsen <larsi@gnus.org>
@@ -75941,7 +75941,7 @@
75941 75941
759422020-07-13 Andrea Corallo <akrl@sdf.org> 759422020-07-13 Andrea Corallo <akrl@sdf.org>
75943 75943
75944 Rework the backend to allocate arument arrays for call by references 75944 Rework the backend to allocate argument arrays for call by references
75945 75945
75946 * src/comp.c (comp_t): Add 'zero' field. 75946 * src/comp.c (comp_t): Add 'zero' field.
75947 (emit_limple_call_ref): Allocate an array to host the parameters 75947 (emit_limple_call_ref): Allocate an array to host the parameters
@@ -79675,7 +79675,7 @@
79675 Simply return the directory selected by the user. 79675 Simply return the directory selected by the user.
79676 (project-switch-project-find-file): Remove. 79676 (project-switch-project-find-file): Remove.
79677 (project-switch-project-dired): Rename to project-dired and make 79677 (project-switch-project-dired): Rename to project-dired and make
79678 it follow the convention of existing projec tcommands. 79678 it follow the convention of existing project tcommands.
79679 (project-switch-project-eshell): Ditto. 79679 (project-switch-project-eshell): Ditto.
79680 (project-switch-project): Instead of passing the project instance 79680 (project-switch-project): Instead of passing the project instance
79681 to the command, just bind default-directory. 79681 to the command, just bind default-directory.
@@ -80910,7 +80910,7 @@
80910 'lambda_gc_guard' 'lambda_c_name_idx_h' 'data_imp_relocs' 80910 'lambda_gc_guard' 'lambda_c_name_idx_h' 'data_imp_relocs'
80911 'loaded_once' fields. 80911 'loaded_once' fields.
80912 80912
80913 * src/comp.c (load_comp_unit): Use compilaiton unit 'loaded_once' 80913 * src/comp.c (load_comp_unit): Use compilation unit 'loaded_once'
80914 field. 80914 field.
80915 (make_subr, Fcomp__register_lambda): New functions. 80915 (make_subr, Fcomp__register_lambda): New functions.
80916 (Fcomp__register_subr): Make use of 'make_subr'. 80916 (Fcomp__register_subr): Make use of 'make_subr'.
@@ -90740,7 +90740,7 @@
90740 90740
90741 compute dominator tree 90741 compute dominator tree
90742 90742
90743 ssa and endge number generation with generator 90743 ssa and edge number generation with generator
90744 90744
90745 add edge computation 90745 add edge computation
90746 90746
@@ -140170,7 +140170,7 @@
140170 140170
140171 * doc/misc/eshell.texi (Built-ins): Fix alias description 140171 * doc/misc/eshell.texi (Built-ins): Fix alias description
140172 140172
140173 Dear eamcs developers, eshells current documentation first states 140173 Dear emacs developers, eshell's current documentation first states
140174 that alias definitions are not saved to an alias file, later that 140174 that alias definitions are not saved to an alias file, later that
140175 they are saved to an alias file. I tested it and the latter is 140175 they are saved to an alias file. I tested it and the latter is
140176 correct. 140176 correct.
@@ -165960,7 +165960,7 @@
165960 cl-loop: Calculate the array length just once 165960 cl-loop: Calculate the array length just once
165961 165961
165962 * lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause): 165962 * lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
165963 Dont calculate the array length on each iteration (Bug#29866). 165963 Don't calculate the array length on each iteration (Bug#29866).
165964 165964
1659652018-01-07 Philipp Stephani <phst@google.com> 1659652018-01-07 Philipp Stephani <phst@google.com>
165966 165966
@@ -169297,7 +169297,7 @@
169297 2e1b3522b8 Improve documentation of 'line-number-display-width' 169297 2e1b3522b8 Improve documentation of 'line-number-display-width'
169298 5b6e59cfdb Implement vc-default-dir-extra-headers for vc-rcs 169298 5b6e59cfdb Implement vc-default-dir-extra-headers for vc-rcs
169299 22adeca42a In NEWS give advice on use of `switch-to-buffer' (Bug#28645) 169299 22adeca42a In NEWS give advice on use of `switch-to-buffer' (Bug#28645)
169300 2c3e6f1ddc Dont update primary selection with winner-undo 169300 2c3e6f1ddc Don't update primary selection with winner-undo
169301 b38724ab67 Work around ImageMagick bug 825 169301 b38724ab67 Work around ImageMagick bug 825
169302 20cc68e871 Document rectangle-preview option more (Bug#27974) 169302 20cc68e871 Document rectangle-preview option more (Bug#27974)
169303 a0b7b301dd Do not reject https://gnu.org in commit messages 169303 a0b7b301dd Do not reject https://gnu.org in commit messages
@@ -172340,7 +172340,7 @@
172340 172340
172341 * doc/misc/eshell.texi (Built-ins): Fix alias description 172341 * doc/misc/eshell.texi (Built-ins): Fix alias description
172342 172342
172343 Dear eamcs developers, eshells current documentation first states 172343 Dear emacs developers, eshell's current documentation first states
172344 that alias definitions are not saved to an alias file, later that 172344 that alias definitions are not saved to an alias file, later that
172345 they are saved to an alias file. I tested it and the latter is 172345 they are saved to an alias file. I tested it and the latter is
172346 correct. 172346 correct.
@@ -185296,10 +185296,10 @@
1852962017-10-17 Tino Calancha <tino.calancha@gmail.com> 1852962017-10-17 Tino Calancha <tino.calancha@gmail.com>
185297 Noam Postavsky <npostavs@gmail.com> 185297 Noam Postavsky <npostavs@gmail.com>
185298 185298
185299 Dont update primary selection with winner-undo 185299 Don't update primary selection with winner-undo
185300 185300
185301 * lisp/winner.el (winner-set): 185301 * lisp/winner.el (winner-set):
185302 Dont update primary selection when select-enable-primary 185302 Don't update primary selection when select-enable-primary
185303 is non-nil (Bug#28631). 185303 is non-nil (Bug#28631).
185304 185304
1853052017-10-17 Paul Eggert <eggert@cs.ucla.edu> 1853052017-10-17 Paul Eggert <eggert@cs.ucla.edu>
@@ -195520,7 +195520,7 @@
195520 195520
195521 Ignore mouse-movement for describe-key-briefly (Bug#12204) 195521 Ignore mouse-movement for describe-key-briefly (Bug#12204)
195522 195522
195523 * lisp/help.el (help-read-key-sequence): Add optional argument ot 195523 * lisp/help.el (help-read-key-sequence): Add optional argument to
195524 ignore `mouse-movement' events. 195524 ignore `mouse-movement' events.
195525 (describe-key-briefly): Use it. 195525 (describe-key-briefly): Use it.
195526 * doc/emacs/help.texi (Key Help): 195526 * doc/emacs/help.texi (Key Help):
@@ -198690,7 +198690,7 @@
198690 (tramp-adb-ls-toolbox-regexp): 198690 (tramp-adb-ls-toolbox-regexp):
198691 Ignore addition links column on Android 7. 198691 Ignore addition links column on Android 7.
198692 (tramp-adb-get-ls-command): 198692 (tramp-adb-get-ls-command):
198693 Dont use --color=none when using toybox (Android 7). It's not 198693 Don't use --color=none when using toybox (Android 7). It's not
198694 possible to disable coloring explicitly for toybox ls. 198694 possible to disable coloring explicitly for toybox ls.
198695 198695
1986962017-05-27 Svante Carl v. Erichsen <Svante.v.Erichsen@web.de> (tiny change) 1986962017-05-27 Svante Carl v. Erichsen <Svante.v.Erichsen@web.de> (tiny change)
@@ -199186,7 +199186,7 @@
199186 199186
1991872017-05-23 Paul Eggert <eggert@cs.ucla.edu> 1991872017-05-23 Paul Eggert <eggert@cs.ucla.edu>
199188 199188
199189 Don't warn about missing brances on macOS 199189 Don't warn about missing branches on macOS
199190 199190
199191 On macOS, removing -Wmissing-braces is not enough; the warning has to 199191 On macOS, removing -Wmissing-braces is not enough; the warning has to
199192 be disabled explicitly. 199192 be disabled explicitly.
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 22d5a3a1516..7e73f2e44aa 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -131,7 +131,7 @@ Names should be as they appear in loaddefs.el.")
131;; Don't create a file `abbrev-file-name'. 131;; Don't create a file `abbrev-file-name'.
132(setq save-abbrevs nil) 132(setq save-abbrevs nil)
133 133
134;; Avoid compile logs from adviced functions. 134;; Avoid compile logs from advised functions.
135(eval-after-load "bytecomp" 135(eval-after-load "bytecomp"
136 '(setq ad-default-compilation-action 'never)) 136 '(setq ad-default-compilation-action 'never))
137 137
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index c3531ebd549..7ba73d2921a 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -126,7 +126,7 @@ variable
126 : SET symbol insertable-string-list newline 126 : SET symbol insertable-string-list newline
127 (VARIABLE-TAG $2 nil $3) 127 (VARIABLE-TAG $2 nil $3)
128 | SET symbol number newline 128 | SET symbol number newline
129 ;; This so a common error w/ priority works. 129 ;; This so a common error with priority works.
130 ;; Note that "number" still has a string value in the lexer. 130 ;; Note that "number" still has a string value in the lexer.
131 (VARIABLE-TAG $2 nil (list $3)) 131 (VARIABLE-TAG $2 nil (list $3))
132 | SHOW symbol newline 132 | SHOW symbol newline
diff --git a/admin/last-chance.el b/admin/last-chance.el
index 30d6a25a287..45d470cacde 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -41,7 +41,7 @@
41;; 41;;
42;; will show you any references to `change-log-date-face' in the 42;; will show you any references to `change-log-date-face' in the
43;; *.el files in a new buffer (in Grep mode). Hopefully you see 43;; *.el files in a new buffer (in Grep mode). Hopefully you see
44;; only the obsolete declaration and can proceed w/ its removal. 44;; only the obsolete declaration and can proceed with its removal.
45;; If not, please DTRT and refrain from the removal until those 45;; If not, please DTRT and refrain from the removal until those
46;; references are properly transitioned. 46;; references are properly transitioned.
47;; 47;;
diff --git a/admin/notes/bug-triage b/admin/notes/bug-triage
index 3d9a275c9d2..bee7242337d 100644
--- a/admin/notes/bug-triage
+++ b/admin/notes/bug-triage
@@ -73,7 +73,7 @@ the ones that are not reproducible on the current release.
73 know if you are able to? If I don't hear back in a few 73 know if you are able to? If I don't hear back in a few
74 weeks, I'll just close this bug as unreproducible." 74 weeks, I'll just close this bug as unreproducible."
75 [ ] Check that the priority is reasonable. Most bugs should be 75 [ ] Check that the priority is reasonable. Most bugs should be
76 marked as normal, but crashers and security issues can be 76 marked as normal, but crashes and security issues can be
77 marked as serious. 77 marked as serious.
78 3. Your changes will take some time to take effect. After a period of minutes 78 3. Your changes will take some time to take effect. After a period of minutes
79 to hours, you will get a mail telling you the control message has been 79 to hours, you will get a mail telling you the control message has been
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 7a26fe0e57a..0463d068c22 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -2536,7 +2536,7 @@ Call this when a user finishes customizing @var{TARGET}.
2536@end deffn 2536@end deffn
2537 2537
2538@deffn Method project-edit-file-target :AFTER ot 2538@deffn Method project-edit-file-target :AFTER ot
2539Edit the target @var{OT} associated w/ this file. 2539Edit the target @var{OT} associated with this file.
2540@end deffn 2540@end deffn
2541 2541
2542@deffn Method ede-documentation :AFTER this 2542@deffn Method ede-documentation :AFTER this
@@ -3563,7 +3563,7 @@ Run the current project in the debugger.
3563@end deffn 3563@end deffn
3564 3564
3565@deffn Method project-edit-file-target :AFTER obj 3565@deffn Method project-edit-file-target :AFTER obj
3566Edit the target associated w/ this file. 3566Edit the target associated with this file.
3567@end deffn 3567@end deffn
3568 3568
3569@node project-am-objectcode 3569@node project-am-objectcode
diff --git a/doc/misc/org.org b/doc/misc/org.org
index ae3ca0b64f3..6ad8c462cc3 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16569,7 +16569,7 @@ identifying a reference in the bibliography.
16569 16569
16570- Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or 16570- Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
16571 a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or necessary 16571 a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or necessary
16572 fo the comprehension of the citation but not included in the 16572 for the comprehension of the citation but not included in the
16573 reference. 16573 reference.
16574 16574
16575- A single citation can cite more than one reference ; the keys are 16575- A single citation can cite more than one reference ; the keys are
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index a0cbf7e33fb..d7356fef58a 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -1595,7 +1595,7 @@ from a user perspective during basic interactive insertion via
1595 1595
1596NOTES ON THIS CHAPTER: 1596NOTES ON THIS CHAPTER:
1597 1597
1598These conventions are being worked on. Check w/ CEDET-DEVEL mailing 1598These conventions are being worked on. Check with CEDET-DEVEL mailing
1599list if you want to support a language, or write an application and 1599list if you want to support a language, or write an application and
1600provide your opinions on this topic. Any help is appreciated. 1600provide your opinions on this topic. Any help is appreciated.
1601 1601
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index dacbed20451..0570f707959 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -206,7 +206,7 @@ Release History
206 keys, fix border and box drawing, remove 206 keys, fix border and box drawing, remove
207 glitches in modeline drawing, support 207 glitches in modeline drawing, support
208 overstrike for unavailable bold fonts, fix XPM 208 overstrike for unavailable bold fonts, fix XPM
209 related crasher bugs. Incremental font 209 related crashes. Incremental font
210 metrics caching and other performance 210 metrics caching and other performance
211 improvements. Shared-lisp builds now possible. 211 improvements. Shared-lisp builds now possible.
212 212
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index fe44d520cca..c9d73983b59 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -39,7 +39,7 @@ Ansi-Color faces are included."
39 (bluegreen "#009e73") 39 (bluegreen "#009e73")
40 (yellow "#f8ec59") 40 (yellow "#f8ec59")
41 (blue "#0072b2") 41 (blue "#0072b2")
42 (vermillion "#d55e00") 42 (vermilion "#d55e00")
43 (redpurple "#cc79a7") 43 (redpurple "#cc79a7")
44 (bluegray "#848ea9")) 44 (bluegray "#848ea9"))
45 (custom-theme-set-faces 45 (custom-theme-set-faces
@@ -51,9 +51,9 @@ Ansi-Color faces are included."
51 `(highlight ((,class (:foreground ,blue :background "#e5e5e5")))) 51 `(highlight ((,class (:foreground ,blue :background "#e5e5e5"))))
52 `(region ((,class (:foreground unspecified :background ,yellow)))) 52 `(region ((,class (:foreground unspecified :background ,yellow))))
53 `(secondary-selection ((,class (:background "#e5e5e5")))) 53 `(secondary-selection ((,class (:background "#e5e5e5"))))
54 `(isearch ((,class (:foreground "white" :background ,vermillion)))) 54 `(isearch ((,class (:foreground "white" :background ,vermilion))))
55 `(lazy-highlight ((,class (:foreground "white" :background ,redpurple)))) 55 `(lazy-highlight ((,class (:foreground "white" :background ,redpurple))))
56 `(trailing-whitespace ((,class (:background ,vermillion)))) 56 `(trailing-whitespace ((,class (:background ,vermilion))))
57 ;; Mode line faces 57 ;; Mode line faces
58 `(mode-line ((,class (:box (:line-width -1 :style released-button) 58 `(mode-line ((,class (:box (:line-width -1 :style released-button)
59 :background "#e5e5e5" :foreground "black")))) 59 :background "#e5e5e5" :foreground "black"))))
@@ -62,17 +62,17 @@ Ansi-Color faces are included."
62 :foreground "black")))) 62 :foreground "black"))))
63 ;; Escape and prompt faces 63 ;; Escape and prompt faces
64 `(minibuffer-prompt ((,class (:weight bold :foreground ,blue)))) 64 `(minibuffer-prompt ((,class (:weight bold :foreground ,blue))))
65 `(escape-glyph ((,class (:foreground ,vermillion)))) 65 `(escape-glyph ((,class (:foreground ,vermilion))))
66 `(homoglyph ((,class (:foreground ,vermillion)))) 66 `(homoglyph ((,class (:foreground ,vermilion))))
67 `(error ((,class (:weight bold :slant italic 67 `(error ((,class (:weight bold :slant italic
68 :foreground ,vermillion)))) 68 :foreground ,vermilion))))
69 `(warning ((,class (:foreground ,orange)))) 69 `(warning ((,class (:foreground ,orange))))
70 `(success ((,class (:foreground ,bluegreen)))) 70 `(success ((,class (:foreground ,bluegreen))))
71 ;; Font lock faces 71 ;; Font lock faces
72 `(font-lock-builtin-face ((,class (:foreground ,blue)))) 72 `(font-lock-builtin-face ((,class (:foreground ,blue))))
73 `(font-lock-comment-face ((,class (:slant italic :foreground ,bluegreen)))) 73 `(font-lock-comment-face ((,class (:slant italic :foreground ,bluegreen))))
74 `(font-lock-constant-face ((,class (:weight bold :foreground ,vermillion)))) 74 `(font-lock-constant-face ((,class (:weight bold :foreground ,vermilion))))
75 `(font-lock-function-name-face ((,class (:foreground ,vermillion)))) 75 `(font-lock-function-name-face ((,class (:foreground ,vermilion))))
76 `(font-lock-keyword-face ((,class (:weight bold :foreground ,skyblue)))) 76 `(font-lock-keyword-face ((,class (:weight bold :foreground ,skyblue))))
77 `(font-lock-string-face ((,class (:foreground ,bluegray)))) 77 `(font-lock-string-face ((,class (:foreground ,bluegray))))
78 `(font-lock-type-face ((,class (:weight bold :foreground ,blue)))) 78 `(font-lock-type-face ((,class (:weight bold :foreground ,blue))))
@@ -81,8 +81,8 @@ Ansi-Color faces are included."
81 `(link ((,class (:underline t :foreground ,blue)))) 81 `(link ((,class (:underline t :foreground ,blue))))
82 `(link-visited ((,class (:underline t :foreground ,redpurple)))) 82 `(link-visited ((,class (:underline t :foreground ,redpurple))))
83 ;; Gnus faces 83 ;; Gnus faces
84 `(gnus-group-news-1 ((,class (:weight bold :foreground ,vermillion)))) 84 `(gnus-group-news-1 ((,class (:weight bold :foreground ,vermilion))))
85 `(gnus-group-news-1-low ((,class (:foreground ,vermillion)))) 85 `(gnus-group-news-1-low ((,class (:foreground ,vermilion))))
86 `(gnus-group-news-2 ((,class (:weight bold :foreground ,orange)))) 86 `(gnus-group-news-2 ((,class (:weight bold :foreground ,orange))))
87 `(gnus-group-news-2-low ((,class (:foreground ,orange)))) 87 `(gnus-group-news-2-low ((,class (:foreground ,orange))))
88 `(gnus-group-news-3 ((,class (:weight bold :foreground ,skyblue)))) 88 `(gnus-group-news-3 ((,class (:weight bold :foreground ,skyblue))))
@@ -92,8 +92,8 @@ Ansi-Color faces are included."
92 `(gnus-group-news-5 ((,class (:weight bold :foreground ,blue)))) 92 `(gnus-group-news-5 ((,class (:weight bold :foreground ,blue))))
93 `(gnus-group-news-5-low ((,class (:foreground ,blue)))) 93 `(gnus-group-news-5-low ((,class (:foreground ,blue))))
94 `(gnus-group-news-low ((,class (:foreground ,bluegreen)))) 94 `(gnus-group-news-low ((,class (:foreground ,bluegreen))))
95 `(gnus-group-mail-1 ((,class (:weight bold :foreground ,vermillion)))) 95 `(gnus-group-mail-1 ((,class (:weight bold :foreground ,vermilion))))
96 `(gnus-group-mail-1-low ((,class (:foreground ,vermillion)))) 96 `(gnus-group-mail-1-low ((,class (:foreground ,vermilion))))
97 `(gnus-group-mail-2 ((,class (:weight bold :foreground ,orange)))) 97 `(gnus-group-mail-2 ((,class (:weight bold :foreground ,orange))))
98 `(gnus-group-mail-2-low ((,class (:foreground ,orange)))) 98 `(gnus-group-mail-2-low ((,class (:foreground ,orange))))
99 `(gnus-group-mail-3 ((,class (:weight bold :foreground ,skyblue)))) 99 `(gnus-group-mail-3 ((,class (:weight bold :foreground ,skyblue))))
@@ -103,13 +103,13 @@ Ansi-Color faces are included."
103 `(gnus-header-from ((,class (:weight bold :foreground ,blue)))) 103 `(gnus-header-from ((,class (:weight bold :foreground ,blue))))
104 `(gnus-header-subject ((,class (:foreground ,orange)))) 104 `(gnus-header-subject ((,class (:foreground ,orange))))
105 `(gnus-header-name ((,class (:foreground ,skyblue)))) 105 `(gnus-header-name ((,class (:foreground ,skyblue))))
106 `(gnus-header-newsgroups ((,class (:foreground ,vermillion)))) 106 `(gnus-header-newsgroups ((,class (:foreground ,vermilion))))
107 ;; Image-Dired 107 ;; Image-Dired
108 `(image-dired-thumb-flagged ((,class (:background ,vermillion)))) 108 `(image-dired-thumb-flagged ((,class (:background ,vermilion))))
109 `(image-dired-thumb-mark ((,class (:background ,orange)))) 109 `(image-dired-thumb-mark ((,class (:background ,orange))))
110 ;; Message faces 110 ;; Message faces
111 `(message-header-name ((,class (:foreground ,skyblue)))) 111 `(message-header-name ((,class (:foreground ,skyblue))))
112 `(message-header-cc ((,class (:foreground ,vermillion)))) 112 `(message-header-cc ((,class (:foreground ,vermilion))))
113 `(message-header-other ((,class (:foreground ,bluegreen)))) 113 `(message-header-other ((,class (:foreground ,bluegreen))))
114 `(message-header-subject ((,class (:foreground ,orange)))) 114 `(message-header-subject ((,class (:foreground ,orange))))
115 `(message-header-to ((,class (:weight bold :foreground ,blue)))) 115 `(message-header-to ((,class (:weight bold :foreground ,blue))))
@@ -122,8 +122,8 @@ Ansi-Color faces are included."
122 :slant unspecified :underline ,redpurple)))) 122 :slant unspecified :underline ,redpurple))))
123 ;; ANSI color 123 ;; ANSI color
124 `(ansi-color-black ((,class (:background "black" :foreground "black")))) 124 `(ansi-color-black ((,class (:background "black" :foreground "black"))))
125 `(ansi-color-red ((,class (:background ,vermillion 125 `(ansi-color-red ((,class (:background ,vermilion
126 :foreground ,vermillion)))) 126 :foreground ,vermilion))))
127 `(ansi-color-green ((,class (:background ,bluegreen 127 `(ansi-color-green ((,class (:background ,bluegreen
128 :foreground ,bluegreen)))) 128 :foreground ,bluegreen))))
129 `(ansi-color-yellow ((,class (:background ,yellow :foreground ,yellow)))) 129 `(ansi-color-yellow ((,class (:background ,yellow :foreground ,yellow))))
@@ -134,8 +134,8 @@ Ansi-Color faces are included."
134 `(ansi-color-white ((,class (:background "gray90" :foreground "gray90")))) 134 `(ansi-color-white ((,class (:background "gray90" :foreground "gray90"))))
135 `(ansi-color-bright-black ((,class (:background "black" 135 `(ansi-color-bright-black ((,class (:background "black"
136 :foreground "black")))) 136 :foreground "black"))))
137 `(ansi-color-bright-red ((,class (:background ,vermillion 137 `(ansi-color-bright-red ((,class (:background ,vermilion
138 :foreground ,vermillion)))) 138 :foreground ,vermilion))))
139 `(ansi-color-bright-green ((,class (:background ,bluegreen 139 `(ansi-color-bright-green ((,class (:background ,bluegreen
140 :foreground ,bluegreen)))) 140 :foreground ,bluegreen))))
141 `(ansi-color-bright-yellow ((,class (:background ,yellow 141 `(ansi-color-bright-yellow ((,class (:background ,yellow
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index db27bd225dd..0796965a9ba 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -5551,7 +5551,7 @@
5551 (cperl-next-interpolated-REx-1): Likewise. 5551 (cperl-next-interpolated-REx-1): Likewise.
5552 "\C-c\C-x", "\C-c\C-y", "\C-c\C-v": New keybinding for these functions. 5552 "\C-c\C-x", "\C-c\C-y", "\C-c\C-v": New keybinding for these functions.
5553 Perl/Regexp menu: 3 new entries for `cperl-next-interpolated-REx'. 5553 Perl/Regexp menu: 3 new entries for `cperl-next-interpolated-REx'.
5554 (cperl-praise): Mention finded interpolated RExen. 5554 (cperl-praise): Mention finding interpolated RExen.
5555 5555
5556 After 5.19: 5556 After 5.19:
5557 (cperl-init-faces): Highlight %$foo, @$foo too. 5557 (cperl-init-faces): Highlight %$foo, @$foo too.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 9aa4caedfe5..8a21c291e72 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -22575,7 +22575,7 @@
22575 22575
225762009-06-28 Juri Linkov <juri@jurta.org> 225762009-06-28 Juri Linkov <juri@jurta.org>
22577 22577
22578 * help-fns.el (describe-function-1): Correctly locate adviced 22578 * help-fns.el (describe-function-1): Correctly locate advised
22579 functions in hyperlink (Bug#2438). 22579 functions in hyperlink (Bug#2438).
22580 22580
225812009-06-28 Chong Yidong <cyd@stupidchicken.com> 225812009-06-28 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 85f8cdd7b0a..7b57c014d2b 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -10931,7 +10931,7 @@
10931 10931
109322012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com> 109322012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com>
10933 10933
10934 * vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on 10934 * vc/vc.el (vc-revert, vc-rollback): Don't kill vc-diff buffer on
10935 revert (Bug#11488). 10935 revert (Bug#11488).
10936 10936
109372012-05-29 Juri Linkov <juri@jurta.org> 109372012-05-29 Juri Linkov <juri@jurta.org>
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index 7803fc7f0c3..78275f4db3a 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -1546,7 +1546,7 @@
1546 (ede-proj-makefile-dependencies): Update pattern rule so that 1546 (ede-proj-makefile-dependencies): Update pattern rule so that
1547 resulting parsers are also byte-compiled. 1547 resulting parsers are also byte-compiled.
1548 (semantic-ede-grammar-compiler-bovine) 1548 (semantic-ede-grammar-compiler-bovine)
1549 (semantic-ede-source-grammar-wisent): Remove .elc from gargage 1549 (semantic-ede-source-grammar-wisent): Remove .elc from garbage
1550 pattern, since this is already covered by the elisp compiler. 1550 pattern, since this is already covered by the elisp compiler.
1551 (project-compile-target): Add compatibility code for Emacs 23, 1551 (project-compile-target): Add compatibility code for Emacs 23,
1552 which does not have `byte-recompile-file'. 1552 which does not have `byte-recompile-file'.
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 1b424bc6d0c..5aaa5b2687c 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -35,7 +35,7 @@
35;; SOURCE always keep in the order of .c, .h, the other stuff. 35;; SOURCE always keep in the order of .c, .h, the other stuff.
36 36
37;;; Things to do 37;;; Things to do
38;; makefile-fill-paragraph -- refill a macro w/ backslashes 38;; makefile-fill-paragraph -- refill a macro with backslashes
39;; makefile-insert-macro -- insert "foo = " 39;; makefile-insert-macro -- insert "foo = "
40 40
41 41
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 64f26516222..398e08a1a9d 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -43,7 +43,7 @@
43(autoload 'ede-proj-target-scheme "ede/proj-scheme" 43(autoload 'ede-proj-target-scheme "ede/proj-scheme"
44 "Target class for a group of lisp files." nil nil) 44 "Target class for a group of lisp files." nil nil)
45(autoload 'ede-proj-target-makefile-miscelaneous "ede/proj-misc" 45(autoload 'ede-proj-target-makefile-miscelaneous "ede/proj-misc"
46 "Target class for a group of miscellaneous w/ a special makefile." nil nil) 46 "Target class for a group of miscellaneous with a special makefile." nil nil)
47(autoload 'ede-proj-target-makefile-program "ede/proj-prog" 47(autoload 'ede-proj-target-makefile-program "ede/proj-prog"
48 "Target class for building a program." nil nil) 48 "Target class for building a program." nil nil)
49(autoload 'ede-proj-target-makefile-archive "ede/proj-archive" 49(autoload 'ede-proj-target-makefile-archive "ede/proj-archive"
@@ -67,7 +67,7 @@
67 "Target class for a group of lisp files.") 67 "Target class for a group of lisp files.")
68(eieio-defclass-autoload 'ede-proj-target-makefile-miscelaneous '(ede-proj-target-makefile) 68(eieio-defclass-autoload 'ede-proj-target-makefile-miscelaneous '(ede-proj-target-makefile)
69 "ede/proj-misc" 69 "ede/proj-misc"
70 "Target class for a group of miscellaneous w/ a special makefile.") 70 "Target class for a group of miscellaneous with a special makefile.")
71(eieio-defclass-autoload 'ede-proj-target-makefile-program '(ede-proj-target-makefile-objectcode) 71(eieio-defclass-autoload 'ede-proj-target-makefile-program '(ede-proj-target-makefile-objectcode)
72 "ede/proj-prog" 72 "ede/proj-prog"
73 "Target class for building a program.") 73 "Target class for building a program.")
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index de6936ad1a8..75fde2043cb 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -195,7 +195,7 @@ other meta-variable based on this name.")
195 "Add the current buffer into a project. 195 "Add the current buffer into a project.
196_FILE is ignored. 196_FILE is ignored.
197OT is the object target. DIR is the directory to start in." 197OT is the object target. DIR is the directory to start in."
198 (let* ((target (if ede-object (error "Already associated w/ a target") 198 (let* ((target (if ede-object (error "Already associated with a target")
199 (let ((amf (project-am-load default-directory))) 199 (let ((amf (project-am-load default-directory)))
200 (if (not amf) (error "No project file")) 200 (if (not amf) (error "No project file"))
201 (completing-read "Target: " 201 (completing-read "Target: "
@@ -231,7 +231,7 @@ OT is the object target. DIR is the directory to start in."
231 (setq ede-object nil)) 231 (setq ede-object nil))
232 232
233(cl-defmethod project-edit-file-target ((obj project-am-target)) 233(cl-defmethod project-edit-file-target ((obj project-am-target))
234 "Edit the target associated w/ this file." 234 "Edit the target associated with this file."
235 (find-file (concat (oref obj path) "Makefile.am")) 235 (find-file (concat (oref obj path) "Makefile.am"))
236 (goto-char (point-min)) 236 (goto-char (point-min))
237 (makefile-move-to-macro (project-am-macro obj)) 237 (makefile-move-to-macro (project-am-macro obj))
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3166279de40..adb47056201 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -186,13 +186,13 @@ during a flush when the cache is given a new value of nil.")
186 "State of the current parse tree.") 186 "State of the current parse tree.")
187 187
188(defmacro semantic-parse-tree-unparseable () 188(defmacro semantic-parse-tree-unparseable ()
189 "Indicate that the current buffer is unparseable. 189 "Indicate that the current buffer is unparsable.
190It is also true that the parse tree will need either updating or 190It is also true that the parse tree will need either updating or
191a rebuild. This state will be changed when the user edits the buffer." 191a rebuild. This state will be changed when the user edits the buffer."
192 '(setq semantic-parse-tree-state 'unparseable)) 192 '(setq semantic-parse-tree-state 'unparseable))
193 193
194(defmacro semantic-parse-tree-unparseable-p () 194(defmacro semantic-parse-tree-unparseable-p ()
195 "Return non-nil if the current buffer has been marked unparseable." 195 "Return non-nil if the current buffer has been marked unparsable."
196 '(eq semantic-parse-tree-state 'unparseable)) 196 '(eq semantic-parse-tree-state 'unparseable))
197 197
198(defmacro semantic-parse-tree-set-needs-update () 198(defmacro semantic-parse-tree-set-needs-update ()
@@ -528,14 +528,14 @@ If the buffer cache is out of date, attempt an incremental reparse.
528If the buffer has not been parsed before, or if the incremental reparse 528If the buffer has not been parsed before, or if the incremental reparse
529fails, then parse the entire buffer. 529fails, then parse the entire buffer.
530If a lexical error had been previously discovered and the buffer 530If a lexical error had been previously discovered and the buffer
531was marked unparseable, then do nothing, and return the cache." 531was marked unparsable, then do nothing, and return the cache."
532 (and 532 (and
533 ;; Is this a semantic enabled buffer? 533 ;; Is this a semantic enabled buffer?
534 (semantic-active-p) 534 (semantic-active-p)
535 ;; Application hooks say the buffer is safe for parsing 535 ;; Application hooks say the buffer is safe for parsing
536 (run-hook-with-args-until-failure 536 (run-hook-with-args-until-failure
537 'semantic--before-fetch-tags-hook) 537 'semantic--before-fetch-tags-hook)
538 ;; If the buffer was previously marked unparseable, 538 ;; If the buffer was previously marked unparsable,
539 ;; then don't waste our time. 539 ;; then don't waste our time.
540 (not (semantic-parse-tree-unparseable-p)) 540 (not (semantic-parse-tree-unparseable-p))
541 ;; The parse tree actually needs to be refreshed 541 ;; The parse tree actually needs to be refreshed
@@ -606,7 +606,7 @@ Does nothing if the current buffer doesn't need reparsing."
606 ;; do them here, then all the bovination hooks are not run, and 606 ;; do them here, then all the bovination hooks are not run, and
607 ;; we save lots of time. 607 ;; we save lots of time.
608 (cond 608 (cond
609 ;; If the buffer was previously marked unparseable, 609 ;; If the buffer was previously marked unparsable,
610 ;; then don't waste our time. 610 ;; then don't waste our time.
611 ((semantic-parse-tree-unparseable-p) 611 ((semantic-parse-tree-unparseable-p)
612 nil) 612 nil)
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index af7da9cc634..ef372b5d8b2 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -67,7 +67,7 @@ Return the string representing the compound name.")
67 "For a SEQUENCE of tags, all with good names, pick the best one. 67 "For a SEQUENCE of tags, all with good names, pick the best one.
68If SEQUENCE is made up of namespaces, merge the namespaces together. 68If SEQUENCE is made up of namespaces, merge the namespaces together.
69If SEQUENCE has several prototypes, find the non-prototype. 69If SEQUENCE has several prototypes, find the non-prototype.
70If SEQUENCE has some items w/ no type information, find the one with a type. 70If SEQUENCE has some items with no type information, find the one with a type.
71If SEQUENCE is all prototypes, or has no prototypes, get the first one. 71If SEQUENCE is all prototypes, or has no prototypes, get the first one.
72Optional TAGCLASS indicates to restrict the return to only 72Optional TAGCLASS indicates to restrict the return to only
73tags of TAGCLASS." 73tags of TAGCLASS."
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index d4ce20589e6..5e08413a96d 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1344,7 +1344,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef."
1344 :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) 1344 :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t)
1345 ;; A function post-const is funky. Try stuff 1345 ;; A function post-const is funky. Try stuff
1346 :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) 1346 :methodconst-flag (if (member "const" (nth 6 tokenpart)) t)
1347 ;; prototypes are functions w/ no body 1347 ;; prototypes are functions with no body
1348 :prototype-flag (if (nth 8 tokenpart) t) 1348 :prototype-flag (if (nth 8 tokenpart) t)
1349 ;; Pure virtual 1349 ;; Pure virtual
1350 :pure-virtual-flag (if (eq (nth 8 tokenpart) :pure-virtual-flag) t) 1350 :pure-virtual-flag (if (eq (nth 8 tokenpart) :pure-virtual-flag) t)
@@ -2015,7 +2015,7 @@ have to be wrapped in that namespace."
2015 (setq txt (concat txt (format "%S" arg))) 2015 (setq txt (concat txt (format "%S" arg)))
2016 (setq sv (cdr sv))) 2016 (setq sv (cdr sv)))
2017 2017
2018 ;; This is optional, and potentially fraught w/ errors. 2018 ;; This is optional, and potentially fraught with errors.
2019 (condition-case nil 2019 (condition-case nil
2020 (dolist (lt sv) 2020 (dolist (lt sv)
2021 (setq txt (concat txt " " (semantic-lex-token-text lt)))) 2021 (setq txt (concat txt " " (semantic-lex-token-text lt))))
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index dc270603a0c..00fe081acb5 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -667,7 +667,7 @@ Similar to `minibuffer-contents' when completing in the minibuffer."
667 ) 667 )
668 (delete-overlay semantic-complete-inline-overlay) 668 (delete-overlay semantic-complete-inline-overlay)
669 (setq semantic-complete-inline-overlay nil) 669 (setq semantic-complete-inline-overlay nil)
670 ;; DONT restore the window configuration if we just 670 ;; DON'T restore the window configuration if we just
671 ;; switched windows! 671 ;; switched windows!
672 (when (eq buf (current-buffer)) 672 (when (eq buf (current-buffer))
673 (set-window-configuration wc)) 673 (set-window-configuration wc))
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index f0e1d9f0294..fa608c7c461 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -275,7 +275,7 @@ For instance: /home/<username>/.semanticdb/!usr!include!BROWSE"
275 (let ((ans nil) 275 (let ((ans nil)
276 (efcn (symbol-function 'ebrowse-show-progress))) 276 (efcn (symbol-function 'ebrowse-show-progress)))
277 (fset 'ebrowse-show-progress (lambda (&rest _junk) nil)) 277 (fset 'ebrowse-show-progress (lambda (&rest _junk) nil))
278 (unwind-protect ;; Protect against errors w/ ebrowse 278 (unwind-protect ; Protect against errors with ebrowse
279 (setq ans (list B (ebrowse-read))) 279 (setq ans (list B (ebrowse-read)))
280 ;; These items must always happen 280 ;; These items must always happen
281 (erase-buffer) 281 (erase-buffer)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 3012af41c55..e9d5aaa1777 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1277,7 +1277,7 @@ associated with that tag should be loaded into a buffer."
1277;;; Specialty Search Routines 1277;;; Specialty Search Routines
1278(defun semanticdb-find-tags-external-children-of-type 1278(defun semanticdb-find-tags-external-children-of-type
1279 (type &optional path find-file-match) 1279 (type &optional path find-file-match)
1280 "Search for all tags defined outside of TYPE w/ TYPE as a parent. 1280 "Search for all tags defined outside of TYPE with TYPE as a parent.
1281See `semanticdb-find-translate-path' for details on PATH. 1281See `semanticdb-find-translate-path' for details on PATH.
1282FIND-FILE-MATCH indicates that any time a match is found, the file 1282FIND-FILE-MATCH indicates that any time a match is found, the file
1283associated with that tag should be loaded into a buffer." 1283associated with that tag should be loaded into a buffer."
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 144e2ce0187..fe510c371e3 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -330,7 +330,7 @@ This mode provides a nice context menu on the include statements."
330 ) 330 )
331 )) 331 ))
332 332
333 ;; @TODO - if not a tag w/ a position, we need to get one. How? 333 ;; @TODO - if not a tag with a position, we need to get one. How?
334 334
335 (when (semantic-tag-with-position-p tag) 335 (when (semantic-tag-with-position-p tag)
336 (let ((ol (semantic-decorate-tag tag 336 (let ((ol (semantic-decorate-tag tag
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 4efc283520f..d752ecdf38a 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -40,7 +40,7 @@
40;; of themselves that can be edited w/out affecting the definition of 40;; of themselves that can be edited w/out affecting the definition of
41;; that tag. 41;; that tag.
42;; 42;;
43;; 2. Tags w/ positioned children could have a property of an 43;; 2. Tags with positioned children could have a property of an
44;; overlay marking the region in themselves that contain the 44;; overlay marking the region in themselves that contain the
45;; children. This could be used to better improve splicing near 45;; children. This could be used to better improve splicing near
46;; the beginning and end of the child lists. 46;; the beginning and end of the child lists.
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 2d6f26919d7..e53dd9104ad 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -396,7 +396,7 @@ Uses `semantic-idle-work-for-on-buffer' to do the work."
396 (semanticdb-save-all-db-idle) 396 (semanticdb-save-all-db-idle)
397 ) 397 )
398 398
399 ;; Done w/ processing 399 ;; Done with processing
400 nil)))) 400 nil))))
401 401
402 ;; Done 402 ;; Done
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 50d7c8adf14..45964a1a17d 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -577,7 +577,7 @@ such as `public' or `private'."
577 (if (semantic-tag-file-name TAG) 577 (if (semantic-tag-file-name TAG)
578 ;; If it has a filename, just go with it... 578 ;; If it has a filename, just go with it...
579 (setq copyslots (cons TAG copyslots)) 579 (setq copyslots (cons TAG copyslots))
580 ;; Otherwise, copy the tag w/ the guessed filename. 580 ;; Otherwise, copy the tag with the guessed filename.
581 (setq copyslots (cons (semantic-tag-copy TAG nil fname) 581 (setq copyslots (cons (semantic-tag-copy TAG nil fname)
582 copyslots))) 582 copyslots)))
583 ) 583 )
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 013864f81c0..1cb5d5b04a7 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -51,7 +51,7 @@ Display the references in `semantic-symref-results-mode'."
51 (let ((ct (semantic-current-tag))) 51 (let ((ct (semantic-current-tag)))
52 ;; Must have a tag... 52 ;; Must have a tag...
53 (when (not ct) (error "Place cursor inside tag to be searched for")) 53 (when (not ct) (error "Place cursor inside tag to be searched for"))
54 ;; Check w/ user. 54 ;; Check with user.
55 (when (not (y-or-n-p (format "Find references for %s? " 55 (when (not (y-or-n-p (format "Find references for %s? "
56 (semantic-tag-name ct)))) 56 (semantic-tag-name ct))))
57 (error "Quit")) 57 (error "Quit"))
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index 96d1de5a26c..bcded23aec6 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -133,7 +133,7 @@ symbol whose value is such a string."
133 semantic-minor-mode-alist)))) 133 semantic-minor-mode-alist))))
134 (semantic-mode-line-update) 134 (semantic-mode-line-update)
135 135
136 ;; Semantic minor modes don't work w/ Desktop restore. 136 ;; Semantic minor modes don't work with Desktop restore.
137 ;; This line will disable this minor mode from being restored 137 ;; This line will disable this minor mode from being restored
138 ;; by Desktop. 138 ;; by Desktop.
139 (when (boundp 'desktop-minor-mode-handlers) 139 (when (boundp 'desktop-minor-mode-handlers)
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index a25d1441f1f..c264ebaa70a 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -29,7 +29,8 @@
29;; 29;;
30;;; Origins: 30;;; Origins:
31;; 31;;
32;; Document was first written w/ cparse, a custom regexp based c parser. 32;; Document was first written with cparse, a custom regexp based c
33;; parser.
33;; 34;;
34;; Document was then ported to cedet/semantic using sformat (super 35;; Document was then ported to cedet/semantic using sformat (super
35;; format) as the templating engine. 36;; format) as the templating engine.
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 7d4539dcb42..f218f1c6e9d 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -219,7 +219,7 @@ Return nil if nothing was extracted."
219 ;; With a name, do the insertion. 219 ;; With a name, do the insertion.
220 (let ((subdict (srecode-dictionary-add-section-dictionary 220 (let ((subdict (srecode-dictionary-add-section-dictionary
221 dict (oref ins object-name)))) 221 dict (oref ins object-name))))
222 (error "Need to implement include w/ name extractor") 222 (error "Need to implement include with name extractor")
223 ;; Recurse into the new template while no errors. 223 ;; Recurse into the new template while no errors.
224 (while (condition-case nil 224 (while (condition-case nil
225 (progn 225 (progn
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index ea7fda004e7..c5ceb89d2dc 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -43,8 +43,8 @@
43 43
44;;; The SEMANTIC TAG inserter 44;;; The SEMANTIC TAG inserter
45;; 45;;
46;; Put a tag into the dictionary that can be used w/ arbitrary 46;; Put a tag into the dictionary that can be used with arbitrary
47;; lisp expressions. 47;; Lisp expressions.
48 48
49(defclass srecode-semantic-tag (srecode-dictionary-compound-value) 49(defclass srecode-semantic-tag (srecode-dictionary-compound-value)
50 ((prime :initarg :prime 50 ((prime :initarg :prime
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 3f9bc28e0b0..3bddb93b64a 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2265,8 +2265,8 @@ buffer, otherwise stop after the first error."
2265 (unless (and sym (or (boundp sym) (fboundp sym))) 2265 (unless (and sym (or (boundp sym) (fboundp sym)))
2266 ;; Find out how we spell-check this word. 2266 ;; Find out how we spell-check this word.
2267 (unless (or 2267 (unless (or
2268 ;; All caps w/ option th, or s tacked on the end 2268 ;; All caps with option th, or s tacked on the
2269 ;; for pluralization or number. 2269 ;; end for pluralization or number.
2270 (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word) 2270 (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word)
2271 (looking-at "}") ; a keymap expression 2271 (looking-at "}") ; a keymap expression
2272 ) 2272 )
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 9e2bd106cb3..6dc47000fa5 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -659,7 +659,7 @@ Optional argument BACKEND specifies the VC backend to use for cloning
659the package's repository; this is only possible if NAME-OR-URL is a URL, 659the package's repository; this is only possible if NAME-OR-URL is a URL,
660a string. If BACKEND is omitted or nil, the function 660a string. If BACKEND is omitted or nil, the function
661uses `package-vc-heuristic-alist' to guess the backend. 661uses `package-vc-heuristic-alist' to guess the backend.
662Note that by default, a source package will be prioritised over a 662Note that by default, a source package will be prioritized over a
663regular package, but it will not remove a source package." 663regular package, but it will not remove a source package."
664 (interactive 664 (interactive
665 (progn 665 (progn
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index 89c24758cb8..64231f365e2 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -11075,7 +11075,8 @@
11075 stay at your current version. It seems fairly stable though. 11075 stay at your current version. It seems fairly stable though.
11076 That changed? erc-buffer-name handling was completely rewritten, 11076 That changed? erc-buffer-name handling was completely rewritten,
11077 and erc-buffer-list local variable handling removed. 11077 and erc-buffer-list local variable handling removed.
11078 Simplifies alot of code. Poke at it. read the diff. report bug/send patches! 11078 Simplifies a lot of code. Poke at it. Read the diff. Report
11079 bug/send patches!
11079 11080
11080 * erc.el: * Added variable listing when /set is used without args 11081 * erc.el: * Added variable listing when /set is used without args
11081 11082
@@ -11448,7 +11449,7 @@
114482001-10-03 Mario Lang <mlang@delysid.org> 114492001-10-03 Mario Lang <mlang@delysid.org>
11449 11450
11450 * erc.el: 11451 * erc.el:
11451 * Removed alot of (progn ...) where they were not necessary 11452 * Removed a lot of (progn ...) where they were not necessary
11452 * Changed some (if ...) without else part to (when ...) 11453 * Changed some (if ...) without else part to (when ...)
11453 * Some (while ...) to use (dolist ...) 11454 * Some (while ...) to use (dolist ...)
11454 * Fix for completion popup generating tracebacks. 11455 * Fix for completion popup generating tracebacks.
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index bb928fc5fb0..950922ea7f8 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -552,7 +552,7 @@ See the variable `eshell-kill-processes-on-exit'."
552 (setq sigs (cdr sigs)))))) 552 (setq sigs (cdr sigs))))))
553 553
554(defun eshell-query-kill-processes () 554(defun eshell-query-kill-processes ()
555 "Kill processes belonging to the current Eshell buffer, possibly w/ query." 555 "Kill processes belonging to the current Eshell buffer, possibly with query."
556 (when (and eshell-kill-processes-on-exit 556 (when (and eshell-kill-processes-on-exit
557 eshell-process-list) 557 eshell-process-list)
558 (save-window-excursion 558 (save-window-excursion
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index e8291cfe6f7..ebd0adf2e25 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1446,7 +1446,7 @@ will be computed and used."
1446 (mml-insert-empty-tag 'part 1446 (mml-insert-empty-tag 'part
1447 'type type 1447 'type type
1448 ;; icicles redefines read-file-name and returns a 1448 ;; icicles redefines read-file-name and returns a
1449 ;; string w/ text properties :-/ 1449 ;; string with text properties :-/
1450 'filename (substring-no-properties file) 1450 'filename (substring-no-properties file)
1451 'disposition (or disposition "attachment") 1451 'disposition (or disposition "attachment")
1452 'description description) 1452 'description description)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index eb6a071bf4a..97d20cca151 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2766,7 +2766,7 @@ return that value."
2766 (cond 2766 (cond
2767 ;; nil means do nothing 2767 ;; nil means do nothing
2768 ((eq nil feedmail-date-generator) nil) 2768 ((eq nil feedmail-date-generator) nil)
2769 ;; t is the same a using the function feedmail-default-date-generator, so let it and recurse 2769 ;; t is the same as using the function feedmail-default-date-generator, so let it and recurse
2770 ((eq t feedmail-date-generator) 2770 ((eq t feedmail-date-generator)
2771 (let ((feedmail-date-generator (feedmail-default-date-generator maybe-file))) 2771 (let ((feedmail-date-generator (feedmail-default-date-generator maybe-file)))
2772 (feedmail-fiddle-date maybe-file))) 2772 (feedmail-fiddle-date maybe-file)))
@@ -2822,7 +2822,7 @@ probably not appropriate for you."
2822 (cond 2822 (cond
2823 ;; nil means do nothing 2823 ;; nil means do nothing
2824 ((eq nil feedmail-message-id-generator) nil) 2824 ((eq nil feedmail-message-id-generator) nil)
2825 ;; t is the same a using the function feedmail-default-message-id-generator, so let it and recurse 2825 ;; t is the same as using the function feedmail-default-message-id-generator, so let it and recurse
2826 ((eq t feedmail-message-id-generator) 2826 ((eq t feedmail-message-id-generator)
2827 (let ((feedmail-message-id-generator (feedmail-default-message-id-generator maybe-file))) 2827 (let ((feedmail-message-id-generator (feedmail-default-message-id-generator maybe-file)))
2828 (feedmail-fiddle-message-id maybe-file))) 2828 (feedmail-fiddle-message-id maybe-file)))
@@ -2864,7 +2864,7 @@ probably not appropriate for you."
2864 (cond 2864 (cond
2865 ;; nil means do nothing 2865 ;; nil means do nothing
2866 ((eq nil feedmail-x-mailer-line) nil) 2866 ((eq nil feedmail-x-mailer-line) nil)
2867 ;; t is the same a using the function feedmail-default-x-mailer-generator, so let it and recurse 2867 ;; t is the same as using the function feedmail-default-x-mailer-generator, so let it and recurse
2868 ((eq t feedmail-x-mailer-line) 2868 ((eq t feedmail-x-mailer-line)
2869 (let ((feedmail-x-mailer-line (feedmail-default-x-mailer-generator))) 2869 (let ((feedmail-x-mailer-line (feedmail-default-x-mailer-generator)))
2870 (feedmail-fiddle-x-mailer))) 2870 (feedmail-fiddle-x-mailer)))
diff --git a/lisp/mail/rfc6068.el b/lisp/mail/rfc6068.el
index 54035b66981..4863f3582c3 100644
--- a/lisp/mail/rfc6068.el
+++ b/lisp/mail/rfc6068.el
@@ -43,9 +43,9 @@ string instead of decoding as utf-8."
43 43
44(defun rfc6068-parse-mailto-url (mailto-url) 44(defun rfc6068-parse-mailto-url (mailto-url)
45 "Parse MAILTO-URL, and return an alist of header-name, header-value pairs. 45 "Parse MAILTO-URL, and return an alist of header-name, header-value pairs.
46MAILTO-URL should be a RFC 6068 (mailto) compliant url. A cons cell w/ a 46MAILTO-URL should be a RFC 6068 (mailto) compliant url. A cons cell with a
47key of `Body' is a special case and is considered a header for this purpose. 47key of `Body' is a special case and is considered a header for this purpose.
48The returned alist is intended for use w/ the `compose-mail' interface. 48The returned alist is intended for use with the `compose-mail' interface.
49Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., &amp; -> &), before 49Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., &amp; -> &), before
50calling this function." 50calling this function."
51 (let ((case-fold-search t) 51 (let ((case-fold-search t)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e3372a6ff47..2421b283e6b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2599,7 +2599,7 @@ is greater than zero; otherwise, show it in full."
2599 "Handle a \"Mail-Followup-To\" header field with an unknown mailing list. 2599 "Handle a \"Mail-Followup-To\" header field with an unknown mailing list.
2600Ask the user whether to add that list name to `mail-mailing-lists'." 2600Ask the user whether to add that list name to `mail-mailing-lists'."
2601 ;; FIXME s-r not needed? Use rmail-get-header? 2601 ;; FIXME s-r not needed? Use rmail-get-header?
2602 ;; We have not narrowed to the headers at ths point? 2602 ;; We have not narrowed to the headers at this point?
2603 (save-restriction 2603 (save-restriction
2604 (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t))) 2604 (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t)))
2605 (when mail-followup-to 2605 (when mail-followup-to
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 98f46a3af55..558785de149 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1350,7 +1350,7 @@ buffer."
1350 nesting))) 1350 nesting)))
1351 1351
1352(defun sc-add-citation-level () 1352(defun sc-add-citation-level ()
1353 "Add a citation level for nested citation style w/ coercion." 1353 "Add a citation level for nested citation style with coercion."
1354 (let* ((nesting (sc-guess-nesting)) 1354 (let* ((nesting (sc-guess-nesting))
1355 (citation (make-string (1+ (length nesting)) 1355 (citation (make-string (1+ (length nesting))
1356 (string-to-char sc-citation-delimiter))) 1356 (string-to-char sc-citation-delimiter)))
diff --git a/lisp/man.el b/lisp/man.el
index 9dd247cc31e..3802362da09 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -331,7 +331,7 @@ This regexp should not start with a `^' character.")
331;; This used to have leading space [ \t]*, but was removed because it 331;; This used to have leading space [ \t]*, but was removed because it
332;; causes false page splits on an occasional NAME with leading space 332;; causes false page splits on an occasional NAME with leading space
333;; inside a manpage. And `Man-heading-regexp' doesn't have [ \t]* anyway. 333;; inside a manpage. And `Man-heading-regexp' doesn't have [ \t]* anyway.
334(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry fo.*$" 334(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry for.*$"
335 "Regular expression describing first heading on a manpage. 335 "Regular expression describing first heading on a manpage.
336This regular expression should start with a `^' character.") 336This regular expression should start with a `^' character.")
337 337
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 6cc76db8df1..1491a4645aa 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -10556,7 +10556,7 @@
10556 * org-element.el (org-element-paragraph-separate): Fix comments in 10556 * org-element.el (org-element-paragraph-separate): Fix comments in
10557 paragraph separator regexp. Optimize it. 10557 paragraph separator regexp. Optimize it.
10558 10558
10559 * org-element.el: Update code commets. 10559 * org-element.el: Update code comments.
10560 10560
10561 * org.el (org-mark-subtree): Fix bug when marking subtree with 10561 * org.el (org-mark-subtree): Fix bug when marking subtree with
10562 point on an inlinetask. Refactor code. 10562 point on an inlinetask. Refactor code.
@@ -24341,7 +24341,7 @@
243412010-07-19 Bernt Hansen <bernt@norang.ca> 243412010-07-19 Bernt Hansen <bernt@norang.ca>
24342 24342
24343 * org.el (org-time-string-to-absolute): Ignore cyclic repeater 24343 * org.el (org-time-string-to-absolute): Ignore cyclic repeater
24344 when displaying items on todays agenda date. 24344 when displaying items on today's agenda date.
24345 24345
243462010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 243462010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
24347 24347
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c2d7fc309d4..9555d21b00a 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1238,7 +1238,7 @@ This docstring appeases checkdoc, that's all."
1238 :request-dispatcher (funcall spread #'eglot-handle-request) 1238 :request-dispatcher (funcall spread #'eglot-handle-request)
1239 :on-shutdown #'eglot--on-shutdown 1239 :on-shutdown #'eglot--on-shutdown
1240 initargs)) 1240 initargs))
1241 (cancelled nil) 1241 (canceled nil)
1242 (tag (make-symbol "connected-catch-tag"))) 1242 (tag (make-symbol "connected-catch-tag")))
1243 (when server-info 1243 (when server-info
1244 (jsonrpc--debug server "Running language server: %s" 1244 (jsonrpc--debug server "Running language server: %s"
@@ -1277,7 +1277,7 @@ This docstring appeases checkdoc, that's all."
1277 :workspaceFolders (eglot-workspace-folders server)) 1277 :workspaceFolders (eglot-workspace-folders server))
1278 :success-fn 1278 :success-fn
1279 (eglot--lambda ((InitializeResult) capabilities serverInfo) 1279 (eglot--lambda ((InitializeResult) capabilities serverInfo)
1280 (unless cancelled 1280 (unless canceled
1281 (push server 1281 (push server
1282 (gethash project eglot--servers-by-project)) 1282 (gethash project eglot--servers-by-project))
1283 (setf (eglot--capabilities server) capabilities) 1283 (setf (eglot--capabilities server) capabilities)
@@ -1315,13 +1315,13 @@ in project `%s'."
1315 (when tag (throw tag t)))) 1315 (when tag (throw tag t))))
1316 :timeout eglot-connect-timeout 1316 :timeout eglot-connect-timeout
1317 :error-fn (eglot--lambda ((ResponseError) code message) 1317 :error-fn (eglot--lambda ((ResponseError) code message)
1318 (unless cancelled 1318 (unless canceled
1319 (jsonrpc-shutdown server) 1319 (jsonrpc-shutdown server)
1320 (let ((msg (format "%s: %s" code message))) 1320 (let ((msg (format "%s: %s" code message)))
1321 (if tag (throw tag `(error . ,msg)) 1321 (if tag (throw tag `(error . ,msg))
1322 (eglot--error msg))))) 1322 (eglot--error msg)))))
1323 :timeout-fn (lambda () 1323 :timeout-fn (lambda ()
1324 (unless cancelled 1324 (unless canceled
1325 (jsonrpc-shutdown server) 1325 (jsonrpc-shutdown server)
1326 (let ((msg (format "Timed out after %s seconds" 1326 (let ((msg (format "Timed out after %s seconds"
1327 eglot-connect-timeout))) 1327 eglot-connect-timeout)))
@@ -1338,7 +1338,7 @@ in project `%s'."
1338 (jsonrpc-name server)) 1338 (jsonrpc-name server))
1339 nil) 1339 nil)
1340 (_ server))) 1340 (_ server)))
1341 (quit (jsonrpc-shutdown server) (setq cancelled 'quit))) 1341 (quit (jsonrpc-shutdown server) (setq canceled 'quit)))
1342 (setq tag nil)))) 1342 (setq tag nil))))
1343 1343
1344(defun eglot--inferior-bootstrap (name contact &optional connect-args) 1344(defun eglot--inferior-bootstrap (name contact &optional connect-args)
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 00507a3c1af..655dd6a5d94 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -276,7 +276,7 @@ START, END and COMMENT-START are regular expressions. A block is
276defined as text surrounded by START and END. 276defined as text surrounded by START and END.
277 277
278As a special case, START may be a list of the form (COMPLEX-START 278As a special case, START may be a list of the form (COMPLEX-START
279MDATA-SELECTOR), where COMPLEX-START is a regexp w/ multiple parts and 279MDATA-SELECTOR), where COMPLEX-START is a regexp with multiple parts and
280MDATA-SELECTOR an integer that specifies which sub-match is the proper 280MDATA-SELECTOR an integer that specifies which sub-match is the proper
281place to adjust point, before calling `hs-forward-sexp-func'. Point 281place to adjust point, before calling `hs-forward-sexp-func'. Point
282is adjusted to the beginning of the specified match. For example, 282is adjusted to the beginning of the specified match. For example,
@@ -576,7 +576,7 @@ property of an overlay."
576 (save-match-data (not (nth 8 (syntax-ppss)))))) 576 (save-match-data (not (nth 8 (syntax-ppss))))))
577 577
578(defun hs-forward-sexp (match-data arg) 578(defun hs-forward-sexp (match-data arg)
579 "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' w/ ARG. 579 "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' with ARG.
580Original match data is restored upon return." 580Original match data is restored upon return."
581 (save-match-data 581 (save-match-data
582 (set-match-data match-data) 582 (set-match-data match-data)
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index f87230bd2f5..58cb48f1829 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -155,7 +155,7 @@ which case it will be used to compose the new symbol as per the
155third argument of `compose-region'.") 155third argument of `compose-region'.")
156 156
157(defun prettify-symbols-default-compose-p (start end _match) 157(defun prettify-symbols-default-compose-p (start end _match)
158 "Return non-nil iff the symbol MATCH should be composed. 158 "Return non-nil if the symbol MATCH should be composed.
159The symbol starts at position START and ends at position END. 159The symbol starts at position START and ends at position END.
160This is the default for `prettify-symbols-compose-predicate' 160This is the default for `prettify-symbols-compose-predicate'
161which is suitable for most programming languages such as C or Lisp." 161which is suitable for most programming languages such as C or Lisp."
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 310a9be4f6e..e5458e6a07f 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -7719,7 +7719,7 @@ nil otherwise."
7719 (setq match t) 7719 (setq match t)
7720 (setq elm nil)) 7720 (setq elm nil))
7721 (setq elm (cdr elm))))) 7721 (setq elm (cdr elm)))))
7722 ;; If this is a test just for exact match, return nil ot t 7722 ;; If this is a test just for exact match, return nil or t
7723 (if (and (equal flag 'lambda) (not (equal match 't))) 7723 (if (and (equal flag 'lambda) (not (equal match 't)))
7724 nil 7724 nil
7725 match)))) 7725 match))))
diff --git a/lisp/subr.el b/lisp/subr.el
index a42b61d9b61..261ec512d89 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2584,7 +2584,7 @@ Uses the `derived-mode-parent' property of the symbol to trace backwards."
2584(defun major-mode-restore (&optional avoided-modes) 2584(defun major-mode-restore (&optional avoided-modes)
2585 "Restore major mode earlier suspended with `major-mode-suspend'. 2585 "Restore major mode earlier suspended with `major-mode-suspend'.
2586If there was no earlier suspended major mode, then fallback to `normal-mode', 2586If there was no earlier suspended major mode, then fallback to `normal-mode',
2587tho trying to avoid AVOIDED-MODES." 2587though trying to avoid AVOIDED-MODES."
2588 (if major-mode--suspended 2588 (if major-mode--suspended
2589 (funcall (prog1 major-mode--suspended 2589 (funcall (prog1 major-mode--suspended
2590 (kill-local-variable 'major-mode--suspended))) 2590 (kill-local-variable 'major-mode--suspended)))
diff --git a/lisp/url/ChangeLog.1 b/lisp/url/ChangeLog.1
index 2f7813e64cd..1b5ddc1e768 100644
--- a/lisp/url/ChangeLog.1
+++ b/lisp/url/ChangeLog.1
@@ -366,7 +366,7 @@
366 * url.el, url-queue.el, url-parse.el, url-http.el, url-future.el: 366 * url.el, url-queue.el, url-parse.el, url-http.el, url-future.el:
367 * url-dav.el, url-cookie.el: Use cl-lib. 367 * url-dav.el, url-cookie.el: Use cl-lib.
368 * url-util.el, url-privacy.el, url-nfs.el, url-misc.el, url-methods.el: 368 * url-util.el, url-privacy.el, url-nfs.el, url-misc.el, url-methods.el:
369 * url-gw.el, url-file.el, url-expand.el: Dont use CL. 369 * url-gw.el, url-file.el, url-expand.el: Don't use CL.
370 370
3712012-06-30 Glenn Morris <rgm@gnu.org> 3712012-06-30 Glenn Morris <rgm@gnu.org>
372 372
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index a4345c7d7e2..c41835e19f2 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -1192,7 +1192,7 @@ variable `vc-rcs-release' is set to the returned value."
1192(defun vc-rcs-parse (&optional buffer) 1192(defun vc-rcs-parse (&optional buffer)
1193 "Parse current buffer, presumed to be in RCS-style masterfile format. 1193 "Parse current buffer, presumed to be in RCS-style masterfile format.
1194Optional arg BUFFER specifies another buffer to parse. Return an alist 1194Optional arg BUFFER specifies another buffer to parse. Return an alist
1195of two elements, w/ keys `headers' and `revisions' and values in turn 1195of two elements, with keys `headers' and `revisions' and values in turn
1196sub-alists. For `headers', the values unless otherwise specified are 1196sub-alists. For `headers', the values unless otherwise specified are
1197strings and the keys are: 1197strings and the keys are:
1198 1198
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 1ec09d0a818..a00ca453ca4 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -11988,7 +11988,7 @@
11988 11988
11989 * cmds.c (nonundocount): New global variable. 11989 * cmds.c (nonundocount): New global variable.
11990 (keys_of_cmds): Initialize it. 11990 (keys_of_cmds): Initialize it.
11991 (Fself_insert_command): Use it to combine upto 20 sequential chars 11991 (Fself_insert_command): Use it to combine up to 20 sequential chars
11992 into a single undo entry, just like the Qself_insert_command code in 11992 into a single undo entry, just like the Qself_insert_command code in
11993 keyboard.c does. 11993 keyboard.c does.
11994 Call frame_make_pointer_invisible, also like the Qself_insert_command 11994 Call frame_make_pointer_invisible, also like the Qself_insert_command
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index cb373803a05..7f77c0ca077 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -14132,7 +14132,7 @@
14132 (coding_set_destination): Return how many bytes 14132 (coding_set_destination): Return how many bytes
14133 coding->destination was relocated. 14133 coding->destination was relocated.
14134 (CODING_DECODE_CHAR, CODING_ENCODE_CHAR, CODING_CHAR_CHARSET) 14134 (CODING_DECODE_CHAR, CODING_ENCODE_CHAR, CODING_CHAR_CHARSET)
14135 (CODING_CHAR_CHARSET_P): Adjust for the avove changes. 14135 (CODING_CHAR_CHARSET_P): Adjust for the above changes.
14136 14136
141372011-12-05 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) 141372011-12-05 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change)
14138 14138
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index effdf8a7acf..c0e3523c648 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -3155,7 +3155,7 @@
3155 3155
3156 * xdisp.c (resize_mini_window): Don't resize if 3156 * xdisp.c (resize_mini_window): Don't resize if
3157 Vmax_mini_window_height is nil. Otherwise, use a default if 3157 Vmax_mini_window_height is nil. Otherwise, use a default if
3158 Vmax_mini_window_height is not ot a number. 3158 Vmax_mini_window_height is not a number.
3159 (syms_of_xdisp): Extend documentation of Vmax_mini_window_height. 3159 (syms_of_xdisp): Extend documentation of Vmax_mini_window_height.
3160 3160
31611999-08-25 Alexandre Oliva <oliva@dcc.unicamp.br> 31611999-08-25 Alexandre Oliva <oliva@dcc.unicamp.br>
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 1c74180f15c..440142757ec 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -422,7 +422,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
422 case DBUS_TYPE_STRING: 422 case DBUS_TYPE_STRING:
423 case DBUS_TYPE_OBJECT_PATH: 423 case DBUS_TYPE_OBJECT_PATH:
424 case DBUS_TYPE_SIGNATURE: 424 case DBUS_TYPE_SIGNATURE:
425 /* We dont check the syntax of signature. This will be done by 425 /* We don't check the syntax of signature. This will be done by
426 libdbus. */ 426 libdbus. */
427 if (dtype == DBUS_TYPE_OBJECT_PATH) 427 if (dtype == DBUS_TYPE_OBJECT_PATH)
428 XD_DBUS_VALIDATE_PATH (object) 428 XD_DBUS_VALIDATE_PATH (object)
@@ -748,7 +748,7 @@ xd_append_arg (int dtype, Lisp_Object object, DBusMessageIter *iter)
748 case DBUS_TYPE_STRING: 748 case DBUS_TYPE_STRING:
749 case DBUS_TYPE_OBJECT_PATH: 749 case DBUS_TYPE_OBJECT_PATH:
750 case DBUS_TYPE_SIGNATURE: 750 case DBUS_TYPE_SIGNATURE:
751 /* We dont check the syntax of signature. This will be done 751 /* We don't check the syntax of signature. This will be done
752 by libdbus. */ 752 by libdbus. */
753 if (dtype == DBUS_TYPE_OBJECT_PATH) 753 if (dtype == DBUS_TYPE_OBJECT_PATH)
754 XD_DBUS_VALIDATE_PATH (object) 754 XD_DBUS_VALIDATE_PATH (object)
diff --git a/src/font.h b/src/font.h
index 3475189206f..d36c45a53c4 100644
--- a/src/font.h
+++ b/src/font.h
@@ -220,13 +220,13 @@ enum font_property_index
220#define FONT_WIDTH_FOR_FACE(font) \ 220#define FONT_WIDTH_FOR_FACE(font) \
221 font_style_symbolic (font, FONT_WIDTH_INDEX, true) 221 font_style_symbolic (font, FONT_WIDTH_INDEX, true)
222 222
223/* Return the numeric weight value corresponding ot the symbol NAME. */ 223/* Return the numeric weight value corresponding to the symbol NAME. */
224#define FONT_WEIGHT_NAME_NUMERIC(name) \ 224#define FONT_WEIGHT_NAME_NUMERIC(name) \
225 (font_style_to_value (FONT_WEIGHT_INDEX, (name), false) >> 8) 225 (font_style_to_value (FONT_WEIGHT_INDEX, (name), false) >> 8)
226/* Return the numeric slant value corresponding ot the symbol NAME. */ 226/* Return the numeric slant value corresponding to the symbol NAME. */
227#define FONT_SLANT_NAME_NUMERIC(name) \ 227#define FONT_SLANT_NAME_NUMERIC(name) \
228 (font_style_to_value (FONT_SLANT_INDEX, (name), false) >> 8) 228 (font_style_to_value (FONT_SLANT_INDEX, (name), false) >> 8)
229/* Return the numeric width value corresponding ot the symbol NAME. */ 229/* Return the numeric width value corresponding to the symbol NAME. */
230#define FONT_WIDTH_NAME_NUMERIC(name) \ 230#define FONT_WIDTH_NAME_NUMERIC(name) \
231 (font_style_to_value (FONT_WIDTH_INDEX, (name), false) >> 8) 231 (font_style_to_value (FONT_WIDTH_INDEX, (name), false) >> 8)
232 232
diff --git a/src/itree.c b/src/itree.c
index abd060d6fb8..04fa9e827a2 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -1389,7 +1389,7 @@ itree_iterator_start (struct itree_iterator *iter,
1389 iter->end = end; 1389 iter->end = end;
1390 iter->otick = tree->otick; 1390 iter->otick = tree->otick;
1391 iter->order = order; 1391 iter->order = order;
1392 /* Beware: the `node` field alwyas holds "the next" node to consider. 1392 /* Beware: the `node` field always holds "the next" node to consider.
1393 so it's always "one node ahead" of what the iterator loop sees. 1393 so it's always "one node ahead" of what the iterator loop sees.
1394 In most respects this makes no difference, but we depend on this 1394 In most respects this makes no difference, but we depend on this
1395 detail in `delete_all_overlays` where this allows us to modify 1395 detail in `delete_all_overlays` where this allows us to modify
diff --git a/src/xselect.c b/src/xselect.c
index 9480ac18c1f..a381fa23522 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -967,7 +967,7 @@ x_handle_selection_request (struct selection_input_event *event)
967 x_reply_selection_request. If FOR_MULTIPLE, write out 967 x_reply_selection_request. If FOR_MULTIPLE, write out
968 the data even if conversion fails, using conversion_fail_tag. 968 the data even if conversion fails, using conversion_fail_tag.
969 969
970 Return true iff successful. */ 970 Return true if successful. */
971 971
972static bool 972static bool
973x_convert_selection (Lisp_Object selection_symbol, 973x_convert_selection (Lisp_Object selection_symbol,
diff --git a/src/xsettings.c b/src/xsettings.c
index f1ee84a1a02..00b67539d41 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -766,7 +766,7 @@ parse_settings (unsigned char *prop,
766#ifndef HAVE_PGTK 766#ifndef HAVE_PGTK
767/* Read settings from the XSettings property window on display for DPYINFO. 767/* Read settings from the XSettings property window on display for DPYINFO.
768 Store settings read in SETTINGS. 768 Store settings read in SETTINGS.
769 Return true iff successful. */ 769 Return true if successful. */
770 770
771static bool 771static bool
772read_settings (Display_Info *dpyinfo, struct xsettings *settings) 772read_settings (Display_Info *dpyinfo, struct xsettings *settings)
diff --git a/test/lisp/auth-source-pass-tests.el b/test/lisp/auth-source-pass-tests.el
index 8bcb2739bb3..6e6671efca5 100644
--- a/test/lisp/auth-source-pass-tests.el
+++ b/test/lisp/auth-source-pass-tests.el
@@ -59,7 +59,7 @@
59 "Contains a list of all messages passed to `auth-source-do-debug'.") 59 "Contains a list of all messages passed to `auth-source-do-debug'.")
60 60
61(defun auth-source-pass--have-message-matching (regexp) 61(defun auth-source-pass--have-message-matching (regexp)
62 "Return non-nil iff at least one `auth-source-do-debug' match REGEXP." 62 "Return non-nil if at least one `auth-source-do-debug' match REGEXP."
63 (seq-find (lambda (message) 63 (seq-find (lambda (message)
64 (string-match regexp message)) 64 (string-match regexp message))
65 auth-source-pass--debug-log)) 65 auth-source-pass--debug-log))
@@ -109,7 +109,7 @@ ENTRY, HOSTNAME, USER and PORT are the same as in
109(put 'auth-source-pass-match-entry-p 'ert-explainer #'auth-source-pass--explain-match-entry-p) 109(put 'auth-source-pass-match-entry-p 'ert-explainer #'auth-source-pass--explain-match-entry-p)
110 110
111(defun auth-source-pass--includes-sorted-entries (entries hostname &optional user port) 111(defun auth-source-pass--includes-sorted-entries (entries hostname &optional user port)
112 "Return non-nil iff ENTRIES matching the parameters are found in store. 112 "Return non-nil if ENTRIES matching the parameters are found in store.
113ENTRIES should be sorted from most specific to least specific. 113ENTRIES should be sorted from most specific to least specific.
114 114
115HOSTNAME, USER and PORT are passed unchanged to 115HOSTNAME, USER and PORT are passed unchanged to
@@ -157,7 +157,7 @@ result is ordered the same way as the suffixes."
157 (auth-source-pass--generate-entry-suffixes hostname user port)))) 157 (auth-source-pass--generate-entry-suffixes hostname user port))))
158 158
159(defun auth-source-pass-match-entry-p (entry hostname &optional user port) 159(defun auth-source-pass-match-entry-p (entry hostname &optional user port)
160 "Return non-nil iff an ENTRY matching the parameters is found in store. 160 "Return non-nil if an ENTRY matching the parameters is found in store.
161 161
162HOSTNAME, USER and PORT are passed unchanged to 162HOSTNAME, USER and PORT are passed unchanged to
163`auth-source-pass--matching-entries'." 163`auth-source-pass--matching-entries'."
@@ -166,7 +166,7 @@ HOSTNAME, USER and PORT are passed unchanged to
166 (auth-source-pass--matching-entries hostname user port))) 166 (auth-source-pass--matching-entries hostname user port)))
167 167
168(defun auth-source-pass-match-any-entry-p (hostname &optional user port) 168(defun auth-source-pass-match-any-entry-p (hostname &optional user port)
169 "Return non-nil iff there is at least one entry matching the parameters. 169 "Return non-nil if there is at least one entry matching the parameters.
170 170
171HOSTNAME, USER and PORT are passed unchanged to 171HOSTNAME, USER and PORT are passed unchanged to
172`auth-source-pass--matching-entries'." 172`auth-source-pass--matching-entries'."
diff --git a/test/lisp/cedet/srecode/fields-tests.el b/test/lisp/cedet/srecode/fields-tests.el
index 292ac4e3b5e..c9e0d4601b9 100644
--- a/test/lisp/cedet/srecode/fields-tests.el
+++ b/test/lisp/cedet/srecode/fields-tests.el
@@ -66,7 +66,7 @@ It is filled with some text."
66 66
67 (when (and (overlayp (oref f overlay)) 67 (when (and (overlayp (oref f overlay))
68 (not (overlay-get (oref f overlay) 'srecode-init-only))) 68 (not (overlay-get (oref f overlay) 'srecode-init-only)))
69 (error "Field creation overlay is not tagged w/ init flag")) 69 (error "Field creation overlay is not tagged with init flag"))
70 70
71 (srecode-overlaid-activate f) 71 (srecode-overlaid-activate f)
72 72
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 558799286f5..c808e6350ea 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -407,7 +407,7 @@
407 :session dbus--test-service 407 :session dbus--test-service
408 '(:array (:dict-entry :string "string" :boolean t :boolean t))) 408 '(:array (:dict-entry :string "string" :boolean t :boolean t)))
409 :type 'wrong-type-argument) 409 :type 'wrong-type-argument)
410 ;; The first element ist not of a basic type. 410 ;; The first element is not of a basic type.
411 (should-error 411 (should-error
412 (dbus-check-arguments 412 (dbus-check-arguments
413 :session dbus--test-service 413 :session dbus--test-service
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index dc4d3af6999..13248a36509 100644
--- a/test/lisp/vc/vc-tests.el
+++ b/test/lisp/vc/vc-tests.el
@@ -127,7 +127,7 @@ Don't set it globally, the functions should be let-bound.")
127 127
128(defun vc-test--create-repo-function (backend) 128(defun vc-test--create-repo-function (backend)
129 "Run the `vc-create-repo' backend function. 129 "Run the `vc-create-repo' backend function.
130For backends which dont support it, it is emulated." 130For backends which don't support it, it is emulated."
131 131
132 (cond 132 (cond
133 ((eq backend 'CVS) 133 ((eq backend 'CVS)
diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el
index 9092f040c80..03925d4d2e8 100644
--- a/test/src/comp-resources/comp-test-funcs.el
+++ b/test/src/comp-resources/comp-test-funcs.el
@@ -211,10 +211,10 @@
211 (comp-tests-err-arith-f) 211 (comp-tests-err-arith-f)
212 (arith-error (concat "arith-error " 212 (arith-error (concat "arith-error "
213 (error-message-string err) 213 (error-message-string err)
214 " catched")) 214 " caught"))
215 (error (concat "error " 215 (error (concat "error "
216 (error-message-string err) 216 (error-message-string err)
217 " catched")))) 217 " caught"))))
218(defun comp-tests-condition-case-1-f () 218(defun comp-tests-condition-case-1-f ()
219 ;; Bpushhandler Bpophandler 219 ;; Bpushhandler Bpophandler
220 (condition-case 220 (condition-case
@@ -222,10 +222,10 @@
222 (comp-tests-err-foo-f) 222 (comp-tests-err-foo-f)
223 (arith-error (concat "arith-error " 223 (arith-error (concat "arith-error "
224 (error-message-string err) 224 (error-message-string err)
225 " catched")) 225 " caught"))
226 (error (concat "error " 226 (error (concat "error "
227 (error-message-string err) 227 (error-message-string err)
228 " catched")))) 228 " caught"))))
229(defun comp-tests-catch-f (f) 229(defun comp-tests-catch-f (f)
230 (catch 'foo 230 (catch 'foo
231 (funcall f))) 231 (funcall f)))
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 734b4a0d221..4e512098a3d 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -298,9 +298,9 @@ Check that the resulting binaries do not differ."
298(comp-deftest non-locals () 298(comp-deftest non-locals ()
299 "Test non locals." 299 "Test non locals."
300 (should (string= (comp-tests-condition-case-0-f) 300 (should (string= (comp-tests-condition-case-0-f)
301 "arith-error Arithmetic error catched")) 301 "arith-error Arithmetic error caught"))
302 (should (string= (comp-tests-condition-case-1-f) 302 (should (string= (comp-tests-condition-case-1-f)
303 "error Foo catched")) 303 "error Foo caught"))
304 (should (= (comp-tests-catch-f 304 (should (= (comp-tests-catch-f
305 (lambda () (throw 'foo 3))) 305 (lambda () (throw 'foo 3)))
306 3)) 306 3))
diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el
index bb2f04e8ee1..0e12e4dbd8a 100644
--- a/test/src/eval-tests.el
+++ b/test/src/eval-tests.el
@@ -222,7 +222,7 @@ expressions works for identifiers starting with period."
222 222
223(ert-deftest eval-tests/funcall-with-delayed-message () 223(ert-deftest eval-tests/funcall-with-delayed-message ()
224 ;; Check that `funcall-with-delayed-message' displays its message before 224 ;; Check that `funcall-with-delayed-message' displays its message before
225 ;; its function terminates iff the timeout is short enough. 225 ;; its function terminates if the timeout is short enough.
226 226
227 ;; This also serves as regression test for bug#55628 where a short 227 ;; This also serves as regression test for bug#55628 where a short
228 ;; timeout was rounded up to the next whole second. 228 ;; timeout was rounded up to the next whole second.