mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Code Issues Releases Activity

Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29

Browse Source
This commit is contained in:
Eli Zaretskii 2022-12-01 19:34:32 +02:00
commit 91dba5b066
51 changed files with 108 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.2
View File

@ -23054,8 +23054,8 @@
Fix tests in file-notify-tests.el Fix tests in file-notify-tests.el
* test/automated/file-notify-tests.el: Remove Tramp declarations. * test/automated/file-notify-tests.el: Remove Tramp declarations.
(file-notify-test00-availability): Print remote command w/o Tramp (file-notify-test00-availability): Print remote command without
internal functions. Tramp internal functions.
(file-notify-test02-events, file-notify-test02-events-remote): (file-notify-test02-events, file-notify-test02-events-remote):
Adapt docstring. Adapt docstring.
(file-notify-test03-autorevert): Use `format-message' when (file-notify-test03-autorevert): Use `format-message' when

20
ChangeLog.3
View File

@ -32685,7 +32685,7 @@
* test/README: Mention $EMACS_TEST_DIRECTORY. * test/README: Mention $EMACS_TEST_DIRECTORY.
* test/lisp/image-tests.el (image-tests--emacs-images-directory): * test/lisp/image-tests.el (image-tests--emacs-images-directory):
Use `data-directory', for runs w/o of make. Use `data-directory', for runs without of make.
(image-type/from-filename): Check for `image-load-path'. (image-type/from-filename): Check for `image-load-path'.
2021-03-16 Michael Albinus <michael.albinus@gmx.de> 2021-03-16 Michael Albinus <michael.albinus@gmx.de>
@ -69072,7 +69072,7 @@
2020-08-27 Tino Calancha <tino.calancha@gmail.com> 2020-08-27 Tino Calancha <tino.calancha@gmail.com>
dired: Show broken/circular links w/ different face dired: Show broken/circular links with different face
* lisp/dired.el (dired-broken-symlink): New face. * lisp/dired.el (dired-broken-symlink): New face.
(dired-font-lock-keywords): (dired-font-lock-keywords):
@ -143455,7 +143455,8 @@
2018-12-28 Michael Albinus <michael.albinus@gmx.de> 2018-12-28 Michael Albinus <michael.albinus@gmx.de>
* lisp/net/tramp-sh.el (tramp-set-remote-path): Handle platforms w/o getconf. * lisp/net/tramp-sh.el (tramp-set-remote-path): Handle platforms
without getconf.
2018-12-27 Paul Eggert <eggert@cs.ucla.edu> 2018-12-27 Paul Eggert <eggert@cs.ucla.edu>
@ -157203,7 +157204,7 @@
Fix file name completion in Tramp Fix file name completion in Tramp
* lisp/net/tramp.el (tramp-handle-file-name-directory): Fix case * lisp/net/tramp.el (tramp-handle-file-name-directory): Fix case
of localname starts w/o a slash. of localname starts without a slash.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name): * test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Extend test. Extend test.
@ -177123,7 +177124,7 @@
Mention pcase as a fifth conditional form Mention pcase as a fifth conditional form
* doc/lispref/control.texi (Conditionals): ...here, * doc/lispref/control.texi (Conditionals): ...here,
in first para, w/ xref to "Pattern-Matching Conditional". in first para, with xref to "Pattern-Matching Conditional".
2018-05-27 Thien-Thi Nguyen <ttn@gnu.org> 2018-05-27 Thien-Thi Nguyen <ttn@gnu.org>
@ -192390,7 +192391,7 @@
2017-08-06 Tino Calancha <tino.calancha@gmail.com> 2017-08-06 Tino Calancha <tino.calancha@gmail.com>
Dired w/ eshell-ls: Handle shell wildcards in file name Dired with eshell-ls: Handle shell wildcards in file name
* lisp/eshell/em-ls.el (eshell-ls--insert-directory): * lisp/eshell/em-ls.el (eshell-ls--insert-directory):
Use eshell-extended-glob (Bug#27844). Use eshell-extended-glob (Bug#27844).
@ -192767,7 +192768,7 @@
2017-08-01 Tino Calancha <tino.calancha@gmail.com> 2017-08-01 Tino Calancha <tino.calancha@gmail.com>
Insert subdir content if dir-or-list is a string w/o wildcards Insert subdir content if dir-or-list is a string without wildcards
* lisp/eshell/em-ls.el (eshell-ls--insert-directory): * lisp/eshell/em-ls.el (eshell-ls--insert-directory):
Append '("-d") into 'eshell-ls-dired-initial-args' Append '("-d") into 'eshell-ls-dired-initial-args'
@ -206236,7 +206237,7 @@
2017-03-03 Rolf Ade <rolf@pointsman.de> (tiny change) 2017-03-03 Rolf Ade <rolf@pointsman.de> (tiny change)
sql-mode w/ sqlite: In-memory database sql-mode with sqlite: In-memory database
Enable the usage of an in-memory database. Prior to this, sql-mode w/ Enable the usage of an in-memory database. Prior to this, sql-mode w/
sqlite could only be used with file databases. sqlite could only be used with file databases.
@ -211195,7 +211196,8 @@
2017-01-03 Stefan Monnier <monnier@iro.umontreal.ca> 2017-01-03 Stefan Monnier <monnier@iro.umontreal.ca>
(cl-defstruct): Improve error message for slots w/o value (bug#25312) (cl-defstruct): Improve error message for slots without value
(bug#25312)
* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't signal an error but * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't signal an error but
emit a warning for those coders who forgot to put a default value in emit a warning for those coders who forgot to put a default value in

2
doc/lispref/display.texi
View File

@ -5419,7 +5419,7 @@ before @code{height}.
@c We put all the '@code{(when ...)}' on one line to encourage @c We put all the '@code{(when ...)}' on one line to encourage
@c makeinfo's end-of-sentence heuristics to DTRT. Previously, the dot @c makeinfo's end-of-sentence heuristics to DTRT. Previously, the dot
@c was at eol; the info file ended up w/ two spaces rendered after it. @c was at eol; the info file ended up with two spaces rendered after it.
You can make any display specification conditional. To do that, You can make any display specification conditional. To do that,
package it in another list of the form package it in another list of the form
@code{(when @var{condition} . @var{spec})}. @code{(when @var{condition} . @var{spec})}.

2
lib-src/ChangeLog.1
View File

@ -3661,7 +3661,7 @@
2004-05-07 Thien-Thi Nguyen <ttn@gnu.org> 2004-05-07 Thien-Thi Nguyen <ttn@gnu.org>
* b2m.c (GOOD, BAD): Delete macros. Throughout, * b2m.c (GOOD, BAD): Delete macros. Throughout,
replace w/ `EXIT_SUCCESS' and `EXIT_FAILURE', respectively. replace with `EXIT_SUCCESS' and `EXIT_FAILURE', respectively.
(main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value. (main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value.
* etags.c: Likewise. * etags.c: Likewise.

2
lisp/ChangeLog.10
View File

@ -4788,7 +4788,7 @@
2003-03-10 Thien-Thi Nguyen <ttn@gnu.org> 2003-03-10 Thien-Thi Nguyen <ttn@gnu.org>
* progmodes/scheme.el (scheme-mode-syntax-table): * progmodes/scheme.el (scheme-mode-syntax-table):
Construct w/o using `with-syntax-table'. Construct without using `with-syntax-table'.
2003-03-10 John Paul Wallington <jpw@gnu.org> 2003-03-10 John Paul Wallington <jpw@gnu.org>

9
lisp/ChangeLog.11
View File

@ -212,7 +212,7 @@
2004-12-27 Richard M. Stallman <rms@gnu.org> 2004-12-27 Richard M. Stallman <rms@gnu.org>
* files.el (buffer-save-without-query): New var (buffer-local). * files.el (buffer-save-without-query): New var (buffer-local).
(save-some-buffers): Save those buffers first, w/o asking. (save-some-buffers): Save those buffers first, without asking.
* files.el (insert-directory-ls-version): New variable. * files.el (insert-directory-ls-version): New variable.
(insert-directory): When ls returns an error, test the version (insert-directory): When ls returns an error, test the version
@ -491,7 +491,7 @@
instead of `direction'. Update callers. When `del-count' is instead of `direction'. Update callers. When `del-count' is
non-nil, delete that many characters, otherwise `count' characters non-nil, delete that many characters, otherwise `count' characters
backwards. Insert the newly-replaced string `count' times. backwards. Insert the newly-replaced string `count' times.
(zone-fret): Handle chars w/ width greater than one. (zone-fret): Handle chars with width greater than one.
(zone-fall-through-ws): No longer take window width `ww'. (zone-fall-through-ws): No longer take window width `ww'.
Update callers. Add handling for `char-width' greater than one. Update callers. Add handling for `char-width' greater than one.
(zone-pgm-drip): Update var holding window-end position every cycle. (zone-pgm-drip): Update var holding window-end position every cycle.
@ -3584,7 +3584,8 @@
* startup.el (fancy-splash-tail, normal-splash-screen): * startup.el (fancy-splash-tail, normal-splash-screen):
Update copyright year. Update copyright year.
* shadowfile.el (shadowfile-unload-hook): Set as variable w/ add-hook. * shadowfile.el (shadowfile-unload-hook): Set as variable with
add-hook.
* server.el (server-unload-hook): Set as a variable with add-hook. * server.el (server-unload-hook): Set as a variable with add-hook.
@ -8939,7 +8940,7 @@
(compilation-skip-visited, compilation-context-lines): (compilation-skip-visited, compilation-context-lines):
Declare :version when added to Emacs. Declare :version when added to Emacs.
(compilation-error-regexp-alist-alist): Extend caml and irix. (compilation-error-regexp-alist-alist): Extend caml and irix.
(compilation-setup): Fix if font-locked w/o font-lock-defaults. (compilation-setup): Fix if font-locked without font-lock-defaults.
(compilation-mode-font-lock-keywords): Temporarily undo line as (compilation-mode-font-lock-keywords): Temporarily undo line as
function patch, which wasn't ready. function patch, which wasn't ready.

7
lisp/ChangeLog.12
View File

@ -24499,8 +24499,9 @@
is updated. is updated.
* whitespace.el (whitespace-buffer-leading-cleanup): * whitespace.el (whitespace-buffer-leading-cleanup):
Simplify w/ skip-chars-forward. Simplify with skip-chars-forward.
(whitespace-buffer-trailing-cleanup): Simplify w/ skip-chars-backward. (whitespace-buffer-trailing-cleanup): Simplify with
skip-chars-backward.
* mail/rmail.el (rmail-only-expunge): Fix paren error. * mail/rmail.el (rmail-only-expunge): Fix paren error.
Unconditionally try to leave point at the same old place. Unconditionally try to leave point at the same old place.
@ -31346,7 +31347,7 @@
* facemenu.el (list-colors-print): Print #RRGGBB in default face. * facemenu.el (list-colors-print): Print #RRGGBB in default face.
Remove 1 space before #RRGGBB to not truncate it on terminal Remove 1 space before #RRGGBB to not truncate it on terminal
windows w/o fringes. Remove 1 space between bg and fg examples windows without fringes. Remove 1 space between bg and fg examples
to get more space. to get more space.
(list-colors-duplicates): Replace `and' with `if' for `boundp' to (list-colors-duplicates): Replace `and' with `if' for `boundp' to
avoid byte-compile warnings. avoid byte-compile warnings.

2
lisp/ChangeLog.14
View File

@ -20218,7 +20218,7 @@
2008-02-12 Stefan Monnier <monnier@iro.umontreal.ca> 2008-02-12 Stefan Monnier <monnier@iro.umontreal.ca>
* doc-view.el (doc-view-display): Change file arg to buffer arg, so it * doc-view.el (doc-view-display): Change file arg to buffer arg, so it
works also for buffers w/o buffer-file-name. Update callers. works also for buffers without buffer-file-name. Update callers.
(doc-view-clone-buffer-hook): New fun. (doc-view-clone-buffer-hook): New fun.
(doc-view-mode): Use it for indirect clones. Mark the overlays with (doc-view-mode): Use it for indirect clones. Mark the overlays with
the `doc-view' property so they can be recognized. the `doc-view' property so they can be recognized.

3
lisp/ChangeLog.16
View File

@ -4871,7 +4871,8 @@
2012-10-11 Stefan Monnier <monnier@iro.umontreal.ca> 2012-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (describe-function-1): Handle autoloads w/o docstrings. * help-fns.el (describe-function-1): Handle autoloads without
docstrings.
* emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
changes to the format of load-history. changes to the format of load-history.

3
lisp/ChangeLog.3
View File

@ -4172,7 +4172,8 @@
(next-matching-history-element): Likewise. (next-matching-history-element): Likewise.
(minibuffer-history-search-history): New variable. (minibuffer-history-search-history): New variable.
* simple.el (read-expression-map): New keymap, w/ lisp-complete-symbol. * simple.el (read-expression-map): New keymap, with
lisp-complete-symbol.
(eval-expression, edit-and-eval-command): Use read-expression-map. (eval-expression, edit-and-eval-command): Use read-expression-map.
(repeat-complex-command): Likewise. (repeat-complex-command): Likewise.

3
lisp/ChangeLog.4
View File

@ -7238,7 +7238,8 @@
* ispell.el (ispell-menu-map): Add missing quote in defalias. * ispell.el (ispell-menu-map): Add missing quote in defalias.
(ispell-window-configuration): Initialize to nil. (ispell-window-configuration): Initialize to nil.
* vc-hooks.el (vc-rcs-status): Make work buffer's name start w/ space. * vc-hooks.el (vc-rcs-status): Make work buffer's name start with
space.
* simple.el (completion-setup-function): Insert the mouse help message * simple.el (completion-setup-function): Insert the mouse help message
only if non-nil `window-system'. only if non-nil `window-system'.

2
lisp/ChangeLog.6
View File

@ -1915,7 +1915,7 @@
* menu-bar.el (menu-bar-tools-menu): Delete ediff-doc and * menu-bar.el (menu-bar-tools-menu): Delete ediff-doc and
eregistry items. eregistry items.
* help.el (describe-mode): Handle minor mode w/o mode line indicator. * help.el (describe-mode): Handle minor mode without mode line indicator.
* bibtex.el (bibtex-version): Variable deleted. * bibtex.el (bibtex-version): Variable deleted.
(bibtex-submit-bug-report): Don't use that. (bibtex-submit-bug-report): Don't use that.

5
lisp/ChangeLog.7
View File

@ -1175,7 +1175,7 @@
(speedbar-supported-extension-expressions): Add more extensions. (speedbar-supported-extension-expressions): Add more extensions.
(speedbar-add-supported-extension) (speedbar-add-supported-extension)
(speedbar-add-ignored-path-regexp): Made interactive. (speedbar-add-ignored-path-regexp): Made interactive.
(speedbar-update-flag): Nil w/ no window system. (speedbar-update-flag): Nil with no window system.
(speedbar-file-key-map): Move some key bindings from (speedbar-file-key-map): Move some key bindings from
`speedbar-key-map' to this map. `speedbar-key-map' to this map.
(speedbar-make-specialized-keymap): New function. (speedbar-make-specialized-keymap): New function.
@ -4223,7 +4223,8 @@
Do the right thing when nil is specified as criterion for activeness. Do the right thing when nil is specified as criterion for activeness.
Fix string used to report an invalid item. Fix string used to report an invalid item.
* tmm.el (tmm-get-keymap): Handle new format menu item w/o cache. * tmm.el (tmm-get-keymap): Handle new format menu item without
cache.
(tmm-prompt): If reach an empty menu, get an error. (tmm-prompt): If reach an empty menu, get an error.
1998-04-20 Per Starbäck <starback@update.uu.se> 1998-04-20 Per Starbäck <starback@update.uu.se>

11
lisp/ChangeLog.8
View File

@ -117,7 +117,7 @@
overlays if they interfere. overlays if they interfere.
(compilation-find-file): Make intangible overlays tangible. (compilation-find-file): Make intangible overlays tangible.
* progmodes/hideshow.el: Generally, synch w/ maintainer * progmodes/hideshow.el: Generally, synch with maintainer
version 5.9. version 5.9.
(hs-show-hidden-short-form): Delete var; hard-code uses as `t'. (hs-show-hidden-short-form): Delete var; hard-code uses as `t'.
@ -6715,7 +6715,7 @@
* speedbar.el (speedbar-item-info-file-helper): Add optional arg * speedbar.el (speedbar-item-info-file-helper): Add optional arg
of the file whose info we want to display. of the file whose info we want to display.
(speedbar-easymenu-definition-trailer) Fix list issue w/ customize. (speedbar-easymenu-definition-trailer) Fix list issue with customize.
(speedbar-add-mode-functions-list) Improve doc. (speedbar-add-mode-functions-list) Improve doc.
(speedbar-line-token) New function. (speedbar-line-token) New function.
(speedbar-dired) Fix order of directories in -shown-directories. (speedbar-dired) Fix order of directories in -shown-directories.
@ -9800,8 +9800,8 @@
1998-08-27 Richard Stallman <rms@gnu.org> 1998-08-27 Richard Stallman <rms@gnu.org>
* calendar/cal-tex.el (cal-tex-cursor-filofax-daily): Don't use oddp. * calendar/cal-tex.el (cal-tex-cursor-filofax-daily): Don't use oddp.
* calendar/appt.el (appt-check): Start the appt-mode-string w/ space. * calendar/appt.el (appt-check): Start the appt-mode-string with
Clear appt-mode-string if we don't put something in it. space. Clear appt-mode-string if we don't put something in it.
1998-08-27 Dave Love <fx@gnu.org> 1998-08-27 Dave Love <fx@gnu.org>
@ -9979,7 +9979,8 @@
(speedbar-mode): Set buffer to read only. (speedbar-mode): Set buffer to read only.
(speedbar-temp-buffer-show-function): For Emacs don't call hook (speedbar-temp-buffer-show-function): For Emacs don't call hook
with arguments. with arguments.
(speedbar-stealthy-updates): Do all updates w/ the buffer writable. (speedbar-stealthy-updates): Do all updates with the buffer
writable.
1998-08-19 Dan Nicolaescu <done@ece.arizona.edu> 1998-08-19 Dan Nicolaescu <done@ece.arizona.edu>

8
lisp/ChangeLog.9
View File

@ -1418,13 +1418,13 @@
2001-08-28 Thien-Thi Nguyen <ttn@gnu.org> 2001-08-28 Thien-Thi Nguyen <ttn@gnu.org>
* progmodes/hideshow.el: Update first-line description. * progmodes/hideshow.el: Update first-line description.
Sync comments w/ maintainer version 5.31. Sync comments with maintainer version 5.31.
(hs-isearch-open): Default value now `code'. (hs-isearch-open): Default value now `code'.
Fix docstring to use "code blocks" vs "comment blocks", Fix docstring to use "code blocks" vs "comment blocks",
as opposed to "block" vs "comment". as opposed to "block" vs "comment".
(hs-flag-region): Accept `hs-isearch-open' value (hs-flag-region): Accept `hs-isearch-open' value
of `block' as synonymous w/ `code'. of `block' as synonymous with `code'.
(hs-hide-block-at-point): For code blocks, pass `code' (hs-hide-block-at-point): For code blocks, pass `code'
to `hs-flag-region' instead of `block'. to `hs-flag-region' instead of `block'.
@ -11483,7 +11483,7 @@
2000-09-23 Thien-Thi Nguyen <ttn@gnu.org> 2000-09-23 Thien-Thi Nguyen <ttn@gnu.org>
* progmodes/hideshow.el: Update author email address. * progmodes/hideshow.el: Update author email address.
Generally, sync w/ maintainer version 5.22. Generally, sync with maintainer version 5.22.
(hs-hide-all-non-comment-function): New var. (hs-hide-all-non-comment-function): New var.
(hs-hide-hook, hs-show-hook, hs-minor-mode): Update docstrings. (hs-hide-hook, hs-show-hook, hs-minor-mode): Update docstrings.
(hs-hide-all): Use `hs-hide-all-non-comment-function'. (hs-hide-all): Use `hs-hide-all-non-comment-function'.
@ -17879,7 +17879,7 @@
(speedbar-make-button): Call `speedbar-insert-image-button-maybe'. (speedbar-make-button): Call `speedbar-insert-image-button-maybe'.
(speedbar-directory-buttons): Update path search/expansion. (speedbar-directory-buttons): Update path search/expansion.
(speedbar-make-tag-line): Pay attention to (speedbar-make-tag-line): Pay attention to
`speedbar-indentation-width'. Use more care w/ invisible `speedbar-indentation-width'. Use more care with invisible
properties. properties.
(speedbar-change-expand-button-char): (speedbar-change-expand-button-char):
Call `speedbar-insert-image-button-maybe'. Call `speedbar-insert-image-button-maybe'.

4
lisp/autorevert.el
View File

@ -718,7 +718,7 @@ system.")
(string-equal (string-equal
(file-name-nondirectory file) (file-name-nondirectory file)
(file-name-nondirectory buffer-file-name))) (file-name-nondirectory buffer-file-name)))
;; A buffer w/o a file, like dired. ;; A buffer without a file, like dired.
(null buffer-file-name)) (null buffer-file-name))
(auto-revert-notify-rm-watch) (auto-revert-notify-rm-watch)
;; Restart the timer if it wasn't running. ;; Restart the timer if it wasn't running.
@ -739,7 +739,7 @@ system.")
(string-equal (string-equal
(file-name-nondirectory file1) (file-name-nondirectory file1)
(file-name-nondirectory buffer-file-name))))) (file-name-nondirectory buffer-file-name)))))
;; A buffer w/o a file, like dired. ;; A buffer without a file, like dired.
(and (null buffer-file-name) (and (null buffer-file-name)
(memq action '(created renamed deleted)))) (memq action '(created renamed deleted))))
;; Mark buffer modified. ;; Mark buffer modified.

2
lisp/comint.el
View File

@ -78,7 +78,7 @@
;; ;;
;; Not bound by default in comint-mode (some are in shell mode) ;; Not bound by default in comint-mode (some are in shell mode)
;; comint-run Run a program under comint-mode ;; comint-run Run a program under comint-mode
;; comint-send-invisible Read a line w/o echo, and send to proc ;; comint-send-invisible Read a line without echo, and send to proc
;; comint-dynamic-complete-filename Complete filename at point. ;; comint-dynamic-complete-filename Complete filename at point.
;; comint-dynamic-list-filename-completions List completions in help buffer. ;; comint-dynamic-list-filename-completions List completions in help buffer.
;; comint-replace-by-expanded-filename Expand and complete filename at point; ;; comint-replace-by-expanded-filename Expand and complete filename at point;

2
lisp/emacs-lisp/chart.el
View File

@ -35,7 +35,7 @@
;; anything encapsulated in a nice eieio object. ;; anything encapsulated in a nice eieio object.
;; ;;
;; Current example apps for chart can be accessed via these commands: ;; Current example apps for chart can be accessed via these commands:
;; `chart-file-count' - count files w/ matching extensions ;; `chart-file-count' - count files with matching extensions
;; `chart-space-usage' - display space used by files/directories ;; `chart-space-usage' - display space used by files/directories
;; `chart-emacs-storage' - Emacs storage units used/free (garbage-collect) ;; `chart-emacs-storage' - Emacs storage units used/free (garbage-collect)
;; `chart-emacs-lists' - length of Emacs lists ;; `chart-emacs-lists' - length of Emacs lists

2
lisp/emacs-lisp/package.el
View File

@ -3110,7 +3110,7 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC."
"If non-nil, include packages that don't have a version in `list-packages'.") "If non-nil, include packages that don't have a version in `list-packages'.")
(defvar package-list-unsigned nil (defvar package-list-unsigned nil
"If non-nil, mention in the list which packages were installed w/o signature.") "If non-nil, mention in the list which packages were installed without signature.")
(defvar package--emacs-version-list (version-to-list emacs-version) (defvar package--emacs-version-list (version-to-list emacs-version)
"The value of variable `emacs-version' as a list.") "The value of variable `emacs-version' as a list.")

2
lisp/epg.el
View File

@ -482,7 +482,7 @@ callback data (if any)."
(format " skipped new keys: %d\n" (format " skipped new keys: %d\n"
(epg-import-result-not-imported import-result))) (epg-import-result-not-imported import-result)))
(if (> (epg-import-result-no-user-id import-result) 0) (if (> (epg-import-result-no-user-id import-result) 0)
(format " w/o user IDs: %d\n" (format " without user IDs: %d\n"
(epg-import-result-no-user-id import-result))) (epg-import-result-no-user-id import-result)))
(if (> (epg-import-result-imported import-result) 0) (if (> (epg-import-result-imported import-result) 0)
(concat (format " imported: %d" (concat (format " imported: %d"

3
lisp/gnus/ChangeLog.3
View File

@ -22675,7 +22675,8 @@
* nnspool.el (nnspool-spool-directory): Use news-directory instead * nnspool.el (nnspool-spool-directory): Use news-directory instead
of news-path. of news-path.
* spam-stat.el (spam-stat-unload-hook): Set as a variable w/ add-hook. * spam-stat.el (spam-stat-unload-hook): Set as a variable with
add-hook.
* spam.el: Delete duplicate `provide'. * spam.el: Delete duplicate `provide'.
(spam-unload-hook): Set as a variable with add-hook. (spam-unload-hook): Set as a variable with add-hook.

2
lisp/gnus/gnus-cache.el
View File

@ -137,7 +137,7 @@ it's not cached."
;; If possible, remove group's cache subdirectory. ;; If possible, remove group's cache subdirectory.
(condition-case nil (condition-case nil
;; FIXME: we can detect the error type and warn the user ;; FIXME: we can detect the error type and warn the user
;; of any inconsistencies (articles w/o nov entries?). ;; of any inconsistencies (articles without nov entries?).
;; for now, just be conservative...delete only if safe -- sj ;; for now, just be conservative...delete only if safe -- sj
(delete-directory (file-name-directory overview-file)) (delete-directory (file-name-directory overview-file))
(error)))) (error))))

2
lisp/gnus/message.el
View File

@ -2909,7 +2909,7 @@ Consider adding this function to `message-header-setup-hook'"
"C-c C-f s" #'message-change-subject "C-c C-f s" #'message-change-subject
;; ;;
"C-c C-f x" #'message-cross-post-followup-to "C-c C-f x" #'message-cross-post-followup-to
;; prefix+message-cross-post-followup-to = same w/o cross-post ;; prefix+message-cross-post-followup-to = same without cross-post
"C-c C-f t" #'message-reduce-to-to-cc "C-c C-f t" #'message-reduce-to-to-cc
"C-c C-f a" #'message-add-archive-header "C-c C-f a" #'message-add-archive-header
;; mark inserted text ;; mark inserted text

2
lisp/net/ange-ftp.el
View File

@ -218,7 +218,7 @@
;; ange-ftp-smart-gateway and ange-ftp-smart-gateway-port. ;; ange-ftp-smart-gateway and ange-ftp-smart-gateway-port.
;; ;;
;; Otherwise, if there is an alternate ftp program that implements proxy in ;; Otherwise, if there is an alternate ftp program that implements proxy in
;; a transparent way (i.e. w/o specifying the proxy host), that will ;; a transparent way (i.e. without specifying the proxy host), that will
;; connect you directly to the desired destination host: ;; connect you directly to the desired destination host:
;; Set ange-ftp-gateway-ftp-program-name to that program's name. ;; Set ange-ftp-gateway-ftp-program-name to that program's name.
;; Set ange-ftp-local-host-regexp to a value as stated earlier on. ;; Set ange-ftp-local-host-regexp to a value as stated earlier on.

4
lisp/net/tramp.el
View File

@ -2949,7 +2949,7 @@ They are completed by \"M-x TAB\" only if the current buffer is remote."
(tramp-tramp-file-p (tramp-get-default-directory buffer))) (tramp-tramp-file-p (tramp-get-default-directory buffer)))
(defun tramp-connectable-p (vec-or-filename) (defun tramp-connectable-p (vec-or-filename)
"Check, whether it is possible to connect the remote host w/o side-effects. "Check if it is possible to connect the remote host without side-effects.
This is true, if either the remote host is already connected, or if we are This is true, if either the remote host is already connected, or if we are
not in completion mode." not in completion mode."
(let ((tramp-verbose 0) (let ((tramp-verbose 0)
@ -3999,7 +3999,7 @@ Let-bind it when necessary.")
((not (file-exists-p file1)) nil) ((not (file-exists-p file1)) nil)
((not (file-exists-p file2)) t) ((not (file-exists-p file2)) t)
;; Tramp reads and writes timestamps on second level. So we round ;; Tramp reads and writes timestamps on second level. So we round
;; the timestamps to seconds w/o fractions. ;; the timestamps to seconds without fractions.
;; `time-convert' has been introduced with Emacs 27.1. ;; `time-convert' has been introduced with Emacs 27.1.
((fboundp 'time-convert) ((fboundp 'time-convert)
(time-less-p (time-less-p

12
lisp/obsolete/rfc2368.el
View File

@ -27,7 +27,7 @@
;; ;;
;; -repeat after me: "the colon is not part of the header name..." ;; -repeat after me: "the colon is not part of the header name..."
;; -if w3 becomes part of emacs, then it may make sense to have this ;; -if w3 becomes part of emacs, then it may make sense to have this
;; file depend on w3 -- the maintainer of w3 says merging w/ Emacs ;; file depend on w3 -- the maintainer of w3 says merging with Emacs
;; is planned! ;; is planned!
;; ;;
;; historical note: ;; historical note:
@ -36,8 +36,8 @@
;; ;;
;; acknowledgments: ;; acknowledgments:
;; ;;
;; the functions that deal w/ unhexifying in this file were basically ;; the functions that deal with unhexifying in this file were basically
;; taken from w3 -- i hope to replace them w/ something else soon OR ;; taken from w3 -- i hope to replace them with something else soon OR
;; perhaps if w3 becomes a part of emacs soon, use the functions from w3. ;; perhaps if w3 becomes a part of emacs soon, use the functions from w3.
;;; History: ;;; History:
@ -85,9 +85,9 @@
(defun rfc2368-parse-mailto-url (mailto-url) (defun rfc2368-parse-mailto-url (mailto-url)
"Parse MAILTO-URL, and return an alist of header-name, header-value pairs. "Parse MAILTO-URL, and return an alist of header-name, header-value pairs.
MAILTO-URL should be a RFC 2368 (mailto) compliant url. A cons cell w/ a MAILTO-URL should be a RFC 2368 (mailto) compliant url. A cons cell with a
key of `Body' is a special case and is considered a header for this purpose. key of `Body' is a special case and is considered a header for this purpose.
The returned alist is intended for use w/ the `compose-mail' interface. The returned alist is intended for use with the `compose-mail' interface.
Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., &amp; -> &), before Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., &amp; -> &), before
calling this function." calling this function."
(let ((case-fold-search t) (let ((case-fold-search t)
@ -114,7 +114,7 @@ calling this function."
(rfc2368-unhexify-string header-value)))) (rfc2368-unhexify-string header-value))))
(split-string query "&")))) (split-string query "&"))))
;; deal w/ multiple 'To' recipients ;; deal with multiple 'To' recipients
(if prequery (if prequery
(progn (progn
(setq prequery (rfc2368-unhexify-string prequery)) (setq prequery (rfc2368-unhexify-string prequery))

4
lisp/org/ChangeLog.1
View File

@ -23889,7 +23889,7 @@
2010-11-11 Eric Schulte <schulte.eric@gmail.com> 2010-11-11 Eric Schulte <schulte.eric@gmail.com>
* ob-sqlite.el (org-babel-sqlite-expand-vars): Now inserts string * ob-sqlite.el (org-babel-sqlite-expand-vars): Now inserts string
arguments w/o quotes. arguments without quotes.
2010-11-11 Bernt Hansen <bernt@norang.ca> 2010-11-11 Bernt Hansen <bernt@norang.ca>
@ -23909,7 +23909,7 @@
2010-11-11 Eric Schulte <schulte.eric@gmail.com> 2010-11-11 Eric Schulte <schulte.eric@gmail.com>
* ob-lob.el (org-babel-lob-one-liner-regexp): Fix error in lob * ob-lob.el (org-babel-lob-one-liner-regexp): Fix error in lob
regexp -- it wasn't matching lob lines w/o indices. regexp -- it wasn't matching lob lines without indices.
2010-11-11 Eric Schulte <schulte.eric@gmail.com> 2010-11-11 Eric Schulte <schulte.eric@gmail.com>

2
lisp/play/zone.el
View File

@ -320,7 +320,7 @@ run a specific program. The program must be a member of
(zone-pgm-jitter)) (zone-pgm-jitter))
;;;; putzing w/ case ;;;; putzing with case
;; Faster than `zone-pgm-putz-with-case', but not as good: all ;; Faster than `zone-pgm-putz-with-case', but not as good: all
;; instances of the same letter have the same case, which produces a ;; instances of the same letter have the same case, which produces a

2
lisp/progmodes/antlr-mode.el
View File

@ -1777,7 +1777,7 @@ For AREA and OLD, see `antlr-insert-option-do'."
(skip-chars-forward " \t") (skip-chars-forward " \t")
(if (looking-at "$\\|//") (if (looking-at "$\\|//")
;; just comment after point => skip (+ lines w/ same col comment) ;; just comment after point => skip (+ lines with same col comment)
(let ((same (if (> (match-end 0) (match-beginning 0)) (let ((same (if (> (match-end 0) (match-beginning 0))
(current-column)))) (current-column))))
(beginning-of-line 2) (beginning-of-line 2)

2
lisp/progmodes/asm-mode.el
View File

@ -209,7 +209,7 @@ repeatedly until you are satisfied with the kind of comment."
(indent-according-to-mode) (indent-according-to-mode)
(insert asm-comment-char asm-comment-char ?\ )) (insert asm-comment-char asm-comment-char ?\ ))
;; Nonblank line w/o comment => start a comment at comment-column. ;; Nonblank line without comment => start a comment at comment-column.
;; Also: point before the comment => jump inside. ;; Also: point before the comment => jump inside.
((or (null comment) (< (point) comment)) ((or (null comment) (< (point) comment))
(indent-for-comment)) (indent-for-comment))

2
lisp/progmodes/compile.el
View File

@ -2807,7 +2807,7 @@ This is the value of `next-error-function' in Compilation buffers."
(goto-char (point-min)) (goto-char (point-min))
;; Treat file's found lines in forward order, 1 by 1. ;; Treat file's found lines in forward order, 1 by 1.
(dolist (line (reverse (cddr (compilation--loc->file-struct loc)))) (dolist (line (reverse (cddr (compilation--loc->file-struct loc))))
(when (car line) ; else this is a filename w/o a line# (when (car line) ; else this is a filename without a line#
(compilation-beginning-of-line (- (car line) last -1)) (compilation-beginning-of-line (- (car line) last -1))
(setq last (car line))) (setq last (car line)))
;; Treat line's found columns and store/update a marker for each. ;; Treat line's found columns and store/update a marker for each.

2
lisp/progmodes/scheme.el
View File

@ -361,7 +361,7 @@ See `run-hooks'."
) t) ) t)
"\\>") 1) "\\>") 1)
;; ;;
;; It wouldn't be Scheme w/o named-let. ;; It wouldn't be Scheme without named-let.
'("(let\\s-+\\(\\sw+\\)" '("(let\\s-+\\(\\sw+\\)"
(1 font-lock-function-name-face)) (1 font-lock-function-name-face))
;; ;;

2
lisp/shell.el
View File

@ -71,7 +71,7 @@
;; c-c c-o comint-delete-output Delete last batch of process output ;; c-c c-o comint-delete-output Delete last batch of process output
;; c-c c-r comint-show-output Show last batch of process output ;; c-c c-r comint-show-output Show last batch of process output
;; c-c c-l comint-dynamic-list-input-ring List input history ;; c-c c-l comint-dynamic-list-input-ring List input history
;; comint-send-invisible Read line w/o echo & send to proc ;; comint-send-invisible Read line without echo & send to proc
;; comint-continue-subjob Useful if you accidentally suspend ;; comint-continue-subjob Useful if you accidentally suspend
;; top-level job ;; top-level job
;; comint-mode-hook is the comint mode hook. ;; comint-mode-hook is the comint mode hook.

2
lisp/strokes.el
View File

@ -1151,7 +1151,7 @@ the stroke as a character in some language."
strokes-last-stroke) strokes-last-stroke)
31)))) 31))))
(lift-flag t) (lift-flag t)
(rainbow-chars (list ?R ?O ?Y ?G ?B ?P))) ; ROYGBIV w/o indigo (rainbow-chars (list ?R ?O ?Y ?G ?B ?P))) ; ROYGBIV without indigo
(set-buffer buf) (set-buffer buf)
(erase-buffer) (erase-buffer)
(insert strokes-xpm-header) (insert strokes-xpm-header)

2
lisp/term.el
View File

@ -278,7 +278,7 @@
;; C-c C-h term-dynamic-list-input-ring List input history ;; C-c C-h term-dynamic-list-input-ring List input history
;; ;;
;; Not bound by default in term-mode ;; Not bound by default in term-mode
;; term-send-invisible Read a line w/o echo, and send to proc ;; term-send-invisible Read a line without echo, and send to proc
;; (These are bound in shell-mode) ;; (These are bound in shell-mode)
;; term-dynamic-complete Complete filename at point. ;; term-dynamic-complete Complete filename at point.
;; term-dynamic-list-completions List completions in help buffer. ;; term-dynamic-list-completions List completions in help buffer.

3
lisp/textmodes/reftex.el
View File

@ -2053,7 +2053,8 @@ IGNORE-WORDS List of words which should be removed from the string."
(newname (concat "Fontify-me-" oldname))) (newname (concat "Fontify-me-" oldname)))
(unwind-protect (unwind-protect
(progn (progn
;; Rename buffer temporarily to start w/o space (because of font-lock) ;; Rename buffer temporarily to start without space (because
;; of font-lock)
(rename-buffer newname t) (rename-buffer newname t)
;; Good: we have the indirection functions ;; Good: we have the indirection functions
(set (make-local-variable 'font-lock-fontify-region-function) (set (make-local-variable 'font-lock-fontify-region-function)

4
lisp/vc/vc-rcs.el
View File

@ -683,11 +683,11 @@ Optional arg REVISION is a revision to annotate from."
;; *BEFORE* editing occurs) to start from, but line numbers ;; *BEFORE* editing occurs) to start from, but line numbers
;; change as a result of edits. To DTRT, we apply edits in ;; change as a result of edits. To DTRT, we apply edits in
;; order of descending buffer position so that edits further ;; order of descending buffer position so that edits further
;; down in the buffer occur first w/o corrupting specified ;; down in the buffer occur first without corrupting specified
;; buffer positions of edits occurring towards the beginning of ;; buffer positions of edits occurring towards the beginning of
;; the buffer. In this way we avoid using markers. A pleasant ;; the buffer. In this way we avoid using markers. A pleasant
;; property of this approach is ability to push instructions ;; property of this approach is ability to push instructions
;; onto `path' directly, w/o need to maintain rev boundaries. ;; onto `path' directly, without need to maintain rev boundaries.
(dolist (insn (cdr (assq :insn meta))) (dolist (insn (cdr (assq :insn meta)))
(goto-char (point-min)) (goto-char (point-min))
(forward-line (1- (pop insn))) (forward-line (1- (pop insn)))

2
src/ChangeLog.11
View File

@ -14235,7 +14235,7 @@
ns_alternate_modifier. (Bug#1217) ns_alternate_modifier. (Bug#1217)
* nsmenu.m (EmacsMenu-parseKeyEquiv:, addItemWithWidgetValue:): * nsmenu.m (EmacsMenu-parseKeyEquiv:, addItemWithWidgetValue:):
Display all shortcuts, including those w/o super modifier. Display all shortcuts, including those without super modifier.
* nsfns.m (ns-read-file-name): Fix typo in assignment statement. * nsfns.m (ns-read-file-name): Fix typo in assignment statement.

2
src/ChangeLog.3
View File

@ -14422,7 +14422,7 @@
* s-umips.h: Now include either s-usg5-2-2.h or s-bsd4-3.h * s-umips.h: Now include either s-usg5-2-2.h or s-bsd4-3.h
and then override as needed. and then override as needed.
* m-mips.h: System dependence deleted. * m-mips.h: System dependence deleted.
LD_SWITCH_MACHINE remains w/ options needed on all systems. LD_SWITCH_MACHINE remains with options needed on all systems.
* m-pmax.h: A little of that (LIBS_DEBUG) moved here. * m-pmax.h: A little of that (LIBS_DEBUG) moved here.
No need to undef LIBS_MACHINE. No need to undef LIBS_MACHINE.

3
src/xdisp.c
View File

@ -22616,7 +22616,8 @@ usage: (trace-to-stderr STRING &rest OBJECTS) */)
***********************************************************************/ ***********************************************************************/
/* Return a temporary glyph row holding the glyphs of an overlay arrow. /* Return a temporary glyph row holding the glyphs of an overlay arrow.
Used for non-window-redisplay windows, and for windows w/o left fringe. */ Used for non-window-redisplay windows, and for windows without left
fringe. */
static struct glyph_row * static struct glyph_row *
get_overlay_arrow_glyph_row (struct window *w, Lisp_Object overlay_arrow_string) get_overlay_arrow_glyph_row (struct window *w, Lisp_Object overlay_arrow_string)

2
test/lisp/cedet/semantic-utest.el
View File

@ -593,7 +593,7 @@ INSERTME is the text to be inserted after the deletion."
) )
(ert-deftest semantic-utest-Scheme() (ert-deftest semantic-utest-Scheme()
(skip-unless nil) ;; There is a bug w/ scheme parser. Skip this for now. (skip-unless nil) ;; There is a bug with scheme parser. Skip this for now.
(semantic-utest-generic (semantic-utest-fname "tst.scm") semantic-utest-Scheme-buffer-contents semantic-utest-Scheme-name-contents '("fun2") ";1" ";deleted line") (semantic-utest-generic (semantic-utest-fname "tst.scm") semantic-utest-Scheme-buffer-contents semantic-utest-Scheme-name-contents '("fun2") ";1" ";deleted line")
) )

2
test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
View File

@ -308,7 +308,7 @@
(setq eieio-test-method-order-list (nreverse eieio-test-method-order-list)) (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
(eieio-test-match ans))) (eieio-test-match ans)))
;;; Jan's methodinvoke order w/ multiple inheritance and :after methods. ;;; Jan's methodinvoke order with multiple inheritance and :after methods.
;; ;;
(defclass eitest-Ja () (defclass eitest-Ja ()
()) ())

2
test/lisp/erc/erc-join-tests.el
View File

@ -335,7 +335,7 @@
(start-process "true" (current-buffer) "true") (start-process "true" (current-buffer) "true")
erc-server-current-nick "tester" erc-server-current-nick "tester"
erc-server-announced-name "foo.gnu.chat" erc-server-announced-name "foo.gnu.chat"
;; Assume special case w/o known network ;; Assume special case without known network
erc-networks--id (make-erc-networks--id)) erc-networks--id (make-erc-networks--id))
(set-process-query-on-exit-flag erc-server-process nil) (set-process-query-on-exit-flag erc-server-process nil)
(should-not calls) (should-not calls)

4
test/lisp/filenotify-tests.el
View File

@ -1590,8 +1590,8 @@ the file watch."
(unwind-protect (unwind-protect
(progn (progn
(write-region "any text" nil file-notify--test-tmpfile1 nil 'no-message) (write-region "any text" nil file-notify--test-tmpfile1 nil 'no-message)
;; Some systems, like MS Windows w/o sufficient privileges, do ;; Some systems, like MS Windows without sufficient
;; not allow creation of symbolic links. ;; privileges, do not allow creation of symbolic links.
(condition-case nil (condition-case nil
(make-symbolic-link (make-symbolic-link
file-notify--test-tmpfile1 file-notify--test-tmpfile) file-notify--test-tmpfile1 file-notify--test-tmpfile)

2
test/lisp/net/tramp-archive-tests.el
View File

@ -123,7 +123,7 @@ the origin of the temporary TMPFILE, have no write permissions."
(defun tramp-archive--test-emacs27-p () (defun tramp-archive--test-emacs27-p ()
"Check for Emacs version >= 27.1. "Check for Emacs version >= 27.1.
Some semantics has been changed for there, w/o new functions or Some semantics has been changed for there, without new functions or
variables, so we check the Emacs version directly." variables, so we check the Emacs version directly."
(>= emacs-major-version 27)) (>= emacs-major-version 27))

12
test/lisp/net/tramp-tests.el
View File

@ -6597,20 +6597,20 @@ INPUT, if non-nil, is a string sent to the process."
(defun tramp--test-emacs27-p () (defun tramp--test-emacs27-p ()
"Check for Emacs version >= 27.1. "Check for Emacs version >= 27.1.
Some semantics has been changed for there, w/o new functions or Some semantics has been changed for there, without new functions
variables, so we check the Emacs version directly." or variables, so we check the Emacs version directly."
(>= emacs-major-version 27)) (>= emacs-major-version 27))
(defun tramp--test-emacs28-p () (defun tramp--test-emacs28-p ()
"Check for Emacs version >= 28.1. "Check for Emacs version >= 28.1.
Some semantics has been changed for there, w/o new functions or Some semantics has been changed for there, without new functions
variables, so we check the Emacs version directly." or variables, so we check the Emacs version directly."
(>= emacs-major-version 28)) (>= emacs-major-version 28))
(defun tramp--test-emacs29-p () (defun tramp--test-emacs29-p ()
"Check for Emacs version >= 29.1. "Check for Emacs version >= 29.1.
Some semantics has been changed for there, w/o new functions or Some semantics has been changed for there, without new functions
variables, so we check the Emacs version directly." or variables, so we check the Emacs version directly."
(>= emacs-major-version 29)) (>= emacs-major-version 29))
(defun tramp--test-adb-p () (defun tramp--test-adb-p ()

3
test/manual/cedet/cedet-utests.el
View File

@ -333,7 +333,8 @@ ERRORCONDITION is some error that may have occurred during testing."
"Add into the log that the last item is done. "Add into the log that the last item is done.
Apply NOTES to the doneness of the log. Apply NOTES to the doneness of the log.
Apply ERR if there was an error in previous item. Apply ERR if there was an error in previous item.
Optional argument PRECR indicates to prefix the done msg w/ a newline." Optional argument PRECR indicates to prefix the done message with
a newline."
(if noninteractive (if noninteractive
;; Non-interactive-mode - show a message. ;; Non-interactive-mode - show a message.
(if notes (if notes

3
test/manual/cedet/semantic-tests.el
View File

@ -87,7 +87,8 @@ run the test again")))
(defun semanticdb-test-gnu-global (searchfor &optional standardfile) (defun semanticdb-test-gnu-global (searchfor &optional standardfile)
"Test the GNU Global semanticdb. "Test the GNU Global semanticdb.
Argument SEARCHFOR is the text to search for. Argument SEARCHFOR is the text to search for.
If optional arg STANDARDFILE is non-nil, use a standard file w/ global enabled." If optional arg STANDARDFILE is non-nil, use a standard file with
global enabled."
(interactive "sSearch For Tag: \nP") (interactive "sSearch For Tag: \nP")
(require 'data-debug) (require 'data-debug)

10
test/manual/cedet/tests/testpolymorph.cpp
View File

@ -22,7 +22,7 @@
#include <cmath> #include <cmath>
// Test 1 - Functions w/ prototypes // Test 1 - Functions with prototypes
namespace proto { namespace proto {
int pt_func1(int arg1); int pt_func1(int arg1);
@ -32,7 +32,7 @@ namespace proto {
} }
// Test 2 - Functions w/ different arg lists. // Test 2 - Functions with different arg lists.
namespace fcn_poly { namespace fcn_poly {
int pm_func(void) { int pm_func(void) {
@ -50,7 +50,7 @@ namespace fcn_poly {
} }
// Test 3 - Methods w/ different arg lists. // Test 3 - Methods with different arg lists.
class meth_poly { class meth_poly {
public: public:
int pm_meth(void) { int pm_meth(void) {
@ -68,7 +68,7 @@ class meth_poly {
}; };
// Test 4 - Templates w/ partial specifiers. // Test 4 - Templates with partial specifiers.
namespace template_partial_spec { namespace template_partial_spec {
template <typename T> class test template <typename T> class test
{ {
@ -83,7 +83,7 @@ namespace template_partial_spec {
}; };
} }
// Test 5 - Templates w/ full specialization which may or may not share // Test 5 - Templates with full specialization which may or may not share
// common functions. // common functions.
namespace template_full_spec { namespace template_full_spec {
template <typename T> class test template <typename T> class test

4
test/manual/cedet/tests/testsppreplace.c
View File

@ -66,7 +66,7 @@ int myFcn3 (int a, int b);
MULTI_ARGS(ma_struct, moose, penguin, emu); MULTI_ARGS(ma_struct, moose, penguin, emu);
/* TEST: Macro w/ args, but no body. */ /* TEST: Macro with args, but no body. */
#define NO_BODY(name) #define NO_BODY(name)
NO_BODY(Moose); NO_BODY(Moose);
@ -78,7 +78,7 @@ int not_with_args_fcn NOT_WITH_ARGS
{ {
} }
/* TEST: macro w/ continuation. */ /* TEST: macro with continuation. */
#define WITH_CONT \ #define WITH_CONT \
continuation_symbol continuation_symbol

4
test/manual/cedet/tests/testsppreplaced.c
View File

@ -55,14 +55,14 @@ int myFcn3 (int a, int b);
/* TEST: Multiple args to a macro. */ /* TEST: Multiple args to a macro. */
struct ma_struct { int moose; int penguin; int emu; }; struct ma_struct { int moose; int penguin; int emu; };
/* TEST: Macro w/ args, but no body. */ /* TEST: Macro with args, but no body. */
/* TEST: Not a macro with args, but close. */ /* TEST: Not a macro with args, but close. */
int not_with_args_fcn (moose) int not_with_args_fcn (moose)
{ {
} }
/* TEST: macro w/ continuation. */ /* TEST: macro with continuation. */
int continuation_symbol () { }; int continuation_symbol () { };
/* TEST: macros in a macro - tail processing */ /* TEST: macros in a macro - tail processing */