aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-09-17 16:08:20 -0700
committerPaul Eggert2015-09-17 16:09:39 -0700
commit284c470ef752967fcd8bae6a450dc138462b1e49 (patch)
tree83e8bcfe4c756e741ee9d4ecdf80f6b8d0e73c91
parentd149ff5233805c0a09b6067e0cf27549291cc83a (diff)
downloademacs-284c470ef752967fcd8bae6a450dc138462b1e49.tar.gz
emacs-284c470ef752967fcd8bae6a450dc138462b1e49.zip
Backslash cleanup in Elisp source files
This patch should not change behavior. It typically omits backslashes where they are redundant (e.g., in the string literal "^\$"). In a few places, insert backslashes where they make regular expressions clearer: e.g., replace "^\*" (equivalent to "^*") with "^\\*", which has the same effect as a regular expression. Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs, and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with RCS IDs, as that makes it clearer that the backslash is intended.
-rw-r--r--lisp/allout.el8
-rw-r--r--lisp/bindings.el4
-rw-r--r--lisp/bookmark.el2
-rw-r--r--lisp/calc/calc-help.el2
-rw-r--r--lisp/calendar/todo-mode.el2
-rw-r--r--lisp/cedet/ede/proj-obj.el2
-rw-r--r--lisp/cedet/mode-local.el2
-rw-r--r--lisp/cedet/semantic/tag.el2
-rw-r--r--lisp/cedet/semantic/wisent/comp.el2
-rw-r--r--lisp/cedet/semantic/wisent/wisent.el2
-rw-r--r--lisp/cmuscheme.el4
-rw-r--r--lisp/comint.el2
-rw-r--r--lisp/dabbrev.el2
-rw-r--r--lisp/emacs-lisp/advice.el2
-rw-r--r--lisp/emacs-lisp/avl-tree.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el8
-rw-r--r--lisp/emacs-lisp/check-declare.el2
-rw-r--r--lisp/emacs-lisp/easy-mmode.el2
-rw-r--r--lisp/emacs-lisp/edebug.el8
-rw-r--r--lisp/emacs-lisp/ert-x.el6
-rw-r--r--lisp/emacs-lisp/ert.el12
-rw-r--r--lisp/emacs-lisp/find-func.el2
-rw-r--r--lisp/emacs-lisp/gv.el2
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
-rw-r--r--lisp/emacs-lisp/map-ynp.el4
-rw-r--r--lisp/emacs-lisp/regexp-opt.el2
-rw-r--r--lisp/emacs-lisp/rx.el4
-rw-r--r--lisp/emacs-lisp/shadow.el4
-rw-r--r--lisp/emacs-lisp/smie.el2
-rw-r--r--lisp/emacs-lisp/timer.el2
-rw-r--r--lisp/emulation/edt-mapper.el2
-rw-r--r--lisp/emulation/edt.el24
-rw-r--r--lisp/emulation/viper-cmd.el14
-rw-r--r--lisp/emulation/viper-ex.el4
-rw-r--r--lisp/emulation/viper-init.el6
-rw-r--r--lisp/emulation/viper-macs.el6
-rw-r--r--lisp/emulation/viper-mous.el6
-rw-r--r--lisp/emulation/viper-util.el6
-rw-r--r--lisp/emulation/viper.el2
-rw-r--r--lisp/epg.el2
-rw-r--r--lisp/erc/erc-backend.el2
-rw-r--r--lisp/erc/erc-match.el2
-rw-r--r--lisp/erc/erc-services.el2
-rw-r--r--lisp/erc/erc.el2
-rw-r--r--lisp/eshell/em-hist.el2
-rw-r--r--lisp/eshell/em-ls.el2
-rw-r--r--lisp/eshell/em-unix.el2
-rw-r--r--lisp/eshell/esh-util.el2
-rw-r--r--lisp/expand.el6
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/filenotify.el4
-rw-r--r--lisp/files.el4
-rw-r--r--lisp/filesets.el80
-rw-r--r--lisp/find-cmd.el28
-rw-r--r--lisp/find-dired.el4
-rw-r--r--lisp/find-file.el4
-rw-r--r--lisp/foldout.el2
-rw-r--r--lisp/format.el4
-rw-r--r--lisp/gnus/auth-source.el12
-rw-r--r--lisp/gnus/gnus-art.el14
-rw-r--r--lisp/gnus/gnus-bookmark.el26
-rw-r--r--lisp/gnus/gnus-cus.el2
-rw-r--r--lisp/gnus/gnus-group.el8
-rw-r--r--lisp/gnus/gnus-mlspl.el2
-rw-r--r--lisp/gnus/gnus-registry.el2
-rw-r--r--lisp/gnus/gnus-salt.el2
-rw-r--r--lisp/gnus/gnus-sieve.el8
-rw-r--r--lisp/gnus/gnus-util.el2
-rw-r--r--lisp/gnus/gnus.el8
-rw-r--r--lisp/gnus/message.el6
-rw-r--r--lisp/gnus/mm-decode.el2
-rw-r--r--lisp/gnus/nndoc.el2
-rw-r--r--lisp/gnus/nnheader.el2
-rw-r--r--lisp/gnus/registry.el4
-rw-r--r--lisp/gnus/rfc1843.el4
-rw-r--r--lisp/gnus/rfc2047.el4
-rw-r--r--lisp/help-fns.el2
-rw-r--r--lisp/help.el6
-rw-r--r--lisp/hfy-cmap.el2
-rw-r--r--lisp/htmlfontify.el8
-rw-r--r--lisp/ibuffer.el2
-rw-r--r--lisp/ido.el4
-rw-r--r--lisp/image.el2
-rw-r--r--lisp/info-look.el2
-rw-r--r--lisp/info.el2
-rw-r--r--lisp/international/iso-cvt.el2
-rw-r--r--lisp/international/mule-cmds.el8
-rw-r--r--lisp/international/mule.el4
-rw-r--r--lisp/international/ogonek.el2
-rw-r--r--lisp/international/titdic-cnv.el2
-rw-r--r--lisp/language/japan-util.el8
-rw-r--r--lisp/leim/quail/japanese.el2
-rw-r--r--lisp/leim/quail/latin-alt.el2
-rw-r--r--lisp/leim/quail/latin-ltx.el2
-rw-r--r--lisp/leim/quail/thai.el2
-rw-r--r--lisp/lpr.el2
-rw-r--r--lisp/mail/feedmail.el45
-rw-r--r--lisp/mail/mail-extr.el30
-rw-r--r--lisp/mail/mailclient.el2
-rw-r--r--lisp/mail/mspools.el2
-rw-r--r--lisp/mail/rmail.el6
-rw-r--r--lisp/mail/rmailmm.el12
-rw-r--r--lisp/man.el2
-rw-r--r--lisp/mh-e/mh-alias.el2
-rw-r--r--lisp/mh-e/mh-comp.el4
-rw-r--r--lisp/mh-e/mh-e.el4
-rw-r--r--lisp/mh-e/mh-folder.el2
-rw-r--r--lisp/mh-e/mh-letter.el2
-rw-r--r--lisp/mh-e/mh-mime.el2
-rw-r--r--lisp/mh-e/mh-search.el2
-rw-r--r--lisp/mh-e/mh-utils.el2
-rw-r--r--lisp/mh-e/mh-xface.el2
-rw-r--r--lisp/msb.el2
-rw-r--r--lisp/net/ange-ftp.el8
-rw-r--r--lisp/net/dbus.el40
-rw-r--r--lisp/net/eww.el2
-rw-r--r--lisp/net/gnutls.el6
-rw-r--r--lisp/net/net-utils.el2
-rw-r--r--lisp/net/newst-backend.el6
-rw-r--r--lisp/net/newst-reader.el2
-rw-r--r--lisp/net/rcirc.el2
-rw-r--r--lisp/net/rlogin.el2
-rw-r--r--lisp/net/secrets.el6
-rw-r--r--lisp/net/soap-client.el2
-rw-r--r--lisp/net/tramp-adb.el2
-rw-r--r--lisp/net/tramp-sh.el10
-rw-r--r--lisp/net/tramp.el26
-rw-r--r--lisp/net/zeroconf.el10
-rw-r--r--lisp/org/ob-core.el4
-rw-r--r--lisp/org/ob-dot.el2
-rw-r--r--lisp/org/ob-lilypond.el2
-rw-r--r--lisp/org/ob-lob.el8
-rw-r--r--lisp/org/ob-octave.el4
-rw-r--r--lisp/org/ob-ref.el4
-rw-r--r--lisp/org/ob-sql.el4
-rw-r--r--lisp/org/ob-sqlite.el2
-rw-r--r--lisp/org/ob-tangle.el2
-rw-r--r--lisp/org/org-agenda.el3
-rw-r--r--lisp/org/org-clock.el2
-rw-r--r--lisp/org/org-colview.el4
-rw-r--r--lisp/org/org-element.el20
-rw-r--r--lisp/org/org-footnote.el2
-rw-r--r--lisp/org/org-list.el28
-rw-r--r--lisp/org/org-table.el6
-rw-r--r--lisp/org/org.el62
-rw-r--r--lisp/org/ox-html.el2
-rw-r--r--lisp/org/ox-latex.el52
-rw-r--r--lisp/org/ox-man.el4
-rw-r--r--lisp/org/ox-odt.el38
-rw-r--r--lisp/org/ox-publish.el4
-rw-r--r--lisp/org/ox-texinfo.el40
-rw-r--r--lisp/org/ox.el56
-rw-r--r--lisp/play/doctor.el2
-rw-r--r--lisp/play/gametree.el2
-rw-r--r--lisp/progmodes/ada-mode.el4
-rw-r--r--lisp/progmodes/ada-xref.el8
-rw-r--r--lisp/progmodes/antlr-mode.el30
-rw-r--r--lisp/progmodes/cc-align.el16
-rw-r--r--lisp/progmodes/cc-awk.el6
-rw-r--r--lisp/progmodes/cc-cmds.el14
-rw-r--r--lisp/progmodes/cc-defs.el4
-rw-r--r--lisp/progmodes/cc-engine.el26
-rw-r--r--lisp/progmodes/cc-fonts.el14
-rw-r--r--lisp/progmodes/cc-langs.el42
-rw-r--r--lisp/progmodes/cc-vars.el2
-rw-r--r--lisp/progmodes/cfengine.el4
-rw-r--r--lisp/progmodes/cmacexp.el2
-rw-r--r--lisp/progmodes/compile.el6
-rw-r--r--lisp/progmodes/cperl-mode.el16
-rw-r--r--lisp/progmodes/dcl-mode.el22
-rw-r--r--lisp/progmodes/elisp-mode.el2
-rw-r--r--lisp/progmodes/f90.el22
-rw-r--r--lisp/progmodes/flymake.el8
-rw-r--r--lisp/progmodes/fortran.el8
-rw-r--r--lisp/progmodes/glasses.el4
-rw-r--r--lisp/progmodes/idlw-shell.el12
-rw-r--r--lisp/progmodes/idlwave.el4
-rw-r--r--lisp/progmodes/inf-lisp.el2
-rw-r--r--lisp/progmodes/js.el10
-rw-r--r--lisp/progmodes/m4-mode.el4
-rw-r--r--lisp/progmodes/mantemp.el2
-rw-r--r--lisp/progmodes/perl-mode.el2
-rw-r--r--lisp/progmodes/prog-mode.el4
-rw-r--r--lisp/progmodes/prolog.el6
-rw-r--r--lisp/progmodes/ruby-mode.el6
-rw-r--r--lisp/progmodes/scheme.el2
-rw-r--r--lisp/progmodes/sh-script.el16
-rw-r--r--lisp/progmodes/sql.el14
-rw-r--r--lisp/progmodes/vera-mode.el2
-rw-r--r--lisp/progmodes/verilog-mode.el58
-rw-r--r--lisp/progmodes/vhdl-mode.el74
-rw-r--r--lisp/progmodes/xscheme.el6
-rw-r--r--lisp/ps-print.el8
-rw-r--r--lisp/sort.el2
-rw-r--r--lisp/speedbar.el2
-rw-r--r--lisp/startup.el4
-rw-r--r--lisp/term.el2
-rw-r--r--lisp/textmodes/bibtex.el8
-rw-r--r--lisp/textmodes/conf-mode.el6
-rw-r--r--lisp/textmodes/css-mode.el2
-rw-r--r--lisp/textmodes/ispell.el12
-rw-r--r--lisp/textmodes/makeinfo.el2
-rw-r--r--lisp/textmodes/page-ext.el4
-rw-r--r--lisp/textmodes/refer.el10
-rw-r--r--lisp/textmodes/reftex-cite.el6
-rw-r--r--lisp/textmodes/reftex.el6
-rw-r--r--lisp/textmodes/rst.el4
-rw-r--r--lisp/textmodes/sgml-mode.el2
-rw-r--r--lisp/textmodes/tex-mode.el10
-rw-r--r--lisp/textmodes/texinfmt.el8
-rw-r--r--lisp/textmodes/texinfo.el2
-rw-r--r--lisp/textmodes/texnfo-upd.el18
-rw-r--r--lisp/thingatpt.el2
-rw-r--r--lisp/tutorial.el8
-rw-r--r--lisp/type-break.el2
-rw-r--r--lisp/url/url-cookie.el4
-rw-r--r--lisp/url/url-dav.el2
-rw-r--r--lisp/url/url-gw.el2
-rw-r--r--lisp/url/url-handlers.el4
-rw-r--r--lisp/vc/diff-mode.el4
-rw-r--r--lisp/vc/ediff-diff.el2
-rw-r--r--lisp/vc/ediff-init.el2
-rw-r--r--lisp/vc/ediff-ptch.el4
-rw-r--r--lisp/vc/ediff-util.el18
-rw-r--r--lisp/vc/ediff-wind.el4
-rw-r--r--lisp/vc/ediff.el4
-rw-r--r--lisp/vc/log-edit.el2
-rw-r--r--lisp/vc/vc-annotate.el2
-rw-r--r--lisp/vc/vc-cvs.el4
-rw-r--r--lisp/vc/vc-rcs.el10
-rw-r--r--lisp/vc/vc-svn.el2
-rw-r--r--lisp/vc/vc.el6
-rw-r--r--lisp/vcursor.el4
-rw-r--r--lisp/woman.el8
-rw-r--r--test/automated/ert-x-tests.el4
-rw-r--r--test/automated/icalendar-tests.el10
-rw-r--r--test/etags/el-src/emacs/lisp/progmodes/etags.el2
237 files changed, 916 insertions, 914 deletions
diff --git a/lisp/allout.el b/lisp/allout.el
index f7055734961..bbd69cd8347 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -917,7 +917,7 @@ has been customized to enable this behavior), `allout-mode' will be
917automatically activated. The layout dictated by the value will be used to 917automatically activated. The layout dictated by the value will be used to
918set the initial exposure when `allout-mode' is activated. 918set the initial exposure when `allout-mode' is activated.
919 919
920\*You should not setq-default this variable non-nil unless you want every 920*You should not setq-default this variable non-nil unless you want every
921visited file to be treated as an allout file.* 921visited file to be treated as an allout file.*
922 922
923The value would typically be set by a file local variable. For 923The value would typically be set by a file local variable. For
@@ -1512,7 +1512,7 @@ already associated with a file.
1512 1512
1513It consists of an encrypted random string useful only to verify that a 1513It consists of an encrypted random string useful only to verify that a
1514passphrase entered by the user is effective for decryption. The passphrase 1514passphrase entered by the user is effective for decryption. The passphrase
1515itself is \*not* recorded in the file anywhere, and the encrypted contents 1515itself is *not* recorded in the file anywhere, and the encrypted contents
1516are random binary characters to avoid exposing greater susceptibility to 1516are random binary characters to avoid exposing greater susceptibility to
1517search attacks. 1517search attacks.
1518 1518
@@ -3721,7 +3721,7 @@ Nuances:
3721 (save-match-data 3721 (save-match-data
3722 (let* ((inhibit-field-text-motion t) 3722 (let* ((inhibit-field-text-motion t)
3723 (depth (+ (allout-current-depth) relative-depth)) 3723 (depth (+ (allout-current-depth) relative-depth))
3724 (opening-on-blank (if (looking-at "^\$") 3724 (opening-on-blank (if (looking-at "^$")
3725 (not (setq before nil)))) 3725 (not (setq before nil))))
3726 ;; bunch o vars set while computing ref-topic 3726 ;; bunch o vars set while computing ref-topic
3727 opening-numbered 3727 opening-numbered
@@ -5909,7 +5909,7 @@ file with topics pending encryption is saved, topics pending
5909encryption are encrypted. See `allout-encrypt-unencrypted-on-saves' 5909encryption are encrypted. See `allout-encrypt-unencrypted-on-saves'
5910for auto-encryption specifics. 5910for auto-encryption specifics.
5911 5911
5912\*NOTE WELL* that automatic encryption that happens during saves will 5912*NOTE WELL* that automatic encryption that happens during saves will
5913default to symmetric encryption -- you must deliberately (re)encrypt key-pair 5913default to symmetric encryption -- you must deliberately (re)encrypt key-pair
5914encrypted topics if you want them to continue to use the key-pair cipher. 5914encrypted topics if you want them to continue to use the key-pair cipher.
5915 5915
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 3672812e5a1..8560871694d 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1265,9 +1265,9 @@ if `inhibit-field-text-motion' is non-nil."
1265(define-key abbrev-map "e" 'expand-abbrev) 1265(define-key abbrev-map "e" 'expand-abbrev)
1266(define-key abbrev-map "'" 'expand-abbrev) 1266(define-key abbrev-map "'" 'expand-abbrev)
1267;; (define-key ctl-x-map "\C-a" 'add-mode-abbrev) 1267;; (define-key ctl-x-map "\C-a" 'add-mode-abbrev)
1268;; (define-key ctl-x-map "\+" 'add-global-abbrev) 1268;; (define-key ctl-x-map "+" 'add-global-abbrev)
1269;; (define-key ctl-x-map "\C-h" 'inverse-add-mode-abbrev) 1269;; (define-key ctl-x-map "\C-h" 'inverse-add-mode-abbrev)
1270;; (define-key ctl-x-map "\-" 'inverse-add-global-abbrev) 1270;; (define-key ctl-x-map "-" 'inverse-add-global-abbrev)
1271(define-key esc-map "'" 'abbrev-prefix-mark) 1271(define-key esc-map "'" 'abbrev-prefix-mark)
1272(define-key ctl-x-map "'" 'expand-abbrev) 1272(define-key ctl-x-map "'" 'expand-abbrev)
1273(define-key ctl-x-map "\C-b" 'list-buffers) 1273(define-key ctl-x-map "\C-b" 'list-buffers)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 035148120a4..e9310259e7e 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -138,7 +138,7 @@ This is as opposed to inline text at the top of the buffer."
138 138
139(defconst bookmark-bmenu-inline-header-height 2 139(defconst bookmark-bmenu-inline-header-height 2
140 "Number of lines used for the *Bookmark List* header 140 "Number of lines used for the *Bookmark List* header
141\(only significant when `bookmark-bmenu-use-header-line' is nil\).") 141\(only significant when `bookmark-bmenu-use-header-line' is nil).")
142 142
143(defconst bookmark-bmenu-marks-width 2 143(defconst bookmark-bmenu-marks-width 2
144 "Number of columns (chars) used for the *Bookmark List* marks column, 144 "Number of columns (chars) used for the *Bookmark List* marks column,
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 444bb5ef920..33cb1c1566c 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -386,7 +386,7 @@ C-w Describe how there is no warranty for Calc."
386 (interactive) 386 (interactive)
387 (calc-quit) 387 (calc-quit)
388 (view-emacs-news) 388 (view-emacs-news)
389 (re-search-forward "^\*+ .*\\<Calc\\>" nil t)) 389 (re-search-forward "^\\*+ .*\\<Calc\\>" nil t))
390 390
391(defvar calc-help-long-names '((?b . "binary/business") 391(defvar calc-help-long-names '((?b . "binary/business")
392 (?g . "graphics") 392 (?g . "graphics")
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 2949e3b79b0..527548f78b6 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -4892,7 +4892,7 @@ With nil or omitted CATEGORY, default to the current category."
4892 (widen) 4892 (widen)
4893 (goto-char (point-min)) 4893 (goto-char (point-min))
4894 (setq todo-categories 4894 (setq todo-categories
4895 (if (looking-at "\(\(\"") 4895 (if (looking-at "((\"")
4896 (read (buffer-substring-no-properties 4896 (read (buffer-substring-no-properties
4897 (line-beginning-position) 4897 (line-beginning-position)
4898 (line-end-position))) 4898 (line-end-position)))
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index de06910f75e..34e302d3d2c 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -126,7 +126,7 @@ file.")
126(defvar ede-source-c++ 126(defvar ede-source-c++
127 (ede-sourcecode "ede-source-c++" 127 (ede-sourcecode "ede-source-c++"
128 :name "C++" 128 :name "C++"
129 :sourcepattern "\\.\\(c\\(pp?\\|c\\|xx\\|++\\)\\|C\\\(PP\\)?\\)$" 129 :sourcepattern "\\.\\(c\\(pp?\\|c\\|xx\\|++\\)\\|C\\(PP\\)?\\)$"
130 :auxsourcepattern "\\.\\(hpp?\\|hh?\\|hxx\\|H\\)$" 130 :auxsourcepattern "\\.\\(hpp?\\|hh?\\|hxx\\|H\\)$"
131 :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo")) 131 :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo"))
132 "C++ source code definition.") 132 "C++ source code definition.")
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index edf7647712f..8736a4ff93c 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -604,7 +604,7 @@ PROMPT, INITIAL, HIST, and DEFAULT are the same as for `completing-read'."
604;; 604;;
605(defun overload-docstring-extension (overload) 605(defun overload-docstring-extension (overload)
606 "Return the doc string that augments the description of OVERLOAD." 606 "Return the doc string that augments the description of OVERLOAD."
607 (let ((doc "\n\This function can be overloaded\ 607 (let ((doc "\nThis function can be overloaded\
608 with `define-mode-local-override'.") 608 with `define-mode-local-override'.")
609 (sym (overload-obsoleted-by overload))) 609 (sym (overload-obsoleted-by overload)))
610 (when sym 610 (when sym
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index 6c6616d7009..34fc8ba92ce 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -1212,7 +1212,7 @@ Returns a list of cooked tags.
1212 The parser returns raw tags with positional data START END at the 1212 The parser returns raw tags with positional data START END at the
1213end of the tag data structure (a list for now). We convert it from 1213end of the tag data structure (a list for now). We convert it from
1214that to a cooked state that uses an overlay proxy, that is, a vector 1214that to a cooked state that uses an overlay proxy, that is, a vector
1215\[START END]. 1215[START END].
1216 1216
1217 The raw tag is changed with side effects and maybe expanded in 1217 The raw tag is changed with side effects and maybe expanded in
1218several derived tags when the variable `semantic-tag-expand-function' 1218several derived tags when the variable `semantic-tag-expand-function'
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index 6730e8e5bc7..585c11a05d3 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -915,7 +915,7 @@ An NVARS by NRULES matrix of bits indicating which rules can help
915derive the beginning of the data for each nonterminal. For example, 915derive the beginning of the data for each nonterminal. For example,
916if symbol 5 can be derived as the sequence of symbols 8 3 20, and one 916if symbol 5 can be derived as the sequence of symbols 8 3 20, and one
917of the rules for deriving symbol 8 is rule 4, then the 917of the rules for deriving symbol 8 is rule 4, then the
918\[5 - NTOKENS, 4] bit in FDERIVES is set." 918[5 - NTOKENS, 4] bit in FDERIVES is set."
919 (let (i j k) 919 (let (i j k)
920 (setq fderives (make-vector nvars nil)) 920 (setq fderives (make-vector nvars nil))
921 (setq i 0) 921 (setq i 0)
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index fb77cb36947..4c5274198dd 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -364,7 +364,7 @@ automaton has only one entry point."
364 364
365- START specify the start symbol (nonterminal) used by the parser as 365- START specify the start symbol (nonterminal) used by the parser as
366 its goal. It defaults to the start symbol defined in the grammar 366 its goal. It defaults to the start symbol defined in the grammar
367 \(see also `wisent-compile-grammar')." 367 (see also `wisent-compile-grammar')."
368 (run-hooks 'wisent-pre-parse-hook) 368 (run-hooks 'wisent-pre-parse-hook)
369 (let* ((actions (aref automaton 0)) 369 (let* ((actions (aref automaton 0))
370 (gotos (aref automaton 1)) 370 (gotos (aref automaton 1))
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 7c5819d2126..724fc2bb7b0 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -430,7 +430,7 @@ in the next one.")
430 (file-name-nondirectory file-name))) 430 (file-name-nondirectory file-name)))
431 (comint-send-string (scheme-proc) (concat "(load \"" 431 (comint-send-string (scheme-proc) (concat "(load \""
432 file-name 432 file-name
433 "\"\)\n"))) 433 "\")\n")))
434 434
435(defun scheme-compile-file (file-name) 435(defun scheme-compile-file (file-name)
436 "Compile a Scheme file FILE-NAME in the inferior Scheme process." 436 "Compile a Scheme file FILE-NAME in the inferior Scheme process."
@@ -444,7 +444,7 @@ in the next one.")
444 (file-name-nondirectory file-name))) 444 (file-name-nondirectory file-name)))
445 (comint-send-string (scheme-proc) (concat "(compile-file \"" 445 (comint-send-string (scheme-proc) (concat "(compile-file \""
446 file-name 446 file-name
447 "\"\)\n"))) 447 "\")\n")))
448 448
449 449
450(defvar scheme-buffer nil "The current scheme process buffer. 450(defvar scheme-buffer nil "The current scheme process buffer.
diff --git a/lisp/comint.el b/lisp/comint.el
index ead2757e6e8..e70fe88baf7 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1581,7 +1581,7 @@ Go to the history element by the absolute history position HIST-POS."
1581(defun comint-within-quotes (beg end) 1581(defun comint-within-quotes (beg end)
1582 "Return t if the number of quotes between BEG and END is odd. 1582 "Return t if the number of quotes between BEG and END is odd.
1583Quotes are single and double." 1583Quotes are single and double."
1584 (let ((countsq (comint-how-many-region "\\(^\\|[^\\\\]\\)\'" beg end)) 1584 (let ((countsq (comint-how-many-region "\\(^\\|[^\\\\]\\)'" beg end))
1585 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) 1585 (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end)))
1586 (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) 1586 (or (= (mod countsq 2) 1) (= (mod countdq 2) 1))))
1587 1587
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 42d7fd369ed..b32d115d499 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -120,7 +120,7 @@
120 120
121Example: Set this to \"\\\\$\" for programming languages 121Example: Set this to \"\\\\$\" for programming languages
122in which variable names may appear with or without a leading `$'. 122in which variable names may appear with or without a leading `$'.
123\(For example, in Makefiles.\) 123\(For example, in Makefiles.)
124 124
125Set this to nil if no characters should be skipped." 125Set this to nil if no characters should be skipped."
126 :type '(choice regexp 126 :type '(choice regexp
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 35cbcc27ba1..4ee830023fc 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3107,7 +3107,7 @@ deactivation, which might run hooks and get into other trouble."
3107 "Define a piece of advice for FUNCTION (a symbol). 3107 "Define a piece of advice for FUNCTION (a symbol).
3108The syntax of `defadvice' is as follows: 3108The syntax of `defadvice' is as follows:
3109 3109
3110 \(defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) 3110 (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
3111 [DOCSTRING] [INTERACTIVE-FORM] 3111 [DOCSTRING] [INTERACTIVE-FORM]
3112 BODY...) 3112 BODY...)
3113 3113
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index e3d83eb127f..99a329b021e 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -615,7 +615,7 @@ is more efficient."
615of all elements of TREE. 615of all elements of TREE.
616 616
617If REVERSE is non-nil, the stack is sorted in reverse order. 617If REVERSE is non-nil, the stack is sorted in reverse order.
618\(See also `avl-tree-stack-pop'\). 618\(See also `avl-tree-stack-pop').
619 619
620Note that any modification to TREE *immediately* invalidates all 620Note that any modification to TREE *immediately* invalidates all
621avl-tree-stacks created before the modification (in particular, 621avl-tree-stacks created before the modification (in particular,
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 8b47bbfb03d..8699af60ea8 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -397,7 +397,7 @@ invoked interactively are excluded from this list."
397 "Alist of functions and their call tree. 397 "Alist of functions and their call tree.
398Each element looks like 398Each element looks like
399 399
400 \(FUNCTION CALLERS CALLS\) 400 (FUNCTION CALLERS CALLS)
401 401
402where CALLERS is a list of functions that call FUNCTION, and CALLS 402where CALLERS is a list of functions that call FUNCTION, and CALLS
403is a list of functions for which calls were generated while compiling 403is a list of functions for which calls were generated while compiling
@@ -4529,11 +4529,11 @@ whose definitions have been compiled in this Emacs session, as well as
4529all functions called by those functions. 4529all functions called by those functions.
4530 4530
4531The call graph does not include macros, inline functions, or 4531The call graph does not include macros, inline functions, or
4532primitives that the byte-code interpreter knows about directly \(eq, 4532primitives that the byte-code interpreter knows about directly
4533cons, etc.\). 4533\(`eq', `cons', etc.).
4534 4534
4535The call tree also lists those functions which are not known to be called 4535The call tree also lists those functions which are not known to be called
4536\(that is, to which no calls have been compiled\), and which cannot be 4536\(that is, to which no calls have been compiled), and which cannot be
4537invoked interactively." 4537invoked interactively."
4538 (interactive) 4538 (interactive)
4539 (message "Generating call tree...") 4539 (message "Generating call tree...")
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index 3b69e959282..536e4186c41 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -162,7 +162,7 @@ def\\(?:un\\|subst\\|foo\\|method\\|class\\|\
162ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\\|\ 162ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\\|\
163\\(?:ine-obsolete-function-\\)?alias[ \t]+'\\|\ 163\\(?:ine-obsolete-function-\\)?alias[ \t]+'\\|\
164ine-overloadable-function\\)\\)\ 164ine-overloadable-function\\)\\)\
165\[ \t]*%s\\([ \t;]+\\|$\\)") 165[ \t]*%s\\([ \t;]+\\|$\\)")
166 (regexp-opt (mapcar 'cadr fnlist) t))) 166 (regexp-opt (mapcar 'cadr fnlist) t)))
167 (while (re-search-forward re nil t) 167 (while (re-search-forward re nil t)
168 (skip-chars-forward " \t\n") 168 (skip-chars-forward " \t\n")
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index eab22b67cd7..56f95111ab8 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -136,7 +136,7 @@ BODY contains code to execute each time the mode is enabled or disabled.
136:variable PLACE The location to use instead of the variable MODE to store 136:variable PLACE The location to use instead of the variable MODE to store
137 the state of the mode. This can be simply a different 137 the state of the mode. This can be simply a different
138 named variable, or a generalized variable. 138 named variable, or a generalized variable.
139 PLACE can also be of the form \(GET . SET), where GET is 139 PLACE can also be of the form (GET . SET), where GET is
140 an expression that returns the current state, and SET is 140 an expression that returns the current state, and SET is
141 a function that takes one argument, the new state, and 141 a function that takes one argument, the new state, and
142 sets it. If you specify a :variable, this function does 142 sets it. If you specify a :variable, this function does
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 0162a9a230a..e437c587df4 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3162,12 +3162,12 @@ Do this when stopped before the form or it will be too late.
3162One side effect of using this command is that the next time the 3162One side effect of using this command is that the next time the
3163function or macro is called, Edebug will be called there as well." 3163function or macro is called, Edebug will be called there as well."
3164 (interactive) 3164 (interactive)
3165 (if (not (looking-at "\(")) 3165 (if (not (looking-at "("))
3166 (error "You must be before a list form") 3166 (error "You must be before a list form")
3167 (let ((func 3167 (let ((func
3168 (save-excursion 3168 (save-excursion
3169 (down-list 1) 3169 (down-list 1)
3170 (if (looking-at "\(") 3170 (if (looking-at "(")
3171 (edebug--form-data-name 3171 (edebug--form-data-name
3172 (edebug-get-form-data-entry (point))) 3172 (edebug-get-form-data-entry (point)))
3173 (read (current-buffer)))))) 3173 (read (current-buffer))))))
@@ -3790,10 +3790,10 @@ Otherwise call `debug' normally."
3790 (if t (progn 3790 (if t (progn
3791 3791
3792 ;; Delete interspersed edebug internals. 3792 ;; Delete interspersed edebug internals.
3793 (while (re-search-forward "^ \(?edebug" nil t) 3793 (while (re-search-forward "^ (?edebug" nil t)
3794 (beginning-of-line) 3794 (beginning-of-line)
3795 (cond 3795 (cond
3796 ((looking-at "^ \(edebug-after") 3796 ((looking-at "^ (edebug-after")
3797 ;; Previous lines may contain code, so just delete this line. 3797 ;; Previous lines may contain code, so just delete this line.
3798 (setq last-ok-point (point)) 3798 (setq last-ok-point (point))
3799 (forward-line 1) 3799 (forward-line 1)
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index cae3fa2d460..f899f40fb80 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -137,7 +137,7 @@ the name of the test and the result of NAME-FORM."
137 137
138This effectively executes 138This effectively executes
139 139
140 \(apply (car COMMAND) (cdr COMMAND)\) 140 (apply (car COMMAND) (cdr COMMAND))
141 141
142and returns the same value, but additionally runs hooks like 142and returns the same value, but additionally runs hooks like
143`pre-command-hook' and `post-command-hook', and sets variables 143`pre-command-hook' and `post-command-hook', and sets variables
@@ -189,7 +189,7 @@ test for `called-interactively' in the command will fail."
189 "Return a copy of S with all matches of REGEXPS removed. 189 "Return a copy of S with all matches of REGEXPS removed.
190 190
191Elements of REGEXPS may also be two-element lists \(REGEXP 191Elements of REGEXPS may also be two-element lists \(REGEXP
192SUBEXP\), where SUBEXP is the number of a subexpression in 192SUBEXP), where SUBEXP is the number of a subexpression in
193REGEXP. In that case, only that subexpression will be removed 193REGEXP. In that case, only that subexpression will be removed
194rather than the entire match." 194rather than the entire match."
195 ;; Use a temporary buffer since replace-match copies strings, which 195 ;; Use a temporary buffer since replace-match copies strings, which
@@ -215,7 +215,7 @@ property list, or no properties if there is no plist before it.
215As a simple example, 215As a simple example,
216 216
217\(ert-propertized-string \"foo \" \\='(face italic) \"bar\" \" baz\" nil \ 217\(ert-propertized-string \"foo \" \\='(face italic) \"bar\" \" baz\" nil \
218\" quux\"\) 218\" quux\")
219 219
220would return the string \"foo bar baz quux\" where the substring 220would return the string \"foo bar baz quux\" where the substring
221\"bar baz\" has a `face' property with the value `italic'. 221\"bar baz\" has a `face' property with the value `italic'.
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index d47e5d94b9d..2eba0216faf 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -187,7 +187,7 @@ using :expected-result. See `ert-test-result-type-p' for a
187description of valid values for RESULT-TYPE. 187description of valid values for RESULT-TYPE.
188 188
189\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \ 189\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \
190\[:tags '(TAG...)] BODY...)" 190[:tags '(TAG...)] BODY...)"
191 (declare (debug (&define :name test 191 (declare (debug (&define :name test
192 name sexp [&optional stringp] 192 name sexp [&optional stringp]
193 [&rest keywordp sexp] def-body)) 193 [&rest keywordp sexp] def-body))
@@ -887,10 +887,10 @@ Valid result types:
887nil -- Never matches. 887nil -- Never matches.
888t -- Always matches. 888t -- Always matches.
889:failed, :passed, :skipped -- Matches corresponding results. 889:failed, :passed, :skipped -- Matches corresponding results.
890\(and TYPES...\) -- Matches if all TYPES match. 890\(and TYPES...) -- Matches if all TYPES match.
891\(or TYPES...\) -- Matches if some TYPES match. 891\(or TYPES...) -- Matches if some TYPES match.
892\(not TYPE\) -- Matches if TYPE does not match. 892\(not TYPE) -- Matches if TYPE does not match.
893\(satisfies PREDICATE\) -- Matches if PREDICATE returns true when called with 893\(satisfies PREDICATE) -- Matches if PREDICATE returns true when called with
894 RESULT." 894 RESULT."
895 ;; It would be easy to add `member' and `eql' types etc., but I 895 ;; It would be easy to add `member' and `eql' types etc., but I
896 ;; haven't bothered yet. 896 ;; haven't bothered yet.
@@ -946,7 +946,7 @@ a test -- (i.e., an object of the ert-test data-type) Selects that test.
946a symbol -- Selects the test that the symbol names, errors if none. 946a symbol -- Selects the test that the symbol names, errors if none.
947\(member TESTS...) -- Selects the elements of TESTS, a list of tests 947\(member TESTS...) -- Selects the elements of TESTS, a list of tests
948 or symbols naming tests. 948 or symbols naming tests.
949\(eql TEST\) -- Selects TEST, a test or a symbol naming a test. 949\(eql TEST) -- Selects TEST, a test or a symbol naming a test.
950\(and SELECTORS...) -- Selects the tests that match all SELECTORS. 950\(and SELECTORS...) -- Selects the tests that match all SELECTORS.
951\(or SELECTORS...) -- Selects the tests that match any of the SELECTORS. 951\(or SELECTORS...) -- Selects the tests that match any of the SELECTORS.
952\(not SELECTOR) -- Selects all tests that do not match SELECTOR. 952\(not SELECTOR) -- Selects all tests that do not match SELECTOR.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 026a4a749a9..69d545560d4 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -62,7 +62,7 @@ ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
62foo\\|\\(?:[^icfgv]\\|g[^r]\\)\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\ 62foo\\|\\(?:[^icfgv]\\|g[^r]\\)\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
63menu-bar-make-toggle\\)" 63menu-bar-make-toggle\\)"
64 find-function-space-re 64 find-function-space-re
65 "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)") 65 "\\('\\|(quote \\)?%s\\(\\s-\\|$\\|[()]\\)")
66 "The regexp used by `find-function' to search for a function definition. 66 "The regexp used by `find-function' to search for a function definition.
67Note it must contain a `%s' at the place where `format' 67Note it must contain a `%s' at the place where `format'
68should insert the function name. The default value avoids `defconst', 68should insert the function name. The default value avoids `defconst',
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index bbe6b36ab9a..94fe6c3d441 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -233,7 +233,7 @@ turned into calls of the form (SETTER ARGS... VAL).
233 233
234If FIX-RETURN is non-nil, then SETTER is not assumed to return VAL and 234If FIX-RETURN is non-nil, then SETTER is not assumed to return VAL and
235instead the assignment is turned into something equivalent to 235instead the assignment is turned into something equivalent to
236 \(let ((temp VAL)) 236 (let ((temp VAL))
237 (SETTER ARGS... temp) 237 (SETTER ARGS... temp)
238 temp) 238 temp)
239so as to preserve the semantics of `setf'." 239so as to preserve the semantics of `setf'."
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index fed91b34a88..4576f5cd6ba 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -889,7 +889,7 @@ property `lisp-indent-function' (or the deprecated `lisp-indent-hook'),
889it specifies how to indent. The property value can be: 889it specifies how to indent. The property value can be:
890 890
891* `defun', meaning indent `defun'-style 891* `defun', meaning indent `defun'-style
892 \(this is also the case if there is no property and the function 892 (this is also the case if there is no property and the function
893 has a name that begins with \"def\", and three or more arguments); 893 has a name that begins with \"def\", and three or more arguments);
894 894
895* an integer N, meaning indent the first N arguments specially 895* an integer N, meaning indent the first N arguments specially
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 43fd4ef57a6..b8fb540d6cb 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -44,7 +44,7 @@ Takes args PROMPTER ACTOR LIST, and optional args HELP and ACTION-ALIST.
44LIST is a list of objects, or a function of no arguments to return the next 44LIST is a list of objects, or a function of no arguments to return the next
45object or nil. 45object or nil.
46 46
47If PROMPTER is a string, the prompt is \(format PROMPTER OBJECT\). If not 47If PROMPTER is a string, the prompt is \(format PROMPTER OBJECT). If not
48a string, PROMPTER is a function of one arg (an object from LIST), which 48a string, PROMPTER is a function of one arg (an object from LIST), which
49returns a string to be used as the prompt for that object. If the return 49returns a string to be used as the prompt for that object. If the return
50value is not a string, it may be nil to ignore the object or non-nil to act 50value is not a string, it may be nil to ignore the object or non-nil to act
@@ -56,7 +56,7 @@ which gets called with each object that the user answers `yes' for.
56If HELP is given, it is a list (OBJECT OBJECTS ACTION), 56If HELP is given, it is a list (OBJECT OBJECTS ACTION),
57where OBJECT is a string giving the singular noun for an elt of LIST; 57where OBJECT is a string giving the singular noun for an elt of LIST;
58OBJECTS is the plural noun for elts of LIST, and ACTION is a transitive 58OBJECTS is the plural noun for elts of LIST, and ACTION is a transitive
59verb describing ACTOR. The default is \(\"object\" \"objects\" \"act on\"\). 59verb describing ACTOR. The default is \(\"object\" \"objects\" \"act on\").
60 60
61At the prompts, the user may enter y, Y, or SPC to act on that object; 61At the prompts, the user may enter y, Y, or SPC to act on that object;
62n, N, or DEL to skip that object; ! to act on all following objects; 62n, N, or DEL to skip that object; ! to act on all following objects;
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 9888e920219..e315733e222 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -143,7 +143,7 @@ If LAX non-nil, don't output parentheses if it doesn't require them.
143Merges keywords to avoid backtracking in Emacs's regexp matcher." 143Merges keywords to avoid backtracking in Emacs's regexp matcher."
144 ;; The basic idea is to find the shortest common prefix or suffix, remove it 144 ;; The basic idea is to find the shortest common prefix or suffix, remove it
145 ;; and recurse. If there is no prefix, we divide the list into two so that 145 ;; and recurse. If there is no prefix, we divide the list into two so that
146 ;; \(at least) one half will have at least a one-character common prefix. 146 ;; (at least) one half will have at least a one-character common prefix.
147 147
148 ;; Also we delay the addition of grouping parenthesis as long as possible 148 ;; Also we delay the addition of grouping parenthesis as long as possible
149 ;; until we're sure we need them, and try to remove one-character sequences 149 ;; until we're sure we need them, and try to remove one-character sequences
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index a21ac7a2835..a5ff9722698 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -768,8 +768,8 @@ of all atomic regexps."
768 ((= l 3) (string-match "\\`\\(?:\\\\[cCsS_]\\|\\[[^^]\\]\\)" r)) 768 ((= l 3) (string-match "\\`\\(?:\\\\[cCsS_]\\|\\[[^^]\\]\\)" r))
769 ((null lax) 769 ((null lax)
770 (cond 770 (cond
771 ((string-match "\\`\\[^?\]?\\(?:\\[:[a-z]+:]\\|[^\]]\\)*\\]\\'" r)) 771 ((string-match "\\`\\[^?\]?\\(?:\\[:[a-z]+:]\\|[^]]\\)*\\]\\'" r))
772 ((string-match "\\`\\\\(\\(?:[^\\]\\|\\\\[^\)]\\)*\\\\)\\'" r))))))) 772 ((string-match "\\`\\\\(\\(?:[^\\]\\|\\\\[^)]\\)*\\\\)\\'" r)))))))
773 773
774 774
775(defun rx-syntax (form) 775(defun rx-syntax (form)
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index c7a95e4e5f3..17e3be7d3ff 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -68,9 +68,9 @@ This is slower, but filters out some innocuous shadowing."
68 "Return a list of Emacs Lisp files that create shadows. 68 "Return a list of Emacs Lisp files that create shadows.
69This function does the work for `list-load-path-shadows'. 69This function does the work for `list-load-path-shadows'.
70 70
71We traverse PATH looking for shadows, and return a \(possibly empty\) 71We traverse PATH looking for shadows, and return a \(possibly empty)
72even-length list of files. A file in this list at position 2i shadows 72even-length list of files. A file in this list at position 2i shadows
73the file in position 2i+1. Emacs Lisp file suffixes \(.el and .elc\) 73the file in position 2i+1. Emacs Lisp file suffixes \(.el and .elc)
74are stripped from the file names in the list. 74are stripped from the file names in the list.
75 75
76See the documentation for `list-load-path-shadows' for further information." 76See the documentation for `list-load-path-shadows' for further information."
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 0c24f796d19..eb5a7132c7e 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -213,7 +213,7 @@ one of those elements share the same precedence level and associativity."
213(defun smie-bnf->prec2 (bnf &rest resolvers) 213(defun smie-bnf->prec2 (bnf &rest resolvers)
214 "Convert the BNF grammar into a prec2 table. 214 "Convert the BNF grammar into a prec2 table.
215BNF is a list of nonterminal definitions of the form: 215BNF is a list of nonterminal definitions of the form:
216 \(NONTERM RHS1 RHS2 ...) 216 (NONTERM RHS1 RHS2 ...)
217where each RHS is a (non-empty) list of terminals (aka tokens) or non-terminals. 217where each RHS is a (non-empty) list of terminals (aka tokens) or non-terminals.
218Not all grammars are accepted: 218Not all grammars are accepted:
219- an RHS cannot be an empty list (this is not needed, since SMIE allows all 219- an RHS cannot be an empty list (this is not needed, since SMIE allows all
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index dca459f2bf6..bf8e9ff273a 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -205,7 +205,7 @@ timers). If nil, allocate a new cell."
205 "Insert TIMER into `timer-idle-list'. 205 "Insert TIMER into `timer-idle-list'.
206This arranges to activate TIMER whenever Emacs is next idle. 206This arranges to activate TIMER whenever Emacs is next idle.
207If optional argument DONT-WAIT is non-nil, set TIMER to activate 207If optional argument DONT-WAIT is non-nil, set TIMER to activate
208immediately \(see below\), or at the right time, if Emacs is 208immediately \(see below), or at the right time, if Emacs is
209already idle. 209already idle.
210 210
211REUSE-CELL, if non-nil, is a cons cell to reuse when inserting 211REUSE-CELL, if non-nil, is a cons cell to reuse when inserting
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 9e3667e7a8f..c002ecfd2ff 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -105,7 +105,7 @@
105;;; Determine Window System, and X Server Vendor (if appropriate). 105;;; Determine Window System, and X Server Vendor (if appropriate).
106;;; 106;;;
107(defconst edt-window-system (if (featurep 'xemacs) (console-type) window-system) 107(defconst edt-window-system (if (featurep 'xemacs) (console-type) window-system)
108 "Indicates window system \(in GNU Emacs\) or console type \(in XEmacs\).") 108 "Indicates window system (in GNU Emacs) or console type (in XEmacs).")
109 109
110(declare-function x-server-vendor "xfns.c" (&optional terminal)) 110(declare-function x-server-vendor "xfns.c" (&optional terminal))
111 111
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 9bd1627ffeb..0c089698752 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -213,23 +213,23 @@ use within the EDT emulation."
213 213
214(defcustom edt-word-entities '(?\t) 214(defcustom edt-word-entities '(?\t)
215 "Specifies the list of EDT word entity characters. 215 "Specifies the list of EDT word entity characters.
216The default list, (\?\\t), contains just the TAB character, which 216The default list, (?\\t), contains just the TAB character, which
217emulates EDT. Characters are specified in the list using their 217emulates EDT. Characters are specified in the list using their
218decimal ASCII values. A question mark, followed by the actual 218decimal ASCII values. A question mark, followed by the actual
219character, can be used to indicate the numerical value of the 219character, can be used to indicate the numerical value of the
220character, instead of the actual decimal value. So, ?A means the 220character, instead of the actual decimal value. So, ?A means the
221numerical value for the letter A, \?/ means the numerical value for /, 221numerical value for the letter A, ?/ means the numerical value for /,
222etc. Several unprintable and special characters have special 222etc. Several unprintable and special characters have special
223representations, which you can also use: 223representations, which you can also use:
224 224
225 \?\\b specifies BS, C-h 225 ?\\b specifies BS, C-h
226 \?\\t specifies TAB, C-i 226 ?\\t specifies TAB, C-i
227 \?\\n specifies LFD, C-j 227 ?\\n specifies LFD, C-j
228 \?\\v specifies VTAB, C-k 228 ?\\v specifies VTAB, C-k
229 \?\\f specifies FF, C-l 229 ?\\f specifies FF, C-l
230 \?\\r specifies CR, C-m 230 ?\\r specifies CR, C-m
231 \?\\e specifies ESC, C-[ 231 ?\\e specifies ESC, C-[
232 \?\\\\ specifies \\ 232 ?\\\\ specifies \\
233 233
234In EDT Emulation movement-by-word commands, each character in the list 234In EDT Emulation movement-by-word commands, each character in the list
235will be treated as if it were a separate word." 235will be treated as if it were a separate word."
@@ -311,10 +311,10 @@ This means that an edt-user.el file was found in the user's `load-path'.")
311;;; o edt-emulation-on o edt-load-keys 311;;; o edt-emulation-on o edt-load-keys
312;;; 312;;;
313(defconst edt-emacs-variant (if (featurep 'emacs) "gnu" "xemacs") 313(defconst edt-emacs-variant (if (featurep 'emacs) "gnu" "xemacs")
314 "Indicates Emacs variant: GNU Emacs or XEmacs \(aka Lucid Emacs\).") 314 "Indicates Emacs variant: GNU Emacs or XEmacs (aka Lucid Emacs).")
315 315
316(defconst edt-window-system (if (featurep 'emacs) window-system (console-type)) 316(defconst edt-window-system (if (featurep 'emacs) window-system (console-type))
317 "Indicates window system \(in GNU Emacs\) or console type \(in XEmacs\).") 317 "Indicates window system (in GNU Emacs) or console type (in XEmacs).")
318 318
319(declare-function x-server-vendor "xfns.c" (&optional terminal)) 319(declare-function x-server-vendor "xfns.c" (&optional terminal))
320 320
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 93fcec865a7..960ccedd4dd 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1536,7 +1536,7 @@ as a Meta key and any number of multiple escapes are allowed."
1536(defun viper-repeat (arg) 1536(defun viper-repeat (arg)
1537 "Re-execute last destructive command. 1537 "Re-execute last destructive command.
1538Use the info in viper-d-com, which has the form 1538Use the info in viper-d-com, which has the form
1539\(com val ch reg inserted-text command-keys\), 1539\(com val ch reg inserted-text command-keys),
1540where `com' is the command to be re-executed, `val' is the 1540where `com' is the command to be re-executed, `val' is the
1541argument to `com', `ch' is a flag for repeat, and `reg' is optional; 1541argument to `com', `ch' is a flag for repeat, and `reg' is optional;
1542if it exists, it is the name of the register for `com'. 1542if it exists, it is the name of the register for `com'.
@@ -3424,7 +3424,7 @@ controlled by the sign of prefix numeric value."
3424 ((re-search-backward "[][(){}]" beg-lim t)) 3424 ((re-search-backward "[][(){}]" beg-lim t))
3425 (t 3425 (t
3426 (error "No matching character on line")))) 3426 (error "No matching character on line"))))
3427 (cond ((looking-at "[\(\[{]") 3427 (cond ((looking-at "[([{]")
3428 (if com (viper-move-marker-locally 'viper-com-point (point))) 3428 (if com (viper-move-marker-locally 'viper-com-point (point)))
3429 (forward-sexp 1) 3429 (forward-sexp 1)
3430 (if com 3430 (if com
@@ -3733,7 +3733,7 @@ With a prefix argument, this function unsets the macros.
3733If the optional prefix argument is non-nil and specifies a valid major mode, 3733If the optional prefix argument is non-nil and specifies a valid major mode,
3734this sets the macros only in the macros in that major mode. Otherwise, 3734this sets the macros only in the macros in that major mode. Otherwise,
3735the macros are set in the current major mode. 3735the macros are set in the current major mode.
3736\(When unsetting the macros, the second argument has no effect.\)" 3736\(When unsetting the macros, the second argument has no effect.)"
3737 (interactive "P") 3737 (interactive "P")
3738 (or noninteractive 3738 (or noninteractive
3739 (if (not unset) 3739 (if (not unset)
@@ -3980,7 +3980,7 @@ Null string will repeat previous search."
3980 (let (buffer buffer-name) 3980 (let (buffer buffer-name)
3981 (setq buffer-name 3981 (setq buffer-name
3982 (funcall viper-read-buffer-function 3982 (funcall viper-read-buffer-function
3983 (format "Kill buffer \(%s\): " 3983 (format "Kill buffer (%s): "
3984 (buffer-name (current-buffer))))) 3984 (buffer-name (current-buffer)))))
3985 (setq buffer 3985 (setq buffer
3986 (if (null buffer-name) 3986 (if (null buffer-name)
@@ -4588,7 +4588,7 @@ One can use \\=`\\=` and \\='\\=' to temporarily jump 1 step back."
4588;; Viewing registers 4588;; Viewing registers
4589 4589
4590(defun viper-ket-function (arg) 4590(defun viper-ket-function (arg)
4591 "Function called by \], the ket. View registers and call \]\]." 4591 "Function called by ], the ket. View registers and call ]]."
4592 (interactive "P") 4592 (interactive "P")
4593 (let ((reg (read-char))) 4593 (let ((reg (read-char)))
4594 (cond ((viper-valid-register reg '(letter Letter)) 4594 (cond ((viper-valid-register reg '(letter Letter))
@@ -4605,7 +4605,7 @@ One can use \\=`\\=` and \\='\\=' to temporarily jump 1 step back."
4605 viper-InvalidRegister reg))))) 4605 viper-InvalidRegister reg)))))
4606 4606
4607(defun viper-brac-function (arg) 4607(defun viper-brac-function (arg)
4608 "Function called by \[, the brac. View textmarkers and call \[\[." 4608 "Function called by [, the brac. View textmarkers and call [[."
4609 (interactive "P") 4609 (interactive "P")
4610 (let ((reg (read-char))) 4610 (let ((reg (read-char)))
4611 (cond ((viper= ?\[ reg) 4611 (cond ((viper= ?\[ reg)
@@ -4981,7 +4981,7 @@ back trace of the execution that leads to the error. Please include this
4981trace in your bug report. 4981trace in your bug report.
4982 4982
4983If you believe that one of Viper's commands goes into an infinite loop 4983If you believe that one of Viper's commands goes into an infinite loop
4984\(e.g., Emacs freezes\), type: 4984\(e.g., Emacs freezes), type:
4985 4985
4986 M-x set-variable <Return> debug-on-quit <Return> t <Return> 4986 M-x set-variable <Return> debug-on-quit <Return> t <Return>
4987 4987
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index fb2c1792a41..6e55ac5b5d6 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -396,7 +396,7 @@ reversed."
396 )) 396 ))
397 397
398;; Get an ex-token which is either an address or a command. 398;; Get an ex-token which is either an address or a command.
399;; A token has a type, \(command, address, end-mark\), and a value 399;; A token has a type, (command, address, end-mark), and a value
400(defun viper-get-ex-token () 400(defun viper-get-ex-token ()
401 (save-window-excursion 401 (save-window-excursion
402 (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) 402 (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
@@ -1658,7 +1658,7 @@ reversed."
1658 (if (and (not (string= ex-file (buffer-file-name))) 1658 (if (and (not (string= ex-file (buffer-file-name)))
1659 (buffer-modified-p) 1659 (buffer-modified-p)
1660 (not ex-variant)) 1660 (not ex-variant))
1661 (error "No write since last change \(:rec! overrides\)")) 1661 (error "No write since last change (:rec! overrides)"))
1662 (recover-file ex-file)) 1662 (recover-file ex-file))
1663 1663
1664;; Tell that `rewind' is obsolete and to use `:next count' instead 1664;; Tell that `rewind' is obsolete and to use `:next count' instead
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 092de55e70e..f422a1354a9 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -102,7 +102,7 @@ docstring. The variable becomes buffer-local whenever set."
102 (declare (indent defun)) 102 (declare (indent defun))
103 `(progn 103 `(progn
104 (defvar ,var ,default-value 104 (defvar ,var ,default-value
105 ,(format "%s\n\(buffer local\)" documentation)) 105 ,(format "%s\n(buffer local)" documentation))
106 (make-variable-buffer-local ',var))) 106 (make-variable-buffer-local ',var)))
107 107
108;; (viper-loop COUNT BODY) Execute BODY COUNT times. 108;; (viper-loop COUNT BODY) Execute BODY COUNT times.
@@ -778,7 +778,7 @@ Related buffers can be cycled through via :R and :P commands."
778 "^\\\\[sb][a-z]*{.*}\\s-*$\\|" ; latex 778 "^\\\\[sb][a-z]*{.*}\\s-*$\\|" ; latex
779 "^@node\\|@table\\|^@m?enu\\|^@itemize\\|^@if\\|" ; texinfo 779 "^@node\\|@table\\|^@m?enu\\|^@itemize\\|^@if\\|" ; texinfo
780 "^.+:-") ; prolog 780 "^.+:-") ; prolog
781 "Regexps for Headings. Used by \[\[ and \]\].") 781 "Regexps for Headings. Used by [[ and ]].")
782 782
783(defvar viper-heading-end 783(defvar viper-heading-end
784 (concat "^}\\|" ; C/C++ 784 (concat "^}\\|" ; C/C++
@@ -786,7 +786,7 @@ Related buffers can be cycled through via :R and :P commands."
786 "^@end \\|" ; texinfo 786 "^@end \\|" ; texinfo
787 ")\n\n[ \t\n]*\\|" ; lisp 787 ")\n\n[ \t\n]*\\|" ; lisp
788 "\\.\\s-*$") ; prolog 788 "\\.\\s-*$") ; prolog
789 "*Regexps to end Headings/Sections. Used by \[\].") 789 "*Regexps to end Headings/Sections. Used by [].")
790 790
791 791
792;; These two vars control the interaction of jumps performed by ' and `. 792;; These two vars control the interaction of jumps performed by ' and `.
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 4fa07792334..3aff0628b5f 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -327,8 +327,8 @@ Can be used in `viper-custom-file-name' to define permanent macros.
327MACRO-NAME is a string of characters or a vector of keys. STATE is 327MACRO-NAME is a string of characters or a vector of keys. STATE is
328either `vi-state' or `insert-state'. It specifies the Viper state in which to 328either `vi-state' or `insert-state'. It specifies the Viper state in which to
329define the macro. MACRO-BODY is a string that represents the keyboard macro. 329define the macro. MACRO-BODY is a string that represents the keyboard macro.
330Optional SCOPE says whether the macro should be global \(t\), mode-specific 330Optional SCOPE says whether the macro should be global \(t), mode-specific
331\(a major-mode symbol\), or buffer-specific \(buffer name, a string\). 331\(a major-mode symbol), or buffer-specific \(buffer name, a string).
332If SCOPE is nil, the user is asked to specify the scope." 332If SCOPE is nil, the user is asked to specify the scope."
333 (let* (state-name keymap 333 (let* (state-name keymap
334 (macro-alist-var 334 (macro-alist-var
@@ -894,7 +894,7 @@ mistakes in macro names to be passed to this function is to use
894 (set-register reg last-kbd-macro)) 894 (set-register reg last-kbd-macro))
895 895
896(defun viper-register-macro (count) 896(defun viper-register-macro (count)
897 "Keyboard macros in registers - a modified \@ command." 897 "Keyboard macros in registers - a modified @ command."
898 (interactive "P") 898 (interactive "P")
899 (let ((reg (downcase (read-char)))) 899 (let ((reg (downcase (read-char))))
900 (cond ((or (and (<= ?a reg) (<= reg ?z))) 900 (cond ((or (and (<= ?a reg) (<= reg ?z)))
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 4d5c86fd6aa..5c82bf1f55d 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -145,7 +145,7 @@ If CLICK-COUNT is 2,then `word' is a Word in Vi sense.
145If the character clicked on is a non-separator and is non-alphanumeric but 145If the character clicked on is a non-separator and is non-alphanumeric but
146is adjacent to an alphanumeric symbol, then it is considered alphanumeric 146is adjacent to an alphanumeric symbol, then it is considered alphanumeric
147for the purpose of this command. If this character has a matching 147for the purpose of this command. If this character has a matching
148character, such as `\(' is a match for `\)', then the matching character is 148character, such as `(' is a match for `)', then the matching character is
149also considered alphanumeric. 149also considered alphanumeric.
150For convenience, in Lisp modes, `-' is considered alphanumeric. 150For convenience, in Lisp modes, `-' is considered alphanumeric.
151 151
@@ -250,7 +250,7 @@ On single or double click, returns the word as determined by
250With prefix argument, N, insert that many words. 250With prefix argument, N, insert that many words.
251This command must be bound to a mouse click. 251This command must be bound to a mouse click.
252The double-click action of the same mouse button must not be bound 252The double-click action of the same mouse button must not be bound
253\(or it must be bound to the same function\). 253\(or it must be bound to the same function).
254See `viper-surrounding-word' for the definition of a word in this case." 254See `viper-surrounding-word' for the definition of a word in this case."
255 (interactive "e\nP") 255 (interactive "e\nP")
256 (if viper-frame-of-focus ;; to handle clicks in another frame 256 (if viper-frame-of-focus ;; to handle clicks in another frame
@@ -339,7 +339,7 @@ See `viper-surrounding-word' for the definition of a word in this case."
339 "Find the word clicked or double-clicked on. Word may be in another window. 339 "Find the word clicked or double-clicked on. Word may be in another window.
340With prefix argument, N, search for N-th occurrence. 340With prefix argument, N, search for N-th occurrence.
341This command must be bound to a mouse click. The double-click action of the 341This command must be bound to a mouse click. The double-click action of the
342same button must not be bound \(or it must be bound to the same function\). 342same button must not be bound \(or it must be bound to the same function).
343See `viper-surrounding-word' for the details on what constitutes a word for 343See `viper-surrounding-word' for the details on what constitutes a word for
344this command." 344this command."
345 (interactive "e\nP") 345 (interactive "e\nP")
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 9616fd4e86f..8c2ad581a75 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -379,7 +379,7 @@ Otherwise return the normal value."
379 379
380;; Append LIS2 to LIS1, both alists, by side-effect and returns LIS1 380;; Append LIS2 to LIS1, both alists, by side-effect and returns LIS1
381;; LIS2 is modified by filtering it: deleting its members of the form 381;; LIS2 is modified by filtering it: deleting its members of the form
382;; \(car elt\) such that (car elt') is in LIS1. 382;; (car elt) such that (car elt') is in LIS1.
383(defun viper-append-filter-alist (lis1 lis2) 383(defun viper-append-filter-alist (lis1 lis2)
384 (let ((temp lis1) 384 (let ((temp lis1)
385 elt) 385 elt)
@@ -859,7 +859,7 @@ Otherwise return the normal value."
859 859
860(defsubst viper-is-in-minibuffer () 860(defsubst viper-is-in-minibuffer ()
861 (save-match-data 861 (save-match-data
862 (string-match "\*Minibuf-" (buffer-name)))) 862 (string-match "\\*Minibuf-" (buffer-name))))
863 863
864 864
865 865
@@ -1330,7 +1330,7 @@ Works best when set in the hooks to various major modes.
1330`strict-vi' means Viper words are (hopefully) exactly as in Vi. 1330`strict-vi' means Viper words are (hopefully) exactly as in Vi.
1331 1331
1332`reformed-vi' means Viper words are like Emacs words \(as determined using 1332`reformed-vi' means Viper words are like Emacs words \(as determined using
1333Emacs syntax tables, which are different for different major modes\) with two 1333Emacs syntax tables, which are different for different major modes) with two
1334exceptions: the symbol `_' is always part of a word and typical Vi non-word 1334exceptions: the symbol `_' is always part of a word and typical Vi non-word
1335symbols, such as `,',:,\",),{, etc., are excluded. 1335symbols, such as `,',:,\",),{, etc., are excluded.
1336This behaves very close to `strict-vi', but also works well with non-ASCII 1336This behaves very close to `strict-vi', but also works well with non-ASCII
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 0933c949df0..6398b476fad 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -819,7 +819,7 @@ It also can't undo some Viper settings."
819;; fundamental 819;; fundamental
820(defun viper-major-mode-change-sentinel () 820(defun viper-major-mode-change-sentinel ()
821 (save-match-data 821 (save-match-data
822 (or (string-match "\*Minibuf-" (buffer-name)) 822 (or (string-match "\\*Minibuf-" (buffer-name))
823 (setq viper-new-major-mode-buffer-list 823 (setq viper-new-major-mode-buffer-list
824 (cons (current-buffer) viper-new-major-mode-buffer-list)))) 824 (cons (current-buffer) viper-new-major-mode-buffer-list))))
825 ;; change the global value of hook 825 ;; change the global value of hook
diff --git a/lisp/epg.el b/lisp/epg.el
index ed71e966853..aa79c7d0fc2 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -2199,7 +2199,7 @@ The return value is an alist mapping from types to values."
2199 (if (eq index (string-match "[ \t\n\r]*" string index)) 2199 (if (eq index (string-match "[ \t\n\r]*" string index))
2200 (setq index (match-end 0))) 2200 (setq index (match-end 0)))
2201 (if (eq index (string-match 2201 (if (eq index (string-match
2202 "\\([0-9]+\\(\\.[0-9]+\\)*\\)\[ \t\n\r]*=[ \t\n\r]*" 2202 "\\([0-9]+\\(\\.[0-9]+\\)*\\)[ \t\n\r]*=[ \t\n\r]*"
2203 string index)) 2203 string index))
2204 (setq type (match-string 1 string) 2204 (setq type (match-string 1 string)
2205 index (match-end 0)) 2205 index (match-end 0))
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 958c5ef8b62..ec45dcfcf24 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1541,7 +1541,7 @@ A server may send more than one 005 message."
1541 (while (erc-response.command-args parsed) 1541 (while (erc-response.command-args parsed)
1542 (let ((section (pop (erc-response.command-args parsed)))) 1542 (let ((section (pop (erc-response.command-args parsed))))
1543 ;; fill erc-server-parameters 1543 ;; fill erc-server-parameters
1544 (when (string-match "^\\([A-Z]+\\)\=\\(.*\\)$\\|^\\([A-Z]+\\)$" 1544 (when (string-match "^\\([A-Z]+\\)=\\(.*\\)$\\|^\\([A-Z]+\\)$"
1545 section) 1545 section)
1546 (add-to-list 'erc-server-parameters 1546 (add-to-list 'erc-server-parameters
1547 `(,(or (match-string 1 section) 1547 `(,(or (match-string 1 section)
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 55f298bbf69..0622b18ca7f 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -84,7 +84,7 @@ Useful to mark nicks from dangerous hosts."
84 84
85(defcustom erc-current-nick-highlight-type 'keyword 85(defcustom erc-current-nick-highlight-type 'keyword
86 "Determines how to highlight text in which your current nickname appears 86 "Determines how to highlight text in which your current nickname appears
87\(does not apply to text sent by you\). 87\(does not apply to text sent by you).
88 88
89The following values are allowed: 89The following values are allowed:
90 90
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 2d2fa6230c3..274b01ffbd1 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -280,7 +280,7 @@ Example of use:
280 "IDENTIFY" nil nil nil)) 280 "IDENTIFY" nil nil nil))
281 "Alist of NickServer details, sorted by network. 281 "Alist of NickServer details, sorted by network.
282Every element in the list has the form 282Every element in the list has the form
283 \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER SUCCESS-REGEXP) 283 (SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER SUCCESS-REGEXP)
284 284
285SYMBOL is a network identifier, a symbol, as used in `erc-networks-alist'. 285SYMBOL is a network identifier, a symbol, as used in `erc-networks-alist'.
286NICKSERV is the description of the nickserv in the form nick!user@host. 286NICKSERV is the description of the nickserv in the form nick!user@host.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index b7e880c120a..8e26db1d9d3 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2973,7 +2973,7 @@ VERSION and so on. It is called with ARGS."
2973If FUNC contains a valid function or variable, help about that 2973If FUNC contains a valid function or variable, help about that
2974will be displayed. If FUNC is empty, display an apropos about 2974will be displayed. If FUNC is empty, display an apropos about
2975ERC commands. Otherwise, do `apropos' in the ERC namespace 2975ERC commands. Otherwise, do `apropos' in the ERC namespace
2976\(\"erc-.*LINE\"\). 2976\(\"erc-.*LINE\").
2977 2977
2978Examples: 2978Examples:
2979To find out about erc and bbdb, do 2979To find out about erc and bbdb, do
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 499eda40dc3..90dec596701 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -639,7 +639,7 @@ matched."
639 ;; `!' 639 ;; `!'
640 ;; Start a history substitution, except when followed by a 640 ;; Start a history substitution, except when followed by a
641 ;; space, tab, the end of the line, = or (. 641 ;; space, tab, the end of the line, = or (.
642 (if (not (string-match "^![^ \t\n=\(]" reference)) 642 (if (not (string-match "^![^ \t\n=(]" reference))
643 reference 643 reference
644 (setq eshell-history-index nil) 644 (setq eshell-history-index nil)
645 (let ((event (eshell-hist-parse-event-designator reference))) 645 (let ((event (eshell-hist-parse-event-designator reference)))
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 76751e51dfd..ae6e0d3e886 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -47,7 +47,7 @@ properties to colorize its output based on the setting of
47(defcustom eshell-ls-date-format "%Y-%m-%d" 47(defcustom eshell-ls-date-format "%Y-%m-%d"
48 "How to display time information in `eshell-ls-file'. 48 "How to display time information in `eshell-ls-file'.
49This is passed to `format-time-string' as a format string. 49This is passed to `format-time-string' as a format string.
50To display the date using the current locale, use \"%b \%e\"." 50To display the date using the current locale, use \"%b \ %e\"."
51 :version "24.1" 51 :version "24.1"
52 :type 'string) 52 :type 'string)
53 53
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 8ae81df92e5..19597dfbc1f 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -517,7 +517,7 @@ Remove the DIRECTORY(ies), if they are empty.")
517 :usage "[OPTION]... SOURCE DEST 517 :usage "[OPTION]... SOURCE DEST
518 or: mv [OPTION]... SOURCE... DIRECTORY 518 or: mv [OPTION]... SOURCE... DIRECTORY
519Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY. 519Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
520\[OPTION] DIRECTORY...") 520[OPTION] DIRECTORY...")
521 (let ((no-dereference t)) 521 (let ((no-dereference t))
522 (eshell-mvcpln-template "mv" "moving" 'rename-file 522 (eshell-mvcpln-template "mv" "moving" 'rename-file
523 eshell-mv-interactive-query 523 eshell-mv-interactive-query
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 2565842706e..f645702ac2b 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -228,7 +228,7 @@ If N or M is nil, it means the end of the list."
228 228
229(defvar eshell-path-env (getenv "PATH") 229(defvar eshell-path-env (getenv "PATH")
230 "Content of $PATH. 230 "Content of $PATH.
231It might be different from \(getenv \"PATH\"\), when 231It might be different from \(getenv \"PATH\"), when
232`default-directory' points to a remote host.") 232`default-directory' points to a remote host.")
233(make-variable-buffer-local 'eshell-path-env) 233(make-variable-buffer-local 'eshell-path-env)
234 234
diff --git a/lisp/expand.el b/lisp/expand.el
index 4459c3ae960..97c8a259459 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -213,7 +213,7 @@
213 "for" ; foreach 213 "for" ; foreach
214 (concat 214 (concat
215 "for ( )\n" 215 "for ( )\n"
216 "{\n\n\}" 216 "{\n\n}"
217 ) 217 )
218 (list 7 12)) 218 (list 7 12))
219 219
@@ -221,7 +221,7 @@
221 "whi" ; foreach 221 "whi" ; foreach
222 (concat 222 (concat
223 "while ( )\n" 223 "while ( )\n"
224 "{\n\n\}" 224 "{\n\n}"
225 ) 225 )
226 (list 9 15)) 226 (list 9 15))
227 227
@@ -233,7 +233,7 @@
233 "iff" 233 "iff"
234 (concat 234 (concat
235 "if ( )\n" 235 "if ( )\n"
236 "{\n\n\}" 236 "{\n\n}"
237 ) 237 )
238 (list 6 12)) 238 (list 6 12))
239 239
diff --git a/lisp/faces.el b/lisp/faces.el
index cc8c04d9689..4e7f1a42bff 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -433,7 +433,7 @@ completely specified)."
433(defun face-attribute-merged-with (attribute value faces &optional frame) 433(defun face-attribute-merged-with (attribute value faces &optional frame)
434 "Merges ATTRIBUTE, initially VALUE, with faces from FACES until absolute. 434 "Merges ATTRIBUTE, initially VALUE, with faces from FACES until absolute.
435FACES may be either a single face or a list of faces. 435FACES may be either a single face or a list of faces.
436\[This is an internal function.]" 436[This is an internal function.]"
437 (cond ((not (face-attribute-relative-p attribute value)) 437 (cond ((not (face-attribute-relative-p attribute value))
438 value) 438 value)
439 ((null faces) 439 ((null faces)
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 1ec4e13a38b..b3490fd3ebb 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -43,7 +43,7 @@ A key in this hash table is the descriptor as returned from
43`gfilenotify', `inotify', `w32notify' or a file name handler. 43`gfilenotify', `inotify', `w32notify' or a file name handler.
44The value in the hash table is a list 44The value in the hash table is a list
45 45
46 \(DIR (FILE . CALLBACK) (FILE . CALLBACK) ...) 46 (DIR (FILE . CALLBACK) (FILE . CALLBACK) ...)
47 47
48Several values for a given DIR happen only for `inotify', when 48Several values for a given DIR happen only for `inotify', when
49different files from the same directory are watched.") 49different files from the same directory are watched.")
@@ -54,7 +54,7 @@ different files from the same directory are watched.")
54 "Handle file system monitoring event. 54 "Handle file system monitoring event.
55If EVENT is a filewatch event, call its callback. It has the format 55If EVENT is a filewatch event, call its callback. It has the format
56 56
57 \(file-notify (DESCRIPTOR ACTIONS FILE [FILE1-OR-COOKIE]) CALLBACK) 57 (file-notify (DESCRIPTOR ACTIONS FILE [FILE1-OR-COOKIE]) CALLBACK)
58 58
59Otherwise, signal a `file-notify-error'." 59Otherwise, signal a `file-notify-error'."
60 (interactive "e") 60 (interactive "e")
diff --git a/lisp/files.el b/lisp/files.el
index c309f86f85b..8565aa83266 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1057,7 +1057,7 @@ Tip: You can use this expansion of remote identifier components
1057 to derive a new remote file name from an existing one. For 1057 to derive a new remote file name from an existing one. For
1058 example, if FILE is \"/sudo::/path/to/file\" then 1058 example, if FILE is \"/sudo::/path/to/file\" then
1059 1059
1060 \(concat \(file-remote-p FILE) \"/bin/sh\") 1060 (concat (file-remote-p FILE) \"/bin/sh\")
1061 1061
1062 returns a remote file name for file \"/bin/sh\" that has the 1062 returns a remote file name for file \"/bin/sh\" that has the
1063 same remote identifier as FILE but expanded; a name such as 1063 same remote identifier as FILE but expanded; a name such as
@@ -3863,7 +3863,7 @@ directories."
3863However, the mode will not be changed if 3863However, the mode will not be changed if
3864\(1) a local variables list or the `-*-' line specifies a major mode, or 3864\(1) a local variables list or the `-*-' line specifies a major mode, or
3865\(2) the current major mode is a \"special\" mode, 3865\(2) the current major mode is a \"special\" mode,
3866\ not suitable for ordinary files, or 3866 not suitable for ordinary files, or
3867\(3) the new file name does not particularly specify any mode." 3867\(3) the new file name does not particularly specify any mode."
3868 :type 'boolean 3868 :type 'boolean
3869 :group 'editing-basics) 3869 :group 'editing-basics)
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 464c7c3eec5..ab332bbeff0 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -415,10 +415,10 @@ at the last position.
415Possible uses: If you don't want to save `filesets-data' in your normal 415Possible uses: If you don't want to save `filesets-data' in your normal
416configuration file, you can add a something like this 416configuration file, you can add a something like this
417 417
418 \(lambda () 418 (lambda ()
419 \(insert (format \"(setq-default filesets-data \\='%S)\" 419 (insert (format \"(setq-default filesets-data \\='%S)\"
420 filesets-data)) 420 filesets-data))
421 \(newline 2)) 421 (newline 2))
422 422
423to this hook. 423to this hook.
424 424
@@ -550,14 +550,14 @@ will be recursively added to the menu. `filesets-tree-max-level' tells up
550to which level the directory structure should be scanned/listed, 550to which level the directory structure should be scanned/listed,
551i.e. how deep the menu should be. Try something like 551i.e. how deep the menu should be. Try something like
552 552
553 \(\"HOME -- only one level\" 553 (\"HOME -- only one level\"
554 \(:tree \"~\" \"^[^.].*[^~]$\") 554 (:tree \"~\" \"^[^.].*[^~]$\")
555 \(:tree-max-level 1) 555 (:tree-max-level 1)
556 \(:filter-dirs-flag t)) 556 (:filter-dirs-flag t))
557 \(\"HOME -- up to 3 levels\" 557 (\"HOME -- up to 3 levels\"
558 \(:tree \"~\" \"^[^.].*[^~]$\") 558 (:tree \"~\" \"^[^.].*[^~]$\")
559 \(:tree-max-level 3) 559 (:tree-max-level 3)
560 \(:filter-dirs-flag t)) 560 (:filter-dirs-flag t))
561 561
562and it should become clear what this option is about. In any case, 562and it should become clear what this option is about. In any case,
563including directory trees to the menu can take a lot of memory." 563including directory trees to the menu can take a lot of memory."
@@ -679,20 +679,20 @@ variables my-ps-viewer, my-pdf-viewer, my-dvi-viewer, my-pic-viewer.
679In order to view pdf or rtf files in an Emacs buffer, you could use these: 679In order to view pdf or rtf files in an Emacs buffer, you could use these:
680 680
681 681
682 \(\"^.+\\\\.pdf\\\\\\='\" \"pdftotext\" 682 (\"^.+\\\\.pdf\\\\\\='\" \"pdftotext\"
683 \((:capture-output t) 683 ((:capture-output t)
684 \(:args (\"%S - | fmt -w \" window-width)) 684 (:args (\"%S - | fmt -w \" window-width))
685 \(:ignore-on-read-text t) 685 (:ignore-on-read-text t)
686 \(:constraintp (lambda () 686 (:constraintp (lambda ()
687 \(and \(filesets-which-command-p \"pdftotext\") 687 (and (filesets-which-command-p \"pdftotext\")
688 \(filesets-which-command-p \"fmt\")))))) 688 (filesets-which-command-p \"fmt\"))))))
689 \(\"^.+\\\\.rtf\\\\\\='\" \"rtf2htm\" 689 (\"^.+\\\\.rtf\\\\\\='\" \"rtf2htm\"
690 \((:capture-output t) 690 ((:capture-output t)
691 \(:args (\"%S 2> /dev/null | w3m -dump -T text/html\")) 691 (:args (\"%S 2> /dev/null | w3m -dump -T text/html\"))
692 \(:ignore-on-read-text t) 692 (:ignore-on-read-text t)
693 \(:constraintp (lambda () 693 (:constraintp (lambda ()
694 \(and (filesets-which-command-p \"rtf2htm\") 694 (and (filesets-which-command-p \"rtf2htm\")
695 \(filesets-which-command-p \"w3m\"))))))" 695 (filesets-which-command-p \"w3m\"))))))"
696 :set (function filesets-set-default) 696 :set (function filesets-set-default)
697 :type '(repeat :tag "Viewer" 697 :type '(repeat :tag "Viewer"
698 (list :tag "Definition" 698 (list :tag "Definition"
@@ -756,7 +756,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
756(defcustom filesets-ingroup-patterns 756(defcustom filesets-ingroup-patterns
757 '(("^.+\\.tex$" t 757 '(("^.+\\.tex$" t
758 (((:name "Package") 758 (((:name "Package")
759 (:pattern "\\\\usepackage\\W*\\(\\[[^\]]*\\]\\W*\\)?{\\W*\\(.+\\)\\W*}") 759 (:pattern "\\\\usepackage\\W*\\(\\[[^]]*\\]\\W*\\)?{\\W*\\(.+\\)\\W*}")
760 (:match-number 2) 760 (:match-number 2)
761 (:stub-flag t) 761 (:stub-flag t)
762 (:get-file-name (lambda (master file) 762 (:get-file-name (lambda (master file)
@@ -951,18 +951,18 @@ variable will take effect after rebuilding the menu.
951Caveat: Fileset names have to be unique. 951Caveat: Fileset names have to be unique.
952 952
953Example definition: 953Example definition:
954 \\='\(\(\"My Wiki\" 954 \\='((\"My Wiki\"
955 \(:ingroup \"~/Etc/My-Wiki/WikiContents\")) 955 (:ingroup \"~/Etc/My-Wiki/WikiContents\"))
956 \(\"My Homepage\" 956 (\"My Homepage\"
957 \(:pattern \"~/public_html/\" \"^.+\\\\.html$\") 957 (:pattern \"~/public_html/\" \"^.+\\\\.html$\")
958 \(:open filesets-find-file)) 958 (:open filesets-find-file))
959 \(\"User Configuration\" 959 (\"User Configuration\"
960 \(:files \"~/.xinitrc\" 960 (:files \"~/.xinitrc\"
961 \"~/.bashrc\" 961 \"~/.bashrc\"
962 \"~/.bash_profile\")) 962 \"~/.bash_profile\"))
963 \(\"HOME\" 963 (\"HOME\"
964 \(:tree \"~\" \"^[^.].*[^~]$\") 964 (:tree \"~\" \"^[^.].*[^~]$\")
965 \(:filter-dirs-flag t))) 965 (:filter-dirs-flag t)))
966 966
967`filesets-data' is a list of (NAME-AS-STRING . DEFINITION), DEFINITION 967`filesets-data' is a list of (NAME-AS-STRING . DEFINITION), DEFINITION
968being an association list with the fields: 968being an association list with the fields:
@@ -2450,13 +2450,13 @@ and edit your startup file as shown below:
24501. `filesets-data': Edit all :pattern filesets in your startup file and 24501. `filesets-data': Edit all :pattern filesets in your startup file and
2451transform all entries as shown in this example: 2451transform all entries as shown in this example:
2452 2452
2453 \(\"Test\" (:pattern \"~/dir/^pattern$\")) 2453 (\"Test\" (:pattern \"~/dir/^pattern$\"))
2454 --> \(\"Test\" (:pattern \"~/dir/\" \"^pattern$\")) 2454 --> (\"Test\" (:pattern \"~/dir/\" \"^pattern$\"))
2455 2455
24562. `filesets-data': Change all occurrences of \":document\" to \":ingroup\": 24562. `filesets-data': Change all occurrences of \":document\" to \":ingroup\":
2457 2457
2458 \(\(\"Test\" \(:document \"~/dir/file\")) 2458 ((\"Test\" (:document \"~/dir/file\"))
2459 --> \(\(\"Test\" \(:ingroup \"~/dir/file\")) 2459 --> ((\"Test\" (:ingroup \"~/dir/file\"))
2460 2460
24613. `filesets-subdocument-patterns': If you already modified the variable 24613. `filesets-subdocument-patterns': If you already modified the variable
2462previously called `filesets-subdocument-patterns', change its name to 2462previously called `filesets-subdocument-patterns', change its name to
diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el
index d78a0b35fab..71c7a9b9c77 100644
--- a/lisp/find-cmd.el
+++ b/lisp/find-cmd.el
@@ -140,10 +140,10 @@ the string will be quoted).")
140 "Initiate the building of a find command. 140 "Initiate the building of a find command.
141For example: 141For example:
142 142
143\(find-cmd \\='\(prune \(name \".svn\" \".git\" \".CVS\"\)\) 143\(find-cmd \\='(prune (name \".svn\" \".git\" \".CVS\"))
144 \\='\(and \(or \(name \"*.pl\" \"*.pm\" \"*.t\"\) 144 \\='(and (or (name \"*.pl\" \"*.pm\" \"*.t\")
145 \(mtime \"+1\"\)\) 145 (mtime \"+1\"))
146 \(fstype \"nfs\" \"ufs\"\)\)\)\) 146 (fstype \"nfs\" \"ufs\"))))
147 147
148`default-directory' is used as the initial search path. The 148`default-directory' is used as the initial search path. The
149result is a string that should be ready for the command line." 149result is a string that should be ready for the command line."
@@ -159,9 +159,9 @@ result is a string that should be ready for the command line."
159 159
160(defun find-and (form) 160(defun find-and (form)
161 "And FORMs together, so: 161 "And FORMs together, so:
162 \(and \(mtime \"+1\"\) \(name \"something\"\)\) 162 (and (mtime \"+1\") (name \"something\"))
163will produce: 163will produce:
164 find . \\\( -mtime +1 -and -name something \\\)" 164 find . \\( -mtime +1 -and -name something \\)"
165 (if (< (length form) 2) 165 (if (< (length form) 2)
166 (find-to-string (car form)) 166 (find-to-string (car form))
167 (concat "\\( " 167 (concat "\\( "
@@ -170,9 +170,9 @@ will produce:
170 170
171(defun find-or (form) 171(defun find-or (form)
172 "Or FORMs together, so: 172 "Or FORMs together, so:
173 \(or \(mtime \"+1\"\) \(name \"something\"\)\) 173 (or (mtime \"+1\") (name \"something\"))
174will produce: 174will produce:
175 find . \\\( -mtime +1 -or -name something \\\)" 175 find . \\( -mtime +1 -or -name something \\)"
176 (if (< (length form) 2) 176 (if (< (length form) 2)
177 (find-to-string (car form)) 177 (find-to-string (car form))
178 (concat "\\( " 178 (concat "\\( "
@@ -181,21 +181,21 @@ will produce:
181 181
182(defun find-not (form) 182(defun find-not (form)
183 "Or FORMs together and prefix with a -not, so: 183 "Or FORMs together and prefix with a -not, so:
184 \(not \(mtime \"+1\"\) \(name \"something\"\)\) 184 (not (mtime \"+1\") (name \"something\"))
185will produce: 185will produce:
186 -not \\\( -mtime +1 -or -name something \\\) 186 -not \\( -mtime +1 -or -name something \\)
187If you wanted the FORMs -and(ed) together instead then this would 187If you wanted the FORMs -and(ed) together instead then this would
188suffice: 188suffice:
189 \(not \(and \(mtime \"+1\"\) \(name \"something\"\)\)\)" 189 (not (and (mtime \"+1\") (name \"something\")))"
190 (concat "-not " (find-or (mapcar #'find-to-string form)))) 190 (concat "-not " (find-or (mapcar #'find-to-string form))))
191 191
192(defun find-prune (form) 192(defun find-prune (form)
193 "-or together FORMs postfix `-prune' and then -or that with a 193 "-or together FORMs postfix `-prune' and then -or that with a
194-true, so: 194-true, so:
195 \(\(prune \(name \".svn\" \".git\"\)\) \(name \"*.pm\"\)\) 195 ((prune (name \".svn\" \".git\")) (name \"*.pm\"))
196will produce (unwrapped): 196will produce (unwrapped):
197 \\\( \\\( \\\( -name .svn -or -name .git \\\) / 197 \\( \\( \\( -name .svn -or -name .git \\) /
198 -prune -or -true \\\) -and -name *.pm \\\)" 198 -prune -or -true \\) -and -name *.pm \\)"
199 (find-or 199 (find-or
200 (list 200 (list
201 (concat (find-or (mapcar #'find-to-string form)) (find-generic "prune")) 201 (concat (find-or (mapcar #'find-to-string form)) (find-generic "prune"))
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index b53c1da2a80..c4ef0fef229 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -72,10 +72,10 @@ a file listing in the desired format. LS-SWITCHES is a set of
72 72
73The two options must be set to compatible values. 73The two options must be set to compatible values.
74For example, to use human-readable file sizes with GNU ls: 74For example, to use human-readable file sizes with GNU ls:
75 \(\"-exec ls -ldh {} +\" . \"-ldh\") 75 (\"-exec ls -ldh {} +\" . \"-ldh\")
76 76
77To use GNU find's inbuilt \"-ls\" option to list files: 77To use GNU find's inbuilt \"-ls\" option to list files:
78 \(\"-ls\" . \"-dilsb\") 78 (\"-ls\" . \"-dilsb\")
79since GNU find's output has the same format as using GNU ls with 79since GNU find's output has the same format as using GNU ls with
80the options \"-dilsb\"." 80the options \"-dilsb\"."
81 :version "24.1" ; add tests for -ls and -exec + support 81 :version "24.1" ; add tests for -ls and -exec + support
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 97e95d206d8..5c2c5064453 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -183,7 +183,7 @@ To override this, give an argument to `ff-find-other-file'."
183;;;###autoload 183;;;###autoload
184(defcustom ff-special-constructs 184(defcustom ff-special-constructs
185 ;; C/C++ include, for NeXTstep too 185 ;; C/C++ include, for NeXTstep too
186 `((,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") . 186 `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") .
187 (lambda () 187 (lambda ()
188 (buffer-substring (match-beginning 2) (match-end 2))))) 188 (buffer-substring (match-beginning 2) (match-end 2)))))
189 ;; We include `ff-treat-as-special' documentation here so that autoload 189 ;; We include `ff-treat-as-special' documentation here so that autoload
@@ -678,7 +678,7 @@ name of the first file found."
678 (setq suffixes suffix-list) 678 (setq suffixes suffix-list)
679 679
680 ;; if dir does not contain '/*', look for the file 680 ;; if dir does not contain '/*', look for the file
681 (if (and dir (not (string-match "\\([^*]*\\)/\\\*\\(/.*\\)*" dir))) 681 (if (and dir (not (string-match "\\([^*]*\\)/\\*\\(/.*\\)*" dir)))
682 (progn 682 (progn
683 683
684 ;; suffixes is nil => fname-stub is the file we are looking for 684 ;; suffixes is nil => fname-stub is the file we are looking for
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 64c0af451b8..0a401c77ddf 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -250,7 +250,7 @@ An end marker of nil means the fold ends after (point-max).")
250 "Open the subtree under the current heading and narrow to it. 250 "Open the subtree under the current heading and narrow to it.
251 251
252Normally the body and the immediate subheadings are exposed, but 252Normally the body and the immediate subheadings are exposed, but
253optional arg EXPOSURE \(interactively with prefix arg\) changes this:- 253optional arg EXPOSURE \(interactively with prefix arg) changes this:-
254 254
255 EXPOSURE > 0 exposes n levels of subheadings (c.f. show-children) 255 EXPOSURE > 0 exposes n levels of subheadings (c.f. show-children)
256 EXPOSURE < 0 exposes only the body 256 EXPOSURE < 0 exposes only the body
diff --git a/lisp/format.el b/lisp/format.el
index 96591a70a17..8a756e3396c 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -619,7 +619,7 @@ the rest of the arguments are any PARAMETERs found in that region.
619Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS 619Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS
620are saved as values of the `unknown' text-property \(which is list-valued). 620are saved as values of the `unknown' text-property \(which is list-valued).
621The TRANSLATIONS list should usually contain an entry of the form 621The TRANSLATIONS list should usually contain an entry of the form
622 \(unknown \(nil format-annotate-value)) 622 (unknown (nil format-annotate-value))
623to write these unknown annotations back into the file." 623to write these unknown annotations back into the file."
624 (save-excursion 624 (save-excursion
625 (save-restriction 625 (save-restriction
@@ -839,7 +839,7 @@ the first character in the buffer)."
839 (setq l (cdr l))))) 839 (setq l (cdr l)))))
840 840
841(defun format-annotate-value (old new) 841(defun format-annotate-value (old new)
842 "Return OLD and NEW as a \(CLOSE . OPEN) annotation pair. 842 "Return OLD and NEW as a (CLOSE . OPEN) annotation pair.
843Useful as a default function for TRANSLATIONS alist when the value of the text 843Useful as a default function for TRANSLATIONS alist when the value of the text
844property is the name of the annotation that you want to use, as it is for the 844property is the name of the annotation that you want to use, as it is for the
845`unknown' text property." 845`unknown' text property."
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 01cb3bf93b7..f101ecdea08 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -1557,20 +1557,20 @@ You'll get back all the properties of the token as a plist.
1557Here's an example that looks for the first item in the `Login' 1557Here's an example that looks for the first item in the `Login'
1558Secrets collection: 1558Secrets collection:
1559 1559
1560 \(let ((auth-sources \\='(\"secrets:Login\"))) 1560 (let ((auth-sources \\='(\"secrets:Login\")))
1561 (auth-source-search :max 1) 1561 (auth-source-search :max 1)
1562 1562
1563Here's another that looks for the first item in the `Login' 1563Here's another that looks for the first item in the `Login'
1564Secrets collection whose label contains `gnus': 1564Secrets collection whose label contains `gnus':
1565 1565
1566 \(let ((auth-sources \\='(\"secrets:Login\"))) 1566 (let ((auth-sources \\='(\"secrets:Login\")))
1567 (auth-source-search :max 1 :label \"gnus\") 1567 (auth-source-search :max 1 :label \"gnus\")
1568 1568
1569And this one looks for the first item in the `Login' Secrets 1569And this one looks for the first item in the `Login' Secrets
1570collection that's a Google Chrome entry for the git.gnus.org site 1570collection that's a Google Chrome entry for the git.gnus.org site
1571authentication tokens: 1571authentication tokens:
1572 1572
1573 \(let ((auth-sources \\='(\"secrets:Login\"))) 1573 (let ((auth-sources \\='(\"secrets:Login\")))
1574 (auth-source-search :max 1 :signon_realm \"https://git.gnus.org/Git\")) 1574 (auth-source-search :max 1 :signon_realm \"https://git.gnus.org/Git\"))
1575" 1575"
1576 1576
@@ -1691,19 +1691,19 @@ field), :user maps to \"-a USER\", and :port maps to \"-s PORT\".
1691Here's an example that looks for the first item in the default 1691Here's an example that looks for the first item in the default
1692generic MacOS Keychain: 1692generic MacOS Keychain:
1693 1693
1694 \(let ((auth-sources \\='(macos-keychain-generic))) 1694 (let ((auth-sources \\='(macos-keychain-generic)))
1695 (auth-source-search :max 1) 1695 (auth-source-search :max 1)
1696 1696
1697Here's another that looks for the first item in the internet 1697Here's another that looks for the first item in the internet
1698MacOS Keychain collection whose label is `gnus': 1698MacOS Keychain collection whose label is `gnus':
1699 1699
1700 \(let ((auth-sources \\='(macos-keychain-internet))) 1700 (let ((auth-sources \\='(macos-keychain-internet)))
1701 (auth-source-search :max 1 :label \"gnus\") 1701 (auth-source-search :max 1 :label \"gnus\")
1702 1702
1703And this one looks for the first item in the internet keychain 1703And this one looks for the first item in the internet keychain
1704entries for git.gnus.org: 1704entries for git.gnus.org:
1705 1705
1706 \(let ((auth-sources \\='(macos-keychain-internet\"))) 1706 (let ((auth-sources \\='(macos-keychain-internet\")))
1707 (auth-source-search :max 1 :host \"git.gnus.org\")) 1707 (auth-source-search :max 1 :host \"git.gnus.org\"))
1708" 1708"
1709 ;; TODO 1709 ;; TODO
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c256834dc2e..44aff772402 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5516,7 +5516,7 @@ If no internal viewer is available, use an external viewer."
5516 (mm-display-part handle nil t)))))) 5516 (mm-display-part handle nil t))))))
5517 5517
5518(defun gnus-mime-action-on-part (&optional action) 5518(defun gnus-mime-action-on-part (&optional action)
5519 "Do something with the MIME attachment at \(point\)." 5519 "Do something with the MIME attachment at (point)."
5520 (interactive 5520 (interactive
5521 (list (gnus-completing-read "Action" (mapcar 'car gnus-mime-action-alist) t))) 5521 (list (gnus-completing-read "Action" (mapcar 'car gnus-mime-action-alist) t)))
5522 (gnus-article-check-buffer) 5522 (gnus-article-check-buffer)
@@ -5992,7 +5992,7 @@ If t, it overrides nil values of
5992 "Display \"multipart/related\" parts as \"multipart/mixed\". 5992 "Display \"multipart/related\" parts as \"multipart/mixed\".
5993 5993
5994If displaying \"text/html\" is discouraged \(see 5994If displaying \"text/html\" is discouraged \(see
5995`mm-discouraged-alternatives'\) images or other material inside a 5995`mm-discouraged-alternatives') images or other material inside a
5996\"multipart/related\" part might be overlooked when this variable is nil." 5996\"multipart/related\" part might be overlooked when this variable is nil."
5997 :version "22.1" 5997 :version "22.1"
5998 :group 'gnus-article-mime 5998 :group 'gnus-article-mime
@@ -7545,7 +7545,7 @@ must return `mid', `mail', `invalid' or `ask'."
7545 (10.0 . "^[^0-9]+@") 7545 (10.0 . "^[^0-9]+@")
7546 (3.0 . "^[^0-9]+[0-9][0-9]?[0-9]?@") 7546 (3.0 . "^[^0-9]+[0-9][0-9]?[0-9]?@")
7547 ;; ^[^0-9]+[0-9]{1,3}\@ digits only at end of local part 7547 ;; ^[^0-9]+[0-9]{1,3}\@ digits only at end of local part
7548 (3.0 . "\@stud") 7548 (3.0 . "@stud")
7549 ;; 7549 ;;
7550 (2.0 . "[a-z][a-z][._-][A-Z][a-z].*@") 7550 (2.0 . "[a-z][a-z][._-][A-Z][a-z].*@")
7551 ;; 7551 ;;
@@ -7553,7 +7553,7 @@ must return `mid', `mail', `invalid' or `ask'."
7553 (0.5 . "^[A-Z][a-z][a-z]") 7553 (0.5 . "^[A-Z][a-z][a-z]")
7554 (1.5 . "^[A-Z][a-z][A-Z][a-z][^a-z]") ;; ^[A-Z][a-z]{3,3} 7554 (1.5 . "^[A-Z][a-z][A-Z][a-z][^a-z]") ;; ^[A-Z][a-z]{3,3}
7555 (2.0 . "^[A-Z][a-z][A-Z][a-z][a-z][^a-z]")) ;; ^[A-Z][a-z]{4,4} 7555 (2.0 . "^[A-Z][a-z][A-Z][a-z][a-z][^a-z]")) ;; ^[A-Z][a-z]{4,4}
7556 "An alist of \(RATE . REGEXP\) pairs for `gnus-button-mid-or-mail-heuristic'. 7556 "An alist of (RATE . REGEXP) pairs for `gnus-button-mid-or-mail-heuristic'.
7557 7557
7558A negative RATE indicates a message IDs, whereas a positive indicates a mail 7558A negative RATE indicates a message IDs, whereas a positive indicates a mail
7559address. The REGEXP is processed with `case-fold-search' set to nil." 7559address. The REGEXP is processed with `case-fold-search' set to nil."
@@ -7612,9 +7612,9 @@ address, `ask' if unsure and `invalid' if the string is invalid."
7612 (gnus-message 7612 (gnus-message
7613 9 "Many digits in `%s', rate `%s', result `%s'." 7613 9 "Many digits in `%s', rate `%s', result `%s'."
7614 mid-or-mail rate result)) 7614 mid-or-mail rate result))
7615 ((string-match "[^aeiouy][^aeiouy][^aeiouy][^aeiouy]+.*\@" 7615 ((string-match "[^aeiouy][^aeiouy][^aeiouy][^aeiouy]+.*@"
7616 mid-or-mail) 7616 mid-or-mail)
7617 ;; Too few vowels [^aeiouy]{4,}.*\@ 7617 ;; Too few vowels [^aeiouy]{4,}.*@
7618 (setq result (+ result -5.0)) 7618 (setq result (+ result -5.0))
7619 (gnus-message 7619 (gnus-message
7620 9 "Few vowels in `%s', rate `%s', result `%s'." 7620 9 "Few vowels in `%s', rate `%s', result `%s'."
@@ -8113,7 +8113,7 @@ url is put as the `gnus-button-url' overlay property on the button."
8113 (< (match-end 0) start)) 8113 (< (match-end 0) start))
8114 (regexp-quote (match-string 0))) 8114 (regexp-quote (match-string 0)))
8115 "\ 8115 "\
8116\[\t ]*\\(?:\\([^\t\n \">]+\\)[\t ]*$\\|\\([^\t\n \">]*\\)[\t ]*" 8116[\t ]*\\(?:\\([^\t\n \">]+\\)[\t ]*$\\|\\([^\t\n \">]*\\)[\t ]*"
8117 delim "\\)")) 8117 delim "\\)"))
8118 (while (progn 8118 (while (progn
8119 (forward-line 1) 8119 (forward-line 1)
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index e26c78b65c5..3e4807cd7ce 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -101,7 +101,7 @@ List of details is defined in `gnus-bookmark-bookmark-inline-details'.
101This may result in truncated bookmark names. To disable this, put the 101This may result in truncated bookmark names. To disable this, put the
102following in your `.emacs' file: 102following in your `.emacs' file:
103 103
104\(setq gnus-bookmark-bmenu-toggle-infos nil\)" 104\(setq gnus-bookmark-bmenu-toggle-infos nil)"
105 :type 'boolean 105 :type 'boolean
106 :group 'gnus-bookmark) 106 :group 'gnus-bookmark)
107 107
@@ -118,7 +118,7 @@ You can toggle whether details are shown with \\<gnus-bookmark-bmenu-mode-map>\\
118 118
119(defcustom gnus-bookmark-bookmark-inline-details '(author) 119(defcustom gnus-bookmark-bookmark-inline-details '(author)
120 "Details to be shown with `gnus-bookmark-bmenu-toggle-infos'. 120 "Details to be shown with `gnus-bookmark-bmenu-toggle-infos'.
121The default value is \(subject\)." 121The default value is \(subject)."
122 :type '(list :tag "Gnus bookmark details" 122 :type '(list :tag "Gnus bookmark details"
123 (set :inline t 123 (set :inline t
124 (const :tag "Author" author) 124 (const :tag "Author" author)
@@ -131,7 +131,7 @@ The default value is \(subject\)."
131(defcustom gnus-bookmark-bookmark-details 131(defcustom gnus-bookmark-bookmark-details
132 '(author subject date group annotation) 132 '(author subject date group annotation)
133 "Details to be shown with `gnus-bookmark-bmenu-show-details'. 133 "Details to be shown with `gnus-bookmark-bmenu-show-details'.
134The default value is \(author subject date group annotation\)." 134The default value is \(author subject date group annotation)."
135 :type '(list :tag "Gnus bookmark details" 135 :type '(list :tag "Gnus bookmark details"
136 (set :inline t 136 (set :inline t
137 (const :tag "Author" author) 137 (const :tag "Author" author)
@@ -160,17 +160,17 @@ You should never need to change this.")
160 "Association list of Gnus bookmarks and their records. 160 "Association list of Gnus bookmarks and their records.
161The format of the alist is 161The format of the alist is
162 162
163 \(BMK1 BMK2 ...\) 163 (BMK1 BMK2 ...)
164 164
165where each BMK is of the form 165where each BMK is of the form
166 166
167\(NAME 167\(NAME
168 \(group . GROUP\) 168 (group . GROUP)
169 \(message-id . MESSAGE-ID\) 169 (message-id . MESSAGE-ID)
170 \(author . AUTHOR\) 170 (author . AUTHOR)
171 \(date . DATE\) 171 (date . DATE)
172 \(subject . SUBJECT\) 172 (subject . SUBJECT)
173 \(annotation . ANNOTATION\)\) 173 (annotation . ANNOTATION))
174 174
175So the cdr of each bookmark is an alist too.") 175So the cdr of each bookmark is an alist too.")
176 176
@@ -432,7 +432,7 @@ That is, all information but the name."
432 (car (cdr (gnus-bookmark-get-bookmark bookmark)))) 432 (car (cdr (gnus-bookmark-get-bookmark bookmark))))
433 433
434(defun gnus-bookmark-name-from-full-record (full-record) 434(defun gnus-bookmark-name-from-full-record (full-record)
435 "Return name of FULL-RECORD \(an alist element instead of a string\)." 435 "Return name of FULL-RECORD (an alist element instead of a string)."
436 (car full-record)) 436 (car full-record))
437 437
438(defvar gnus-bookmark-bmenu-bookmark-column nil) 438(defvar gnus-bookmark-bmenu-bookmark-column nil)
@@ -484,7 +484,7 @@ Gnus bookmarks names preceded by a \"*\" have annotations.
484 Also show bookmarks marked using m in other windows. 484 Also show bookmarks marked using m in other windows.
485\\[gnus-bookmark-bmenu-toggle-infos] -- toggle displaying of details (they may obscure long bookmark names). 485\\[gnus-bookmark-bmenu-toggle-infos] -- toggle displaying of details (they may obscure long bookmark names).
486\\[gnus-bookmark-bmenu-locate] -- display (in minibuffer) location of this bookmark. 486\\[gnus-bookmark-bmenu-locate] -- display (in minibuffer) location of this bookmark.
487\\[gnus-bookmark-bmenu-rename] -- rename this bookmark \(prompts for new name\). 487\\[gnus-bookmark-bmenu-rename] -- rename this bookmark (prompts for new name).
488\\[gnus-bookmark-bmenu-delete] -- mark this bookmark to be deleted, and move down. 488\\[gnus-bookmark-bmenu-delete] -- mark this bookmark to be deleted, and move down.
489\\[gnus-bookmark-bmenu-delete-backwards] -- mark this bookmark to be deleted, and move up. 489\\[gnus-bookmark-bmenu-delete-backwards] -- mark this bookmark to be deleted, and move up.
490\\[gnus-bookmark-bmenu-execute-deletions] -- delete bookmarks marked with `\\[gnus-bookmark-bmenu-delete]'. 490\\[gnus-bookmark-bmenu-execute-deletions] -- delete bookmarks marked with `\\[gnus-bookmark-bmenu-delete]'.
@@ -806,7 +806,7 @@ command."
806Removes only the first instance of a bookmark with that name. If 806Removes only the first instance of a bookmark with that name. If
807there are one or more other bookmarks with the same name, they will 807there are one or more other bookmarks with the same name, they will
808not be deleted. Defaults to the \"current\" bookmark \(that is, the 808not be deleted. Defaults to the \"current\" bookmark \(that is, the
809one most recently used in this file, if any\). 809one most recently used in this file, if any).
810Optional second arg BATCH means don't update the bookmark list buffer, 810Optional second arg BATCH means don't update the bookmark list buffer,
811probably because we were called from there." 811probably because we were called from there."
812 (gnus-bookmark-maybe-load-default-file) 812 (gnus-bookmark-maybe-load-default-file)
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index 93b7a1ba635..9b8cbc3589d 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -436,7 +436,7 @@ to the groups in this topic, then edit the value to suit your taste."
436 :greedy t 436 :greedy t
437 :tag "Agent Parameters" 437 :tag "Agent Parameters"
438 :format "%t:\n%h%v" 438 :format "%t:\n%h%v"
439 :doc "\ These agent parameters are 439 :doc "These agent parameters are
440recognized by Gnus. They control article selection and expiration for 440recognized by Gnus. They control article selection and expiration for
441use in the unplugged cache. Check the [ ] for the parameters you want 441use in the unplugged cache. Check the [ ] for the parameters you want
442to apply to this group or to the groups in this topic, then edit the 442to apply to this group or to the groups in this topic, then edit the
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 21cb1b8b133..b1a4933ebf1 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -155,7 +155,7 @@ list."
155 (function-item gnus-group-sort-by-rank) 155 (function-item gnus-group-sort-by-rank)
156 (function :tag "other" nil)))) 156 (function :tag "other" nil))))
157 157
158(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)\n" 158(defcustom gnus-group-line-format "%M\ %S\ %p\ %P\ %5y:%B%(%g%)\n"
159 "*Format of group lines. 159 "*Format of group lines.
160It works along the same lines as a normal formatting string, 160It works along the same lines as a normal formatting string,
161with some simple extensions. 161with some simple extensions.
@@ -213,7 +213,7 @@ See Info node `(gnus)Formatting Variables'."
213 :group 'gnus-group-visual 213 :group 'gnus-group-visual
214 :type 'string) 214 :type 'string)
215 215
216(defcustom gnus-group-mode-line-format "Gnus: %%b {%M\%:%S}" 216(defcustom gnus-group-mode-line-format "Gnus: %%b {%M\ %:%S}"
217 "*The format specification for the group mode line. 217 "*The format specification for the group mode line.
218It works along the same lines as a normal formatting string, 218It works along the same lines as a normal formatting string,
219with some simple extensions: 219with some simple extensions:
@@ -445,7 +445,7 @@ If non-nil, the value should be a string or an alist. If it is a string,
445e.g. \"nnml:\", in which case `gnus-group-jump-to-group' offers \"Group: 445e.g. \"nnml:\", in which case `gnus-group-jump-to-group' offers \"Group:
446nnml:\" in the minibuffer prompt. 446nnml:\" in the minibuffer prompt.
447 447
448If it is an alist, it must consist of \(NUMBER . PROMPT\) pairs, for example: 448If it is an alist, it must consist of \(NUMBER . PROMPT) pairs, for example:
449\((1 . \"\") (2 . \"nnfolder+archive:\")). The element with number 0 is 449\((1 . \"\") (2 . \"nnfolder+archive:\")). The element with number 0 is
450used when no prefix argument is given to `gnus-group-jump-to-group'." 450used when no prefix argument is given to `gnus-group-jump-to-group'."
451 :version "22.1" 451 :version "22.1"
@@ -2174,7 +2174,7 @@ be permanent."
2174 (gnus-group-decoded-name group))) 2174 (gnus-group-decoded-name group)))
2175 (let ((regexp "[][\C-@-\t\v-*,/:-@\\^`{-\C-?]*\ 2175 (let ((regexp "[][\C-@-\t\v-*,/:-@\\^`{-\C-?]*\
2176\\(nn[a-z]+\\(?:\\+[^][\C-@-*,/:-@\\^`{-\C-?]+\\)?:\ 2176\\(nn[a-z]+\\(?:\\+[^][\C-@-*,/:-@\\^`{-\C-?]+\\)?:\
2177\[^][\C-@-*,./:-@\\^`{-\C-?]+\\(?:\\.[^][\C-@-*,./:-@\\^`{-\C-?]+\\)*\ 2177[^][\C-@-*,./:-@\\^`{-\C-?]+\\(?:\\.[^][\C-@-*,./:-@\\^`{-\C-?]+\\)*\
2178\\|[^][\C-@-*,./:-@\\^`{-\C-?]+\\(?:\\.[^][\C-@-*,./:-@\\^`{-\C-?]+\\)+\\)") 2178\\|[^][\C-@-*,./:-@\\^`{-\C-?]+\\(?:\\.[^][\C-@-*,./:-@\\^`{-\C-?]+\\)+\\)")
2179 (start (point)) 2179 (start (point))
2180 (case-fold-search nil)) 2180 (case-fold-search nil))
diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el
index 56166f2fca2..37a5d6150db 100644
--- a/lisp/gnus/gnus-mlspl.el
+++ b/lisp/gnus/gnus-mlspl.el
@@ -100,7 +100,7 @@ See `gnus-group-split-fancy' for more information.
100 "Uses information from group parameters in order to split mail. 100 "Uses information from group parameters in order to split mail.
101It can be embedded into `nnmail-split-fancy' lists with the SPLIT 101It can be embedded into `nnmail-split-fancy' lists with the SPLIT
102 102
103\(: gnus-group-split-fancy GROUPS NO-CROSSPOST CATCH-ALL\) 103\(: gnus-group-split-fancy GROUPS NO-CROSSPOST CATCH-ALL)
104 104
105GROUPS may be a regular expression or a list of group names, that will 105GROUPS may be a regular expression or a list of group names, that will
106be used to select candidate groups. If it is omitted or nil, all 106be used to select candidate groups. If it is omitted or nil, all
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 23c79cbdb15..77ff428e1f1 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -251,7 +251,7 @@ In order to prevent constant pruning, we prune back to a number
251somewhat less than the maximum size. This option controls 251somewhat less than the maximum size. This option controls
252exactly how much less. For example, given a maximum size of 252exactly how much less. For example, given a maximum size of
25350000 and a prune factor of 0.1, the pruning process will try to 25350000 and a prune factor of 0.1, the pruning process will try to
254cut the registry back to \(- 50000 \(* 50000 0.1\)\) -> 45000 254cut the registry back to \(- 50000 \(* 50000 0.1)) -> 45000
255entries. The pruning process is constrained by the presence of 255entries. The pruning process is constrained by the presence of
256\"precious\" entries." 256\"precious\" entries."
257 :version "25.1" 257 :version "25.1"
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 5776b0a569f..bca5f43cd5f 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -62,7 +62,7 @@
62 :group 'gnus-summary-pick) 62 :group 'gnus-summary-pick)
63 63
64(defcustom gnus-summary-pick-line-format 64(defcustom gnus-summary-pick-line-format
65 "%-5P %U\%R\%z\%I\%(%[%4L: %-23,23n%]%) %s\n" 65 "%-5P %U\ %R\ %z\ %I\ %(%[%4L: %-23,23n%]%) %s\n"
66 "*The format specification of the lines in pick buffers. 66 "*The format specification of the lines in pick buffers.
67It accepts the same format specs that `gnus-summary-line-format' does." 67It accepts the same format specs that `gnus-summary-line-format' does."
68 :type 'string 68 :type 'string
diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index cde93764cac..2a8ea3ed201 100644
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -80,7 +80,7 @@ formatting characters are recognized:
80(defun gnus-sieve-update () 80(defun gnus-sieve-update ()
81 "Update the Sieve script in gnus-sieve-file, by replacing the region 81 "Update the Sieve script in gnus-sieve-file, by replacing the region
82between gnus-sieve-region-start and gnus-sieve-region-end with 82between gnus-sieve-region-start and gnus-sieve-region-end with
83\(gnus-sieve-script gnus-sieve-select-method gnus-sieve-crosspost\), then 83\(gnus-sieve-script gnus-sieve-select-method gnus-sieve-crosspost), then
84execute gnus-sieve-update-shell-command. 84execute gnus-sieve-update-shell-command.
85See the documentation for these variables and functions for details." 85See the documentation for these variables and functions for details."
86 (interactive) 86 (interactive)
@@ -97,7 +97,7 @@ See the documentation for these variables and functions for details."
97(defun gnus-sieve-generate () 97(defun gnus-sieve-generate ()
98 "Generate the Sieve script in gnus-sieve-file, by replacing the region 98 "Generate the Sieve script in gnus-sieve-file, by replacing the region
99between gnus-sieve-region-start and gnus-sieve-region-end with 99between gnus-sieve-region-start and gnus-sieve-region-end with
100\(gnus-sieve-script gnus-sieve-select-method gnus-sieve-crosspost\). 100\(gnus-sieve-script gnus-sieve-select-method gnus-sieve-crosspost).
101See the documentation for these variables and functions for details." 101See the documentation for these variables and functions for details."
102 (interactive) 102 (interactive)
103 (require 'sieve) 103 (require 'sieve)
@@ -195,9 +195,9 @@ For example:
195 195
196(defun gnus-sieve-script (&optional method crosspost) 196(defun gnus-sieve-script (&optional method crosspost)
197 "Generate a Sieve script based on groups with select method METHOD 197 "Generate a Sieve script based on groups with select method METHOD
198\(or all groups if nil\). Only groups having a `sieve' parameter are 198\(or all groups if nil). Only groups having a `sieve' parameter are
199considered. This parameter should contain an elisp test 199considered. This parameter should contain an elisp test
200\(see the documentation of gnus-sieve-test for details\). For each 200\(see the documentation of gnus-sieve-test for details). For each
201such group, a Sieve IF control structure is generated, having the 201such group, a Sieve IF control structure is generated, having the
202test as the condition and { fileinto \"group.name\"; } as the body. 202test as the condition and { fileinto \"group.name\"; } as the body.
203 203
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 215eac88aef..40e2dcf92fd 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1486,7 +1486,7 @@ sure of changing the value of `foo'."
1486(defvar gnus-directory-sep-char-regexp "/" 1486(defvar gnus-directory-sep-char-regexp "/"
1487 "The regexp of directory separator character. 1487 "The regexp of directory separator character.
1488If you find some problem with the directory separator character, try 1488If you find some problem with the directory separator character, try
1489\"[/\\\\\]\" for some systems.") 1489\"[/\\\\]\" for some systems.")
1490 1490
1491(defun gnus-url-unhex (x) 1491(defun gnus-url-unhex (x)
1492 (if (> x ?9) 1492 (if (> x ?9)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ea26216faca..a2913ac9fdd 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1361,7 +1361,7 @@ group (or nil) as a parameter.
1361If you want to save your mail in one group and the news articles you 1361If you want to save your mail in one group and the news articles you
1362write in another group, you could say something like: 1362write in another group, you could say something like:
1363 1363
1364 \(setq gnus-message-archive-group 1364 (setq gnus-message-archive-group
1365 \\='((if (message-news-p) 1365 \\='((if (message-news-p)
1366 \"misc-news\" 1366 \"misc-news\"
1367 \"misc-mail\"))) 1367 \"misc-mail\")))
@@ -2517,10 +2517,10 @@ This should be an alist for Emacs, or a plist for XEmacs."
2517 "Which information should be exposed in the User-Agent header. 2517 "Which information should be exposed in the User-Agent header.
2518 2518
2519Can be a list of symbols or a string. Valid symbols are `gnus' 2519Can be a list of symbols or a string. Valid symbols are `gnus'
2520\(show Gnus version\) and `emacs' \(show Emacs version\). In 2520\(show Gnus version) and `emacs' \(show Emacs version). In
2521addition to the Emacs version, you can add `codename' \(show 2521addition to the Emacs version, you can add `codename' \(show
2522\(S\)XEmacs codename\) or either `config' \(show system 2522\(S)XEmacs codename) or either `config' \(show system
2523configuration\) or `type' \(show system type\). If you set it to 2523configuration) or `type' \(show system type). If you set it to
2524a string, be sure to use a valid format, see RFC 2616." 2524a string, be sure to use a valid format, see RFC 2616."
2525 2525
2526 :version "22.1" 2526 :version "22.1"
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 13ed8c05809..1b693d77983 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -367,7 +367,7 @@ few false positives here."
367 367
368(defcustom message-archive-header "X-No-Archive: Yes\n" 368(defcustom message-archive-header "X-No-Archive: Yes\n"
369 "Header to insert when you don't want your article to be archived. 369 "Header to insert when you don't want your article to be archived.
370Archives \(such as groups.google.com\) respect this header." 370Archives \(such as groups.google.com) respect this header."
371 :version "22.1" 371 :version "22.1"
372 :type 'string 372 :type 'string
373 :link '(custom-manual "(message)Header Commands") 373 :link '(custom-manual "(message)Header Commands")
@@ -1200,7 +1200,7 @@ If stringp, use this; if non-nil, use no host name (user name only)."
1200(defvar message-reply-headers nil 1200(defvar message-reply-headers nil
1201 "The headers of the current replied article. 1201 "The headers of the current replied article.
1202It is a vector of the following headers: 1202It is a vector of the following headers:
1203\[number subject from date id references chars lines xref extra].") 1203[number subject from date id references chars lines xref extra].")
1204(defvar message-newsreader nil) 1204(defvar message-newsreader nil)
1205(defvar message-mailer nil) 1205(defvar message-mailer nil)
1206(defvar message-sent-message-via nil) 1206(defvar message-sent-message-via nil)
@@ -1303,7 +1303,7 @@ actually occur."
1303 "Alist of ways to send outgoing messages. 1303 "Alist of ways to send outgoing messages.
1304Each element has the form 1304Each element has the form
1305 1305
1306 \(TYPE PREDICATE FUNCTION) 1306 (TYPE PREDICATE FUNCTION)
1307 1307
1308where TYPE is a symbol that names the method; PREDICATE is a function 1308where TYPE is a symbol that names the method; PREDICATE is a function
1309called without any parameters to determine whether the message is 1309called without any parameters to determine whether the message is
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 3d5a15afedb..327b0e6e86f 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1419,7 +1419,7 @@ Return t if meta tag is added or replaced."
1419 (goto-char (point-min)) 1419 (goto-char (point-min))
1420 (if (re-search-forward "\ 1420 (if (re-search-forward "\
1421<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\ 1421<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
1422text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\([^\"'>]+\\)\\)?[^>]*>" nil t) 1422text/\\(\\sw+\\)\\(?:;\\s-*charset=\\([^\"'>]+\\)\\)?[^>]*>" nil t)
1423 (if (and (not force-charset) 1423 (if (and (not force-charset)
1424 (match-beginning 2) 1424 (match-beginning 2)
1425 (string-match "\\`html\\'" (match-string 1))) 1425 (string-match "\\`html\\'" (match-string 1)))
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el
index 70d803faf54..cca341875e0 100644
--- a/lisp/gnus/nndoc.el
+++ b/lisp/gnus/nndoc.el
@@ -742,7 +742,7 @@ from the document.")
742 nil t) 742 nil t)
743 (setq subject (concat (match-string 1) subject)) 743 (setq subject (concat (match-string 1) subject))
744 (setq from (concat (match-string 2) " " from)))))) 744 (setq from (concat (match-string 2) " " from))))))
745 (while (and from (string-match "(\[^)\]*)" from)) 745 (while (and from (string-match "([^)]*)" from))
746 (setq from (replace-match "" t t from))) 746 (setq from (replace-match "" t t from)))
747 (insert "From: " (or from "unknown") 747 (insert "From: " (or from "unknown")
748 "\nSubject: " (or subject "(no subject)") "\n") 748 "\nSubject: " (or subject "(no subject)") "\n")
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index c88f4afa7dc..0d2d453df3e 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -66,7 +66,7 @@ they will keep on jabbering all the time."
66 "*Max length of the head of articles. 66 "*Max length of the head of articles.
67 67
68Value is an integer, nil, or t. nil means read in chunks of a file 68Value is an integer, nil, or t. nil means read in chunks of a file
69indefinitely until a complete head is found\; t means always read the 69indefinitely until a complete head is found; t means always read the
70entire file immediately, disregarding `nnheader-head-chop-length'. 70entire file immediately, disregarding `nnheader-head-chop-length'.
71 71
72Integer values will in effect be rounded up to the nearest multiple of 72Integer values will in effect be rounded up to the nearest multiple of
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index 58b17415721..9f3f38175bc 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -112,7 +112,7 @@
112 :initform 0.1 112 :initform 0.1
113 :type float 113 :type float
114 :custom float 114 :custom float
115 :documentation "Prune to \(:max-size * :prune-factor\) less 115 :documentation "Prune to (:max-size * :prune-factor) less
116 than the :max-size limit. Should be a float between 0 and 1.") 116 than the :max-size limit. Should be a float between 0 and 1.")
117 (tracked :initarg :tracked 117 (tracked :initarg :tracked
118 :initform nil 118 :initform nil
@@ -331,7 +331,7 @@ Errors out if the key exists already."
331 "Prunes the registry-db object DB. 331 "Prunes the registry-db object DB.
332 332
333Attempts to prune the number of entries down to \(* 333Attempts to prune the number of entries down to \(*
334:max-size :prune-factor\) less than the max-size limit, so 334:max-size :prune-factor) less than the max-size limit, so
335pruning doesn't need to happen on every save. Removes only 335pruning doesn't need to happen on every save. Removes only
336entries without the :precious keys, so it may not be possible to 336entries without the :precious keys, so it may not be possible to
337reach the target limit. 337reach the target limit.
diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index cab2f4e751c..83bda2af8a9 100644
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -46,11 +46,11 @@
46 46
47(defvar rfc1843-hzp-word-regexp 47(defvar rfc1843-hzp-word-regexp
48 "~\\({\\([\041-\167][\041-\176]\\| \\)+\\|\ 48 "~\\({\\([\041-\167][\041-\176]\\| \\)+\\|\
49\[<>]\\([\041-\175][\041-\176]\\| \\)+\\)\\(~}\\|$\\)") 49[<>]\\([\041-\175][\041-\176]\\| \\)+\\)\\(~}\\|$\\)")
50 50
51(defvar rfc1843-hzp-word-regexp-strictly 51(defvar rfc1843-hzp-word-regexp-strictly
52 "~\\({\\([\041-\167][\041-\176]\\)+\\|\ 52 "~\\({\\([\041-\167][\041-\176]\\)+\\|\
53\[<>]\\([\041-\175][\041-\176]\\)+\\)\\(~}\\|$\\)") 53[<>]\\([\041-\175][\041-\176]\\)+\\)\\(~}\\|$\\)")
54 54
55(defcustom rfc1843-decode-loosely nil 55(defcustom rfc1843-decode-loosely nil
56 "Loosely check HZ encoding if non-nil. 56 "Loosely check HZ encoding if non-nil.
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index ea558d75a20..e8a377979ff 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -102,7 +102,7 @@ quoted-printable and base64 respectively.")
102 102
103(eval-and-compile ;; Necessary to hard code them in `rfc2047-decode-region'. 103(eval-and-compile ;; Necessary to hard code them in `rfc2047-decode-region'.
104 (defconst rfc2047-encoded-word-regexp 104 (defconst rfc2047-encoded-word-regexp
105 "=\\?\\([^][\000-\040()<>@,\;:*\\\"/?.=]+\\)\\(?:\\*[^?]+\\)?\\?\ 105 "=\\?\\([^][\000-\040()<>@,;:*\\\"/?.=]+\\)\\(?:\\*[^?]+\\)?\\?\
106\\(B\\?[+/0-9A-Za-z]*=*\ 106\\(B\\?[+/0-9A-Za-z]*=*\
107\\|Q\\?[ ->@-~]*\ 107\\|Q\\?[ ->@-~]*\
108\\)\\?=" 108\\)\\?="
@@ -112,7 +112,7 @@ quoted-printable and base64 respectively.")
112 ;; the characters that those encodings may generally use. 112 ;; the characters that those encodings may generally use.
113 ) 113 )
114 (defconst rfc2047-encoded-word-regexp-loose 114 (defconst rfc2047-encoded-word-regexp-loose
115 "=\\?\\([^][\000-\040()<>@,\;:*\\\"/?.=]+\\)\\(?:\\*[^?]+\\)?\\?\ 115 "=\\?\\([^][\000-\040()<>@,;:*\\\"/?.=]+\\)\\(?:\\*[^?]+\\)?\\?\
116\\(B\\?[+/0-9A-Za-z]*=*\ 116\\(B\\?[+/0-9A-Za-z]*=*\
117\\|Q\\?\\(?:\\?+[ -<>@-~]\\)?\\(?:[ ->@-~]+\\?+[ -<>@-~]\\)*[ ->@-~]*\\?*\ 117\\|Q\\?\\(?:\\?+[ -<>@-~]\\)?\\(?:[ ->@-~]+\\?+[ -<>@-~]\\)*[ ->@-~]*\\?*\
118\\)\\?=" 118\\)\\?="
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 77ef21d4af1..945b4d523cc 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -178,7 +178,7 @@ if the variable `help-downcase-arguments' is non-nil."
178 (skip-chars-forward "^ ") 178 (skip-chars-forward "^ ")
179 (while next 179 (while next
180 (or opt (not (looking-at " &")) (setq opt t)) 180 (or opt (not (looking-at " &")) (setq opt t))
181 (if (not (re-search-forward " \\([\\[(]*\\)\\([^] &)\.]+\\)" nil t)) 181 (if (not (re-search-forward " \\([\\[(]*\\)\\([^] &).]+\\)" nil t))
182 (setq next nil) 182 (setq next nil)
183 (setq args (cons (match-string 2) args)) 183 (setq args (cons (match-string 2) args))
184 (when (and opt (string= (match-string 1) "(")) 184 (when (and opt (string= (match-string 1) "("))
diff --git a/lisp/help.el b/lisp/help.el
index 66df6b08037..3387628fb8a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -355,7 +355,7 @@ With argument, display info only for the selected version."
355 (while (re-search-forward 355 (while (re-search-forward
356 (if (member file '("NEWS.18" "NEWS.1-17")) 356 (if (member file '("NEWS.18" "NEWS.1-17"))
357 "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" 357 "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)"
358 "^\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t) 358 "^\\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t)
359 (setq res (cons (match-string-no-properties 1) res))))) 359 (setq res (cons (match-string-no-properties 1) res)))))
360 (cons "NEWS" 360 (cons "NEWS"
361 (directory-files data-directory nil 361 (directory-files data-directory nil
@@ -392,7 +392,7 @@ With argument, display info only for the selected version."
392 (when (re-search-forward 392 (when (re-search-forward
393 (concat (if (< vn 19) 393 (concat (if (< vn 19)
394 "Changes in Emacs[ \t]*" 394 "Changes in Emacs[ \t]*"
395 "^\* [^0-9\n]*") version "$") 395 "^\\* [^0-9\n]*") version "$")
396 nil t) 396 nil t)
397 (beginning-of-line) 397 (beginning-of-line)
398 (narrow-to-region 398 (narrow-to-region
@@ -402,7 +402,7 @@ With argument, display info only for the selected version."
402 (re-search-forward 402 (re-search-forward
403 (if (< vn 19) 403 (if (< vn 19)
404 "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" 404 "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)"
405 "^\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t)) 405 "^\\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t))
406 (equal (match-string-no-properties 1) version))) 406 (equal (match-string-no-properties 1) version)))
407 (or res (goto-char (point-max))) 407 (or res (goto-char (point-max)))
408 (beginning-of-line) 408 (beginning-of-line)
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index b7d3b344aca..6b7f2caed1e 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -810,7 +810,7 @@ Loads the variable `hfy-rgb-txt-colour-map', which is used by
810`hfy-fallback-colour-values'." 810`hfy-fallback-colour-values'."
811 (interactive 811 (interactive
812 (list 812 (list
813 (read-file-name "rgb.txt \(equivalent\) file: " "" nil t (hfy-rgb-file)))) 813 (read-file-name "rgb.txt (equivalent) file: " "" nil t (hfy-rgb-file))))
814 (let ((rgb-buffer nil) 814 (let ((rgb-buffer nil)
815 (end-of-rgb 0) 815 (end-of-rgb 0)
816 (rgb-txt nil)) 816 (rgb-txt nil))
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 74cdfe13f58..0a0a0b346c0 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1140,7 +1140,7 @@ See also `hfy-face-to-css'."
1140 1140
1141(defvar hfy-face-to-css 'hfy-face-to-css-default 1141(defvar hfy-face-to-css 'hfy-face-to-css-default
1142 "Handler for mapping faces to styles. 1142 "Handler for mapping faces to styles.
1143The signature of the handler is of the form \(lambda (FN) ...\). 1143The signature of the handler is of the form \(lambda (FN) ...).
1144FN is a font or `defface' specification (cf 1144FN is a font or `defface' specification (cf
1145`face-attr-construct'). The handler should return a cons cell of 1145`face-attr-construct'). The handler should return a cons cell of
1146the form (STYLE-NAME . STYLE-SPEC). 1146the form (STYLE-NAME . STYLE-SPEC).
@@ -1598,7 +1598,7 @@ information."
1598(defvar hfy-begin-span-handler 'hfy-begin-span 1598(defvar hfy-begin-span-handler 'hfy-begin-span
1599 "Handler to begin a span of text. 1599 "Handler to begin a span of text.
1600The signature of the handler is \(lambda (STYLE TEXT-BLOCK 1600The signature of the handler is \(lambda (STYLE TEXT-BLOCK
1601TEXT-ID TEXT-BEGINS-BLOCK-P) ...\). The handler must insert 1601TEXT-ID TEXT-BEGINS-BLOCK-P) ...). The handler must insert
1602appropriate tags to begin a span of text. 1602appropriate tags to begin a span of text.
1603 1603
1604STYLE is the name of the style that begins at point. It is 1604STYLE is the name of the style that begins at point. It is
@@ -1626,7 +1626,7 @@ The default handler is `hfy-begin-span'.")
1626 1626
1627(defvar hfy-end-span-handler 'hfy-end-span 1627(defvar hfy-end-span-handler 'hfy-end-span
1628 "Handler to end a span of text. 1628 "Handler to end a span of text.
1629The signature of the handler is \(lambda () ...\). The handler 1629The signature of the handler is \(lambda () ...). The handler
1630must insert appropriate tags to end a span of text. 1630must insert appropriate tags to end a span of text.
1631 1631
1632The default handler is `hfy-end-span'.") 1632The default handler is `hfy-end-span'.")
@@ -2412,7 +2412,7 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'."
2412 (load file 'NOERROR nil nil) )) 2412 (load file 'NOERROR nil nil) ))
2413 2413
2414 2414
2415;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "ce07a28b93c09032fd6b225ad74be0df") 2415;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "1fb78b15b18622256262c7246b2a3520")
2416;;; Generated autoloads from hfy-cmap.el 2416;;; Generated autoloads from hfy-cmap.el
2417 2417
2418(autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\ 2418(autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index dc34a63aba9..5065b661101 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1785,7 +1785,7 @@ If point is on a group name, this function operates on that group."
1785 (let ((procs 0) 1785 (let ((procs 0)
1786 (files 0)) 1786 (files 0))
1787 (dolist (string strings) 1787 (dolist (string strings)
1788 (if (string-match "\\(\?:\\`(\[\[:ascii:\]\]\+)\\)" string) 1788 (if (string-match "\\(?:\\`([[:ascii:]]+)\\)" string)
1789 (progn (setq procs (1+ procs)) 1789 (progn (setq procs (1+ procs))
1790 (if (< (match-end 0) (length string)) 1790 (if (< (match-end 0) (length string))
1791 (setq files (1+ files)))) 1791 (setq files (1+ files))))
diff --git a/lisp/ido.el b/lisp/ido.el
index 13b6d52e75c..6ad354c58f2 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3777,13 +3777,13 @@ frame, rather than all frames, regardless of value of `ido-all-frames'."
3777 (not (and (eq ido-cur-item 'buffer) 3777 (not (and (eq ido-cur-item 'buffer)
3778 ido-buffer-disable-smart-matches)) 3778 ido-buffer-disable-smart-matches))
3779 (not ido-enable-regexp) 3779 (not ido-enable-regexp)
3780 (not (string-match "\$\\'" rex0)) 3780 (not (string-match "$\\'" rex0))
3781 (concat "\\`" rex0 (if slash "/" "") "\\'"))) 3781 (concat "\\`" rex0 (if slash "/" "") "\\'")))
3782 (suffix-re (and do-full slash 3782 (suffix-re (and do-full slash
3783 (not (and (eq ido-cur-item 'buffer) 3783 (not (and (eq ido-cur-item 'buffer)
3784 ido-buffer-disable-smart-matches)) 3784 ido-buffer-disable-smart-matches))
3785 (not ido-enable-regexp) 3785 (not ido-enable-regexp)
3786 (not (string-match "\$\\'" rex0)) 3786 (not (string-match "$\\'" rex0))
3787 (concat rex0 "/\\'"))) 3787 (concat rex0 "/\\'")))
3788 (prefix-re (and full-re (not ido-enable-prefix) 3788 (prefix-re (and full-re (not ido-enable-prefix)
3789 (concat "\\`" rexq))) 3789 (concat "\\`" rexq)))
diff --git a/lisp/image.el b/lisp/image.el
index 0c62088ca5d..d557e39aac2 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -34,7 +34,7 @@
34 34
35(defconst image-type-header-regexps 35(defconst image-type-header-regexps
36 `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) 36 `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
37 ("\\`P[1-6]\\\(?:\ 37 ("\\`P[1-6]\\(?:\
38\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\ 38\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\
39\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\ 39\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\
40\\)\\{2\\}" . pbm) 40\\)\\{2\\}" . pbm)
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 6168a0c2660..70c30c3e7a6 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -142,7 +142,7 @@ OTHER-MODES is a list of cross references to other help modes.")
142 "Add or update a help specification. 142 "Add or update a help specification.
143Function arguments are specified as keyword/argument pairs: 143Function arguments are specified as keyword/argument pairs:
144 144
145 \(KEYWORD . ARGUMENT) 145 (KEYWORD . ARGUMENT)
146 146
147KEYWORD is either `:topic', `:mode', `:regexp', `:ignore-case', 147KEYWORD is either `:topic', `:mode', `:regexp', `:ignore-case',
148 `:doc-spec', `:parse-rule', or `:other-modes'. 148 `:doc-spec', `:parse-rule', or `:other-modes'.
diff --git a/lisp/info.el b/lisp/info.el
index 95f0bcbd37c..bd12d568291 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3838,7 +3838,7 @@ START is a regular expression which will match the
3838 beginning of the tokens delimited string. 3838 beginning of the tokens delimited string.
3839ALL is a regular expression with a single 3839ALL is a regular expression with a single
3840 parenthesized subpattern which is the token to be 3840 parenthesized subpattern which is the token to be
3841 returned. E.g. `{\(.*\)}' would return any string 3841 returned. E.g. `{(.*)}' would return any string
3842 enclosed in braces around POS. 3842 enclosed in braces around POS.
3843ERRORSTRING optional fourth argument, controls action on no match: 3843ERRORSTRING optional fourth argument, controls action on no match:
3844 nil: return nil 3844 nil: return nil
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index 61db03d9b76..d662699c17c 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -46,7 +46,7 @@
46(defvar iso-spanish-trans-tab 46(defvar iso-spanish-trans-tab
47 '( 47 '(
48 ("~n" "ñ") 48 ("~n" "ñ")
49 ("\([a-zA-Z]\)#" "\\1ñ") 49 ("([a-zA-Z])#" "\\1ñ")
50 ("~N" "Ñ") 50 ("~N" "Ñ")
51 ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü") 51 ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü")
52 ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü") 52 ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü")
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 0c4c99c1d07..0904ff93e23 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -159,7 +159,7 @@
159;; very frequently while editing multilingual text. Now we can use 159;; very frequently while editing multilingual text. Now we can use
160;; only two such keys: "\C-\\" and "\C-^", but the latter is not 160;; only two such keys: "\C-\\" and "\C-^", but the latter is not
161;; convenient because it requires shifting on most keyboards. An 161;; convenient because it requires shifting on most keyboards. An
162;; alternative is "\C-\]" which is now bound to `abort-recursive-edit' 162;; alternative is "\C-]" which is now bound to `abort-recursive-edit'
163;; but it won't be used that frequently. 163;; but it won't be used that frequently.
164(define-key global-map "\C-\\" 'toggle-input-method) 164(define-key global-map "\C-\\" 'toggle-input-method)
165 165
@@ -397,7 +397,7 @@ A coding system that requires automatic detection of text+encoding
397 397
398To prefer, for instance, utf-8, say the following: 398To prefer, for instance, utf-8, say the following:
399 399
400 \(prefer-coding-system \\='utf-8)" 400 (prefer-coding-system \\='utf-8)"
401 (interactive "zPrefer coding system: ") 401 (interactive "zPrefer coding system: ")
402 (if (not (and coding-system (coding-system-p coding-system))) 402 (if (not (and coding-system (coding-system-p coding-system)))
403 (error "Invalid coding system `%s'" coding-system)) 403 (error "Invalid coding system `%s'" coding-system))
@@ -2413,12 +2413,12 @@ See `set-language-info-alist' for use in programs."
2413 )) 2413 ))
2414 "Alist of locale regexps vs the corresponding languages and coding systems. 2414 "Alist of locale regexps vs the corresponding languages and coding systems.
2415Each element has this form: 2415Each element has this form:
2416 \(LOCALE-REGEXP LANG-ENV CODING-SYSTEM) 2416 (LOCALE-REGEXP LANG-ENV CODING-SYSTEM)
2417The first element whose LOCALE-REGEXP matches the start of a 2417The first element whose LOCALE-REGEXP matches the start of a
2418downcased locale specifies the LANG-ENV \(language environment) 2418downcased locale specifies the LANG-ENV \(language environment)
2419and CODING-SYSTEM corresponding to that locale. If there is no 2419and CODING-SYSTEM corresponding to that locale. If there is no
2420appropriate language environment, the element may have this form: 2420appropriate language environment, the element may have this form:
2421 \(LOCALE-REGEXP . LANG-ENV) 2421 (LOCALE-REGEXP . LANG-ENV)
2422In this case, LANG-ENV is one of generic language environments for an 2422In this case, LANG-ENV is one of generic language environments for an
2423specific encoding such as \"Latin-1\" and \"UTF-8\".") 2423specific encoding such as \"Latin-1\" and \"UTF-8\".")
2424 2424
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 946f793731b..af4c6e93e0b 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -665,8 +665,8 @@ without any conversions.
665 665
666VALUE is the EOL (end-of-line) format of the coding system. It must be 666VALUE is the EOL (end-of-line) format of the coding system. It must be
667one of `unix', `dos', `mac'. The symbol `unix' means Unix-like EOL 667one of `unix', `dos', `mac'. The symbol `unix' means Unix-like EOL
668\(i.e. a single LF character), `dos' means DOS-like EOL \(i.e. a sequence 668\(i.e., a single LF character), `dos' means DOS-like EOL \(i.e., a sequence
669of CR followed by LF), and `mac' means Mac-like EOL \(i.e. a single CR). 669of CR followed by LF), and `mac' means Mac-like EOL \(i.e., a single CR).
670If omitted, Emacs detects the EOL format automatically when decoding. 670If omitted, Emacs detects the EOL format automatically when decoding.
671 671
672`:charset-list' (required if `:coding-type' is `charset' or `shift-jis') 672`:charset-list' (required if `:coding-type' is `charset' or `shift-jis')
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index 01cbe1e5222..18ebf91d505 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -2,7 +2,7 @@
2 2
3;; Copyright (C) 1997-1998, 2001-2015 Free Software Foundation, Inc. 3;; Copyright (C) 1997-1998, 2001-2015 Free Software Foundation, Inc.
4 4
5;; Author: W{\l}odek Bzyl 5;; Author: Włodek Bzyl
6;; Ryszard Kubiak 6;; Ryszard Kubiak
7;; Maintainer: Ryszard Kubiak <rysiek@ipipan.gda.pl> 7;; Maintainer: Ryszard Kubiak <rysiek@ipipan.gda.pl>
8;; Keywords: i18n 8;; Keywords: i18n
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 6a15bc41e50..f22b30e613b 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -86,7 +86,7 @@
86 '(("chinese-4corner" "$(0(?-F(B") 86 '(("chinese-4corner" "$(0(?-F(B")
87 ("chinese-array30" "$(0#R#O(B") 87 ("chinese-array30" "$(0#R#O(B")
88 ("chinese-ccdospy" "$AKuF4(B" 88 ("chinese-ccdospy" "$AKuF4(B"
89 "Pinyin base input method for Chinese charset GB2312 \(`chinese-gb2312'). 89 "Pinyin base input method for Chinese charset GB2312 (`chinese-gb2312').
90 90
91Pinyin is the standard Roman transliteration method for Chinese. 91Pinyin is the standard Roman transliteration method for Chinese.
92For the detail of Pinyin system, see the documentation of the input 92For the detail of Pinyin system, see the documentation of the input
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 2871ec8f974..bdd8853d4dc 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -102,7 +102,7 @@ HANKAKU-KATAKANA belongs to `japanese-jisx0201-kana'.")
102 (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) 102 (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-)
103 (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") 103 (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\")
104 (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?[) (?\$B!O(B ?]) (?\$B!P(B ?{) (?\$B!Q(B ?}) 104 (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?[) (?\$B!O(B ?]) (?\$B!P(B ?{) (?\$B!Q(B ?})
105 (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B) 105 (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B)
106 (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) 106 (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>)
107 (?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B ?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*) 107 (?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B ?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*)
108 (?$B!w(B ?@) 108 (?$B!w(B ?@)
@@ -175,9 +175,9 @@ belongs to `japanese-jisx0208', ASCII belongs to `ascii'.")
175The argument may be a character or string. The result has the same type. 175The argument may be a character or string. The result has the same type.
176The argument object is not altered--the value is a copy. 176The argument object is not altered--the value is a copy.
177Optional argument HANKAKU t means to convert to `hankaku' Katakana 177Optional argument HANKAKU t means to convert to `hankaku' Katakana
178 \(`japanese-jisx0201-kana'), in which case return value 178\(`japanese-jisx0201-kana'), in which case return value
179 may be a string even if OBJ is a character if two Katakanas are 179may be a string even if OBJ is a character if two Katakanas are
180 necessary to represent OBJ." 180necessary to represent OBJ."
181 (if (stringp obj) 181 (if (stringp obj)
182 (japanese-string-conversion obj 'japanese-katakana-region hankaku) 182 (japanese-string-conversion obj 'japanese-katakana-region hankaku)
183 (or (get-char-code-property obj (if hankaku 'jisx0201 'katakana)) 183 (or (get-char-code-property obj (if hankaku 'jisx0201 'katakana))
diff --git a/lisp/leim/quail/japanese.el b/lisp/leim/quail/japanese.el
index 831725f8065..7741697286b 100644
--- a/lisp/leim/quail/japanese.el
+++ b/lisp/leim/quail/japanese.el
@@ -231,7 +231,7 @@
231 ("zk" "$B",(B") 231 ("zk" "$B",(B")
232 ("zl" "$B"*(B") 232 ("zl" "$B"*(B")
233 ("z;" "$B!+(B") ("z:" "$B!,(B") 233 ("z;" "$B!+(B") ("z:" "$B!,(B")
234 ("z\'" "$B!F(B") ("z\"" "$B!H(B") 234 ("z'" "$B!F(B") ("z\"" "$B!H(B")
235 235
236 ("zx" [":-"]) ("zX" [":-)"]) 236 ("zx" [":-"]) ("zX" [":-)"])
237 ("zc" "$B!;(B") ("zC" "$B!n(B") 237 ("zc" "$B!;(B") ("zC" "$B!n(B")
diff --git a/lisp/leim/quail/latin-alt.el b/lisp/leim/quail/latin-alt.el
index 935a471dce8..a0697c48f7d 100644
--- a/lisp/leim/quail/latin-alt.el
+++ b/lisp/leim/quail/latin-alt.el
@@ -1321,7 +1321,7 @@ Doubling the postfix separates the letter and postfix: e.g. a\\='\\=' -> a\\='
1321 ("K" ?Ķ) 1321 ("K" ?Ķ)
1322 ("l" ?ļ) 1322 ("l" ?ļ)
1323 ("L" ?Ļ) 1323 ("L" ?Ļ)
1324 ("\'" ?“) 1324 ("'" ?“)
1325 ("\"" ?„) 1325 ("\"" ?„)
1326 ("z" ?ž) 1326 ("z" ?ž)
1327 ("Z" ?Ž) 1327 ("Z" ?Ž)
diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el
index 3c84ba8348a..c63a758f198 100644
--- a/lisp/leim/quail/latin-ltx.el
+++ b/lisp/leim/quail/latin-ltx.el
@@ -664,7 +664,7 @@ system, including many technical ones. Examples:
664 ;; Probably not useful enough: 664 ;; Probably not useful enough:
665 ;; ("\\Telefon" ?☎) ; there are other possibilities 665 ;; ("\\Telefon" ?☎) ; there are other possibilities
666 ;; ("\\Radioactivity" ?☢) 666 ;; ("\\Radioactivity" ?☢)
667 ;; ("\Biohazard" ?☣) 667 ;; ("\\Biohazard" ?☣)
668 ;; ("\\Male" ?♂) 668 ;; ("\\Male" ?♂)
669 ;; ("\\Female" ?♀) 669 ;; ("\\Female" ?♀)
670 ;; ("\\Lightning" ?☇) 670 ;; ("\\Lightning" ?☇)
diff --git a/lisp/leim/quail/thai.el b/lisp/leim/quail/thai.el
index 7d0949ee529..02f8b78d76b 100644
--- a/lisp/leim/quail/thai.el
+++ b/lisp/leim/quail/thai.el
@@ -76,7 +76,7 @@ The difference from the ordinal Thai keyboard:
76 "๑" "ฤ" "ฺ" "ฉ" "ฏ" "ฎ" "โ" "ฌ" ; @ .. G 76 "๑" "ฤ" "ฺ" "ฉ" "ฏ" "ฎ" "โ" "ฌ" ; @ .. G
77 "็" "ณ" "๋" "ษ" "ศ" "?" "์" "ฯ" ; H .. O 77 "็" "ณ" "๋" "ษ" "ศ" "?" "์" "ฯ" ; H .. O
78 "ญ" "๐" "ฑ" "ฆ" "ธ" "๊" "ฮ" "\"" ; P .. W 78 "ญ" "๐" "ฑ" "ฆ" "ธ" "๊" "ฮ" "\"" ; P .. W
79 "\)" "ํ" "\(" "บ" "ฃ" "ล" "ู" "๘" ; X .. _ 79 ")" "ํ" "(" "บ" "ฃ" "ล" "ู" "๘" ; X .. _
80 "_" "ฟ" "ิ" "แ" "ก" "ำ" "ด" "เ" ; ` .. g 80 "_" "ฟ" "ิ" "แ" "ก" "ำ" "ด" "เ" ; ` .. g
81 "้" "ร" "่" "า" "ส" "ท" "ื" "น" ; h .. o 81 "้" "ร" "่" "า" "ส" "ท" "ื" "น" ; h .. o
82 "ย" "ๆ" "พ" "ห" "ะ" "ี" "อ" "ไ" ; p .. w 82 "ย" "ๆ" "พ" "ห" "ะ" "ี" "อ" "ไ" ; p .. w
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 24c325cb263..11cc8f86cfd 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -49,7 +49,7 @@
49(defcustom printer-name 49(defcustom printer-name
50 (and (eq system-type 'ms-dos) "PRN") 50 (and (eq system-type 'ms-dos) "PRN")
51 "The name of a local printer to which data is sent for printing. 51 "The name of a local printer to which data is sent for printing.
52\(Note that PostScript files are sent to `ps-printer-name', which see.\) 52\(Note that PostScript files are sent to `ps-printer-name', which see.)
53 53
54On Unix-like systems, a string value should be a name understood by 54On Unix-like systems, a string value should be a name understood by
55lpr's -P option; otherwise the value should be nil. 55lpr's -P option; otherwise the value should be nil.
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 368e2ab8982..aec93db3fa6 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -438,7 +438,7 @@ shuttled robotically onward."
438If a positive number, it's a timeout before sending. If a negative 438If a positive number, it's a timeout before sending. If a negative
439number, it's a timeout before not sending. This will not work if your 439number, it's a timeout before not sending. This will not work if your
440version of Emacs doesn't include the function `y-or-n-p-with-timeout' 440version of Emacs doesn't include the function `y-or-n-p-with-timeout'
441\(e.g., some versions of XEmacs\)." 441\(e.g., some versions of XEmacs)."
442 :version "24.1" 442 :version "24.1"
443 :group 'feedmail-misc 443 :group 'feedmail-misc
444 :type '(choice (const nil) integer) 444 :type '(choice (const nil) integer)
@@ -449,7 +449,7 @@ version of Emacs doesn't include the function `y-or-n-p-with-timeout'
449 "If non-nil remove Bcc: lines from the message headers. 449 "If non-nil remove Bcc: lines from the message headers.
450In any case, the Bcc: lines do participate in the composed address 450In any case, the Bcc: lines do participate in the composed address
451list. You may want to leave them in if you're using sendmail 451list. You may want to leave them in if you're using sendmail
452\(see `feedmail-buffer-eating-function'\)." 452\(see `feedmail-buffer-eating-function')."
453 :group 'feedmail-headers 453 :group 'feedmail-headers
454 :type 'boolean 454 :type 'boolean
455 ) 455 )
@@ -459,7 +459,7 @@ list. You may want to leave them in if you're using sendmail
459 "If non-nil remove Resent-Bcc: lines from the message headers. 459 "If non-nil remove Resent-Bcc: lines from the message headers.
460In any case, the Resent-Bcc: lines do participate in the composed 460In any case, the Resent-Bcc: lines do participate in the composed
461address list. You may want to leave them in if you're using sendmail 461address list. You may want to leave them in if you're using sendmail
462\(see `feedmail-buffer-eating-function'\)." 462\(see `feedmail-buffer-eating-function')."
463 :group 'feedmail-headers 463 :group 'feedmail-headers
464 :type 'boolean 464 :type 'boolean
465 ) 465 )
@@ -645,7 +645,7 @@ is not an option for many users. As this is the default behavior of most
645sendmail installations, one can mostly only wish it were otherwise. If feedmail 645sendmail installations, one can mostly only wish it were otherwise. If feedmail
646believes the sendmail program will sell you out this way, it won't use the \"-f\" 646believes the sendmail program will sell you out this way, it won't use the \"-f\"
647option when calling sendmail. If it doesn't think sendmail will sell you out, 647option when calling sendmail. If it doesn't think sendmail will sell you out,
648it will use the \"-f\" \(since it is a handy feature\). You control what 648it will use the \"-f\" \(since it is a handy feature). You control what
649feedmail thinks with this variable. The default is nil, meaning that feedmail 649feedmail thinks with this variable. The default is nil, meaning that feedmail
650will believe that sendmail will sell you out." 650will believe that sendmail will sell you out."
651 :version "24.1" 651 :version "24.1"
@@ -861,7 +861,7 @@ as well."
861 "User-supplied specification for a crude form of mailmerge capability. 861 "User-supplied specification for a crude form of mailmerge capability.
862When spraying is enabled, feedmail composes a list of envelope addresses. 862When spraying is enabled, feedmail composes a list of envelope addresses.
863In turn, `feedmail-spray-this-address' is temporarily set to each address 863In turn, `feedmail-spray-this-address' is temporarily set to each address
864\(stripped of any comments and angle brackets\) and a function is called which 864\(stripped of any comments and angle brackets) and a function is called which
865fiddles message headers according to this variable. See the documentation for 865fiddles message headers according to this variable. See the documentation for
866`feedmail-fiddle-plex-blurb', for an overview of fiddle-plex data structures. 866`feedmail-fiddle-plex-blurb', for an overview of fiddle-plex data structures.
867 867
@@ -1313,7 +1313,7 @@ of `buffer-file-name' to nil because that will defeat feedmail's file
1313management features. Instead, arrange for this variable to be set to 1313management features. Instead, arrange for this variable to be set to
1314the value of `buffer-file-name' before setting that to nil. An easy way 1314the value of `buffer-file-name' before setting that to nil. An easy way
1315to do that would be with defadvice on `mail-send' \(undoing the 1315to do that would be with defadvice on `mail-send' \(undoing the
1316assignments in a later advice\). 1316assignments in a later advice).
1317 1317
1318feedmail will pretend that `buffer-file-name', if nil, has the value 1318feedmail will pretend that `buffer-file-name', if nil, has the value
1319assigned of `feedmail-queue-buffer-file-name' and carry out its normal 1319assigned of `feedmail-queue-buffer-file-name' and carry out its normal
@@ -1507,7 +1507,7 @@ The default action is an anonymous function which gets rid of the file
1507from the queue directory. With a non-nil second argument, a brief 1507from the queue directory. With a non-nil second argument, a brief
1508message is give for each file deleted. You could replace this 1508message is give for each file deleted. You could replace this
1509function, for example, to archive all of your sent messages someplace 1509function, for example, to archive all of your sent messages someplace
1510\(though there are better ways to get that particular result\)." 1510\(though there are better ways to get that particular result)."
1511 :group 'feedmail-queue 1511 :group 'feedmail-queue
1512 :type 'function 1512 :type 'function
1513 ) 1513 )
@@ -1715,7 +1715,7 @@ for ACTION (default is `supplement'):
1715 VAL-LIKE is not used. Else, if VAL-LIKE is a function, 1715 VAL-LIKE is not used. Else, if VAL-LIKE is a function,
1716 it is called with two arguments: NAME and the 1716 it is called with two arguments: NAME and the
1717 aggregate like values. Else, if VAL-LIKE is a string, it is 1717 aggregate like values. Else, if VAL-LIKE is a string, it is
1718 used as a format string where a single \%s will be 1718 used as a format string where a single %s will be
1719 replaced by the aggregate values of like fields. 1719 replaced by the aggregate values of like fields.
1720 1720
1721 VAL-PRE, the results of using VAL-LIKE, and VAL-POST 1721 VAL-PRE, the results of using VAL-LIKE, and VAL-POST
@@ -1745,7 +1745,8 @@ applied to a file after you've just read it from disk: for example, a
1745feedmail FQM message file from a queue. You could use something like 1745feedmail FQM message file from a queue. You could use something like
1746this: 1746this:
1747 1747
1748\(setq auto-mode-alist \(cons \\='\(\"\\\\.fqm$\" . feedmail-vm-mail-mode\) auto-mode-alist\)\) 1748\(setq auto-mode-alist
1749 (cons \\='(\"\\\\.fqm$\" . feedmail-vm-mail-mode) auto-mode-alist))
1749" 1750"
1750 (feedmail-say-debug ">in-> feedmail-vm-mail-mode") 1751 (feedmail-say-debug ">in-> feedmail-vm-mail-mode")
1751 (let ((the-buf (current-buffer))) 1752 (let ((the-buf (current-buffer)))
@@ -1894,26 +1895,26 @@ You're dispatching a message and feedmail queuing is enabled.
1894Typing ? again will normally scroll this help buffer. 1895Typing ? again will normally scroll this help buffer.
1895 1896
1896Choices: 1897Choices:
1897 q QUEUE for later sending \(via feedmail-run-the-queue\) 1898 q QUEUE for later sending (via feedmail-run-the-queue)
1898 Q QUEUE! like \"q\", but always make a new file 1899 Q QUEUE! like \"q\", but always make a new file
1899 i IMMEDIATELY send this \(but not the other queued messages\) 1900 i IMMEDIATELY send this (but not the other queued messages)
1900 I IMMEDIATELY! like \"i\", but skip following confirmation prompt 1901 I IMMEDIATELY! like \"i\", but skip following confirmation prompt
1901 d DRAFT queue in the draft directory 1902 d DRAFT queue in the draft directory
1902 D DRAFT! like \"d\", but always make a new file 1903 D DRAFT! like \"d\", but always make a new file
1903 e EDIT return to the message edit buffer \(don't send or queue\) 1904 e EDIT return to the message edit buffer (don't send or queue)
1904 * SPRAY toggle spray mode \(individual message transmissions\) 1905 * SPRAY toggle spray mode (individual message transmissions)
1905 > SCROLL UP scroll message up \(toward end of message\) 1906 > SCROLL UP scroll message up (toward end of message)
1906 < SCROLL DOWN scroll message down \(toward beginning of message\) 1907 < SCROLL DOWN scroll message down (toward beginning of message)
1907 ? HELP show or scroll this help buffer 1908 ? HELP show or scroll this help buffer
1908 1909
1909Synonyms: 1910Synonyms:
1910 s SEND immediately \(same as \"i\"\) 1911 s SEND immediately (same as \"i\")
1911 S SEND! immediately \(same as \"I\"\) 1912 S SEND! immediately (same as \"I\")
1912 r ROUGH draft \(same as \"d\"\) 1913 r ROUGH draft (same as \"d\")
1913 R ROUGH! draft \(same as \"D\"\) 1914 R ROUGH! draft (same as \"D\")
1914 n NOPE didn't mean it \(same as \"e\"\) 1915 n NOPE didn't mean it (same as \"e\")
1915 y YUP do the default behavior \(same as \"C-m\"\) 1916 y YUP do the default behavior (same as \"C-m\")
1916 SPC SCROLL UP \(same as \">\"\) 1917 SPC SCROLL UP (same as \">\")
1917 1918
1918The user-configurable default is currently \"")) 1919The user-configurable default is currently \""))
1919 (princ d-string) 1920 (princ d-string)
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 5164ea1bfed..a7057ca21c8 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -329,7 +329,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
329;; Matches an embedded or leading nickname that should be removed. 329;; Matches an embedded or leading nickname that should be removed.
330;; (defconst mail-extr-nickname-pattern 330;; (defconst mail-extr-nickname-pattern
331;; (purecopy 331;; (purecopy
332;; (format "\\([ .]\\|\\`\\)[\"'`\[\(]\\([ .%s]+\\)[\]\"'\)] " 332;; (format "\\([ .]\\|\\`\\)[\"'`[(]\\([ .%s]+\\)[]\"')] "
333;; mail-extr-all-letters))) 333;; mail-extr-all-letters)))
334 334
335;; Matches the occurrence of a generational name suffix, and the last 335;; Matches the occurrence of a generational name suffix, and the last
@@ -369,7 +369,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
369;; Matches a variety of trailing comments not including comma-delimited 369;; Matches a variety of trailing comments not including comma-delimited
370;; comments. 370;; comments.
371(defconst mail-extr-trailing-comment-start-pattern 371(defconst mail-extr-trailing-comment-start-pattern
372 (purecopy " [-{]\\|--\\|[+@#></\;]")) 372 (purecopy " [-{]\\|--\\|[+@#></;]"))
373 373
374;; Matches a name (not an initial). 374;; Matches a name (not an initial).
375;; This doesn't force a word boundary at the end because sometimes a 375;; This doesn't force a word boundary at the end because sometimes a
@@ -456,7 +456,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
456;; mode from GB back to ASCII. (Note that the escape-from-GB code '~}' 456;; mode from GB back to ASCII. (Note that the escape-from-GB code '~}'
457;; ($7E7D) is outside the defined GB range.) 457;; ($7E7D) is outside the defined GB range.)
458(defconst mail-extr-hz-embedded-gb-encoded-chinese-pattern 458(defconst mail-extr-hz-embedded-gb-encoded-chinese-pattern
459 (purecopy "~{\\([^~].\\|~[^\}]\\)+~}")) 459 (purecopy "~{\\([^~].\\|~[^}]\\)+~}"))
460 460
461;; The leading optional lowercase letters are for a bastardized version of 461;; The leading optional lowercase letters are for a bastardized version of
462;; the encoding, as is the optional nature of the final slash. 462;; the encoding, as is the optional nature of the final slash.
@@ -543,8 +543,8 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
543 (?\t " ") 543 (?\t " ")
544 (?\r " ") 544 (?\r " ")
545 (?\n " ") 545 (?\n " ")
546 (?\( "\(\)") 546 (?\( "()")
547 (?\) "\)\(") 547 (?\) ")(")
548 (?\\ "\\")) 548 (?\\ "\\"))
549 (mail-extr-address-domain-literal-syntax-table 549 (mail-extr-address-domain-literal-syntax-table
550 (?\000 ?\377 "w") 550 (?\000 ?\377 "w")
@@ -553,8 +553,8 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
553 (?\t " ") 553 (?\t " ")
554 (?\r " ") 554 (?\r " ")
555 (?\n " ") 555 (?\n " ")
556 (?\[ "\(\]") ;?????? 556 (?\[ "(]") ;??????
557 (?\] "\)\[") ;?????? 557 (?\] ")[") ;??????
558 (?\\ "\\")) 558 (?\\ "\\"))
559 (mail-extr-address-text-comment-syntax-table 559 (mail-extr-address-text-comment-syntax-table
560 (?\000 ?\377 "w") 560 (?\000 ?\377 "w")
@@ -563,16 +563,16 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
563 (?\t " ") 563 (?\t " ")
564 (?\r " ") 564 (?\r " ")
565 (?\n " ") 565 (?\n " ")
566 (?\( "\(\)") 566 (?\( "()")
567 (?\) "\)\(") 567 (?\) ")(")
568 (?\[ "\(\]") 568 (?\[ "(]")
569 (?\] "\)\[") 569 (?\] ")[")
570 (?\{ "\(\}") 570 (?\{ "(}")
571 (?\} "\)\{") 571 (?\} "){")
572 (?\\ "\\") 572 (?\\ "\\")
573 (?\" "\"") 573 (?\" "\"")
574 ;; (?\' "\)\`") 574 ;; (?\' ")`")
575 ;; (?\` "\(\'") 575 ;; (?\` "('")
576 ) 576 )
577 (mail-extr-address-text-syntax-table 577 (mail-extr-address-text-syntax-table
578 (?\000 ?\177 ".") 578 (?\000 ?\177 ".")
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 2fb944bdc76..5bc1d3129ea 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -95,7 +95,7 @@ supported. Defaults to non-nil on Windows, nil otherwise."
95 recp))) 95 recp)))
96 (setq first nil)) 96 (setq first nil))
97 (split-string 97 (split-string
98 (mail-strip-quoted-names field) "\, *")) 98 (mail-strip-quoted-names field) ", *"))
99 result))))) 99 result)))))
100 100
101(declare-function clipboard-kill-ring-save "menu-bar.el" 101(declare-function clipboard-kill-ring-save "menu-bar.el"
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index ddd5414de76..f22222ad552 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -309,7 +309,7 @@ Buffer is not displayed if SHOW is non-nil."
309;; to file name. 309;; to file name.
310;(defun get-folder-from-spool-safe (name) 310;(defun get-folder-from-spool-safe (name)
311; "Return the folder name corresponding to the spool file NAME." 311; "Return the folder name corresponding to the spool file NAME."
312; (if (string-match "^\\(.*\\)\.spool$" name) 312; (if (string-match "^\\(.*\\)\\.spool$" name)
313; (substring name (match-beginning 1) (match-end 1)) 313; (substring name (match-beginning 1) (match-end 1))
314; (error "Could not extract folder name from spool name %s" name))) 314; (error "Could not extract folder name from spool name %s" name)))
315 315
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 67b04b56968..8e38564b14a 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -316,7 +316,7 @@ Currently known variants are 'emacs and 'mailutils."
316If non-nil, this variable is used to identify the correspondent 316If non-nil, this variable is used to identify the correspondent
317when receiving new mail. If it matches the address of the sender, 317when receiving new mail. If it matches the address of the sender,
318the recipient is taken as correspondent of a mail. 318the recipient is taken as correspondent of a mail.
319If nil \(default value\), your `user-login-name' and `user-mail-address' 319If nil \(default value), your `user-login-name' and `user-mail-address'
320are used to exclude yourself as correspondent. 320are used to exclude yourself as correspondent.
321 321
322Usually you don't have to set this variable, except if you collect mails 322Usually you don't have to set this variable, except if you collect mails
@@ -4778,7 +4778,7 @@ With prefix argument N moves forward N messages with these labels.
4778 4778
4779;;;*** 4779;;;***
4780 4780
4781;;;### (autoloads nil "rmailmm" "rmailmm.el" "e5b89eed8afb278cc8881f2208382c7c") 4781;;;### (autoloads nil "rmailmm" "rmailmm.el" "36f518e036612a33eb436cb267fd39c7")
4782;;; Generated autoloads from rmailmm.el 4782;;; Generated autoloads from rmailmm.el
4783 4783
4784(autoload 'rmail-mime "rmailmm" "\ 4784(autoload 'rmail-mime "rmailmm" "\
@@ -4922,7 +4922,7 @@ SENDERS is a regular expression.
4922 4922
4923;;;*** 4923;;;***
4924 4924
4925;;;### (autoloads nil "undigest" "undigest.el" "912d4d3bf762991df5d4d02f42358025") 4925;;;### (autoloads nil "undigest" "undigest.el" "c0ddfad4fe34ef9c1e790c2cc72b571d")
4926;;; Generated autoloads from undigest.el 4926;;; Generated autoloads from undigest.el
4927 4927
4928(autoload 'undigestify-rmail-message "undigest" "\ 4928(autoload 'undigestify-rmail-message "undigest" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 3dd57b9bab7..16f62154fbc 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -172,7 +172,7 @@ The value is usually nil, and bound to non-nil while inserting
172MIME entities.") 172MIME entities.")
173 173
174(defvar rmail-mime-searching nil 174(defvar rmail-mime-searching nil
175 "Bound to T inside `rmail-search-mime-message' to suppress expensive 175 "Bound to T inside `rmail-search-mime-message' to suppress expensive
176operations such as HTML decoding") 176operations such as HTML decoding")
177 177
178;;; MIME-entity object 178;;; MIME-entity object
@@ -190,7 +190,7 @@ A MIME-entity is a vector of 10 elements:
190TYPE and DISPOSITION correspond to MIME headers Content-Type and 190TYPE and DISPOSITION correspond to MIME headers Content-Type and
191Content-Disposition respectively, and have this format: 191Content-Disposition respectively, and have this format:
192 192
193 \(VALUE (ATTRIBUTE . VALUE) (ATTRIBUTE . VALUE) ...) 193 (VALUE (ATTRIBUTE . VALUE) (ATTRIBUTE . VALUE) ...)
194 194
195Each VALUE is a string and each ATTRIBUTE is a string. 195Each VALUE is a string and each ATTRIBUTE is a string.
196 196
@@ -202,7 +202,7 @@ Content-Type: multipart/mixed;
202The corresponding TYPE argument must be: 202The corresponding TYPE argument must be:
203 203
204\(\"multipart/mixed\" 204\(\"multipart/mixed\"
205 \(\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\")) 205 (\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\"))
206 206
207TRANSFER-ENCODING corresponds to MIME header 207TRANSFER-ENCODING corresponds to MIME header
208Content-Transfer-Encoding, and is a lower-case string. 208Content-Transfer-Encoding, and is a lower-case string.
@@ -1119,11 +1119,11 @@ are the values of the respective parsed headers. The latter should
1119be lower-case. The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION 1119be lower-case. The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION
1120have the form 1120have the form
1121 1121
1122 \(VALUE . ALIST) 1122 (VALUE . ALIST)
1123 1123
1124In other words: 1124In other words:
1125 1125
1126 \(VALUE (ATTRIBUTE . VALUE) (ATTRIBUTE . VALUE) ...) 1126 (VALUE (ATTRIBUTE . VALUE) (ATTRIBUTE . VALUE) ...)
1127 1127
1128VALUE is a string and ATTRIBUTE is a symbol. 1128VALUE is a string and ATTRIBUTE is a symbol.
1129 1129
@@ -1135,7 +1135,7 @@ Content-Type: multipart/mixed;
1135The parsed header value: 1135The parsed header value:
1136 1136
1137\(\"multipart/mixed\" 1137\(\"multipart/mixed\"
1138 \(\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\"))" 1138 (\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\"))"
1139 ;; Handle the content transfer encodings we know. Unknown transfer 1139 ;; Handle the content transfer encodings we know. Unknown transfer
1140 ;; encodings will be passed on to the various handlers. 1140 ;; encodings will be passed on to the various handlers.
1141 (cond ((string= content-transfer-encoding "base64") 1141 (cond ((string= content-transfer-encoding "base64")
diff --git a/lisp/man.el b/lisp/man.el
index 23b2110a4ec..fbfa6f0c7f7 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -311,7 +311,7 @@ This regular expression should start with a `^' character.")
311 "Regular expression describing a reference to another manpage.") 311 "Regular expression describing a reference to another manpage.")
312 312
313(defvar Man-apropos-regexp 313(defvar Man-apropos-regexp
314 (concat "\\\[\\(" Man-name-regexp "\\)\\\][ \t]*(\\(" Man-section-regexp "\\))") 314 (concat "\\[\\(" Man-name-regexp "\\)\\][ \t]*(\\(" Man-section-regexp "\\))")
315 "Regular expression describing a reference to manpages in \"man -k output\".") 315 "Regular expression describing a reference to manpages in \"man -k output\".")
316 316
317(defvar Man-synopsis-regexp "SYNOPSIS" 317(defvar Man-synopsis-regexp "SYNOPSIS"
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index de0038a306a..04e9fef59eb 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -417,7 +417,7 @@ string is converted to lower case."
417 417
418(defun mh-alias-insert-file (&optional alias) 418(defun mh-alias-insert-file (&optional alias)
419 "Return filename which should be used to add ALIAS. 419 "Return filename which should be used to add ALIAS.
420The value of the option `mh-alias-insert-file' is used if non-nil\; 420The value of the option `mh-alias-insert-file' is used if non-nil;
421otherwise the value of the \"Aliasfile:\" profile component is used. 421otherwise the value of the \"Aliasfile:\" profile component is used.
422If the alias already exists, try to return the name of the file that 422If the alias already exists, try to return the name of the file that
423contains it." 423contains it."
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 700d22c3862..129e6857a4c 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -269,7 +269,7 @@ RETURN-ACTION and any additional arguments are IGNORED."
269 269
270When you are all through editing a message, you send it with this 270When you are all through editing a message, you send it with this
271command. You can give a prefix argument ARG to monitor the first stage 271command. You can give a prefix argument ARG to monitor the first stage
272of the delivery\; this output can be found in a buffer called \"*MH-E 272of the delivery; this output can be found in a buffer called \"*MH-E
273Mail Delivery*\". 273Mail Delivery*\".
274 274
275The hook `mh-before-send-letter-hook' is run at the beginning of 275The hook `mh-before-send-letter-hook' is run at the beginning of
@@ -1064,7 +1064,7 @@ The versions of MH-E, Emacs, and MH are shown."
1064 (string-match "[0-9]+\\.[0-9]+\\(\\.[0-9]+\\)?" 1064 (string-match "[0-9]+\\.[0-9]+\\(\\.[0-9]+\\)?"
1065 emacs-version) 1065 emacs-version)
1066 (match-string 0 emacs-version)) 1066 (match-string 0 emacs-version))
1067 ((string-match "[0-9.]*\\( +\([ a-z]+[0-9]+\)\\)?" 1067 ((string-match "[0-9.]*\\( +([ a-z]+[0-9]+)\\)?"
1068 emacs-version) 1068 emacs-version)
1069 (match-string 0 emacs-version)) 1069 (match-string 0 emacs-version))
1070 (t (format "%s.%s" emacs-major-version 1070 (t (format "%s.%s" emacs-major-version
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 7cdf67cc150..96fe7d797c2 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -112,7 +112,7 @@
112 "\\(defgroup-mh\\)" 112 "\\(defgroup-mh\\)"
113 "\\)\\>" 113 "\\)\\>"
114 ;; Any whitespace and defined object. 114 ;; Any whitespace and defined object.
115 "[ \t'\(]*" 115 "[ \t'(]*"
116 "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?") 116 "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?")
117 (1 font-lock-keyword-face) 117 (1 font-lock-keyword-face)
118 (7 (cond ((match-beginning 2) font-lock-function-name-face) 118 (7 (cond ((match-beginning 2) font-lock-function-name-face)
@@ -1834,7 +1834,7 @@ message without line wrapping."
1834 "Default method to use in security tags. 1834 "Default method to use in security tags.
1835 1835
1836This option is used to select between a variety of mail security 1836This option is used to select between a variety of mail security
1837mechanisms. The default is \"PGP (MIME)\" if it is supported\; 1837mechanisms. The default is \"PGP (MIME)\" if it is supported;
1838otherwise, the default is \"None\". Other mechanisms include 1838otherwise, the default is \"None\". Other mechanisms include
1839vanilla \"PGP\" and \"S/MIME\". 1839vanilla \"PGP\" and \"S/MIME\".
1840 1840
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index ae5e2bf1f3b..d21720ebe55 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -755,7 +755,7 @@ You can enter the message NUMBER either before or after typing
755 755
756In a program, optional non-nil second argument NO-ERROR-IF-NO-MESSAGE 756In a program, optional non-nil second argument NO-ERROR-IF-NO-MESSAGE
757means return nil instead of signaling an error if message does not 757means return nil instead of signaling an error if message does not
758exist\; in this case, the cursor is positioned near where the message 758exist; in this case, the cursor is positioned near where the message
759would have been. Non-nil third argument DONT-SHOW means not to show 759would have been. Non-nil third argument DONT-SHOW means not to show
760the message." 760the message."
761 (interactive "NGo to message: ") 761 (interactive "NGo to message: ")
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index de2b2cf7fd9..7a56427027e 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -553,7 +553,7 @@ one space."
553(defun mh-letter-confirm-address () 553(defun mh-letter-confirm-address ()
554 "Flash alias expansion. 554 "Flash alias expansion.
555 555
556Addresses are separated by a comma\; when you press the comma, 556Addresses are separated by a comma; when you press the comma,
557this command flashes the alias expansion in the minibuffer if 557this command flashes the alias expansion in the minibuffer if
558`mh-alias-flash-on-comma' is turned on." 558`mh-alias-flash-on-comma' is turned on."
559 (interactive) 559 (interactive)
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index b69f956d5c2..a1c0bebd289 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1715,7 +1715,7 @@ buffer, while END defaults to the end of the buffer."
1715(defun mh-minibuffer-read-type (filename &optional default) 1715(defun mh-minibuffer-read-type (filename &optional default)
1716 "Return the content type associated with the given FILENAME. 1716 "Return the content type associated with the given FILENAME.
1717If the \"file\" command exists and recognizes the given file, 1717If the \"file\" command exists and recognizes the given file,
1718then its value is returned\; otherwise, the user is prompted for 1718then its value is returned; otherwise, the user is prompted for
1719a type (see `mailcap-mime-types'). 1719a type (see `mailcap-mime-types').
1720Optional argument DEFAULT is returned if a type isn't entered." 1720Optional argument DEFAULT is returned if a type isn't entered."
1721 (mailcap-parse-mimetypes) 1721 (mailcap-parse-mimetypes)
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 7d066b0b8dd..b6eef4ecfc6 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1247,7 +1247,7 @@ is used to search."
1247 (prog1 1247 (prog1
1248 (block nil 1248 (block nil
1249 (when (eobp) (return nil)) 1249 (when (eobp) (return nil))
1250 (when (search-forward-regexp "^\+" (mh-line-end-position) t) 1250 (when (search-forward-regexp "^\\+" (mh-line-end-position) t)
1251 (setq mh-index-pick-folder 1251 (setq mh-index-pick-folder
1252 (buffer-substring-no-properties (mh-line-beginning-position) 1252 (buffer-substring-no-properties (mh-line-beginning-position)
1253 (mh-line-end-position))) 1253 (mh-line-end-position)))
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 643674a4523..37fd1651c5e 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -515,7 +515,7 @@ they will not be returned."
515 ;; folder is specified, ensure it is nil to avoid adding the 515 ;; folder is specified, ensure it is nil to avoid adding the
516 ;; folder to the folder-list and adding a slash to it. 516 ;; folder to the folder-list and adding a slash to it.
517 (when folder 517 (when folder
518 (setq folder (mh-replace-regexp-in-string "^\+" "" folder)) 518 (setq folder (mh-replace-regexp-in-string "^\\+" "" folder))
519 (setq folder (mh-replace-regexp-in-string "/+$" "" folder)) 519 (setq folder (mh-replace-regexp-in-string "/+$" "" folder))
520 (if (equal folder "") 520 (if (equal folder "")
521 (setq folder nil))) 521 (setq folder nil)))
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index b7b7febca26..d48a8b3d152 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -366,7 +366,7 @@ filenames. In addition, replaces * with %2a. See URL
366`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'." 366`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'."
367 (format "%s/%s.png" mh-x-image-cache-directory 367 (format "%s/%s.png" mh-x-image-cache-directory
368 (mh-replace-regexp-in-string 368 (mh-replace-regexp-in-string
369 "\*" "%2a" 369 "\\*" "%2a"
370 (mh-url-hexify-string 370 (mh-url-hexify-string
371 (with-temp-buffer 371 (with-temp-buffer
372 (insert url) 372 (insert url)
diff --git a/lisp/msb.el b/lisp/msb.el
index 0351bda0e42..fbc130174b8 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -659,7 +659,7 @@ If the argument is left out or nil, then the current buffer is considered."
659(defun msb--create-function-info (menu-cond-elt) 659(defun msb--create-function-info (menu-cond-elt)
660 "Create a vector from an element MENU-COND-ELT of `msb-menu-cond'. 660 "Create a vector from an element MENU-COND-ELT of `msb-menu-cond'.
661This takes the form: 661This takes the form:
662\[BUFFER-LIST-VARIABLE CONDITION MENU-SORT-KEY MENU-TITLE ITEM-HANDLER SORTER] 662[BUFFER-LIST-VARIABLE CONDITION MENU-SORT-KEY MENU-TITLE ITEM-HANDLER SORTER]
663See `msb-menu-cond' for a description of its elements." 663See `msb-menu-cond' for a description of its elements."
664 (let* ((list-symbol (make-symbol "-msb-buffer-list")) 664 (let* ((list-symbol (make-symbol "-msb-buffer-list"))
665 (tmp-ih (and (> (length menu-cond-elt) 3) 665 (tmp-ih (and (> (length menu-cond-elt) 3)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index bb8351437d7..4f7fa3b8f39 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -681,7 +681,7 @@
681 '("\\`/\\(\\([^/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4)) 681 '("\\`/\\(\\([^/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
682 "Format of a fully expanded remote file name. 682 "Format of a fully expanded remote file name.
683 683
684This is a list of the form \(REGEXP HOST USER NAME\), 684This is a list of the form \(REGEXP HOST USER NAME),
685where REGEXP is a regular expression matching 685where REGEXP is a regular expression matching
686the full remote name, and HOST, USER, and NAME are the numbers of 686the full remote name, and HOST, USER, and NAME are the numbers of
687parenthesized expressions in REGEXP for the components (in that order)." 687parenthesized expressions in REGEXP for the components (in that order)."
@@ -1366,8 +1366,8 @@ only return the directory part of FILE."
1366 (goto-char end))) 1366 (goto-char end)))
1367 1367
1368;; Read in ~/.netrc, if one exists. If ~/.netrc file exists and has 1368;; Read in ~/.netrc, if one exists. If ~/.netrc file exists and has
1369;; the correct permissions then extract the \`machine\', \`login\', 1369;; the correct permissions then extract the machine, login,
1370;; \`password\' and \`account\' information from within. 1370;; password and account information from within.
1371 1371
1372(defun ange-ftp-parse-netrc () 1372(defun ange-ftp-parse-netrc ()
1373 ;; We set this before actually doing it to avoid the possibility 1373 ;; We set this before actually doing it to avoid the possibility
@@ -2511,7 +2511,7 @@ Works by doing a pwd and examining the directory syntax."
2511;;;; Remote file and directory listing support. 2511;;;; Remote file and directory listing support.
2512;;;; ------------------------------------------------------------ 2512;;;; ------------------------------------------------------------
2513 2513
2514;; Returns whether HOST's FTP server doesn't like \'ls\' or \'dir\' commands 2514;; Returns whether HOST's FTP server doesn't like 'ls' or 'dir' commands
2515;; to take switch arguments. 2515;; to take switch arguments.
2516(defun ange-ftp-dumb-unix-host (host) 2516(defun ange-ftp-dumb-unix-host (host)
2517 (and host ange-ftp-dumb-unix-host-regexp 2517 (and host ange-ftp-dumb-unix-host-regexp
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index a7efaf81dbc..e8e6bc0cb6a 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -380,7 +380,7 @@ Example:
380 \"org.freedesktop.Hal.Device\" \"GetPropertyString\" \\='message 380 \"org.freedesktop.Hal.Device\" \"GetPropertyString\" \\='message
381 \"system.kernel.machine\") 381 \"system.kernel.machine\")
382 382
383 => \(:serial :system 2) 383 => (:serial :system 2)
384 384
385 -| i686" 385 -| i686"
386 386
@@ -656,8 +656,8 @@ Example:
656 :system \"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" 656 :system \"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\"
657 \"org.freedesktop.Hal.Manager\" \"DeviceAdded\" \\='my-signal-handler) 657 \"org.freedesktop.Hal.Manager\" \"DeviceAdded\" \\='my-signal-handler)
658 658
659 => \(\(:signal :system \"org.freedesktop.Hal.Manager\" \"DeviceAdded\") 659 => ((:signal :system \"org.freedesktop.Hal.Manager\" \"DeviceAdded\")
660 \(\"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" my-signal-handler)) 660 (\"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" my-signal-handler))
661 661
662`dbus-register-signal' returns an object, which can be used in 662`dbus-register-signal' returns an object, which can be used in
663`dbus-unregister-object' for removing the registration." 663`dbus-unregister-object' for removing the registration."
@@ -1143,7 +1143,7 @@ Note, that this autoloads SERVICE if it is not running yet. If
1143it shall be checked whether SERVICE is already running, one shall 1143it shall be checked whether SERVICE is already running, one shall
1144apply 1144apply
1145 1145
1146 \(member service \(dbus-list-known-names bus))" 1146 (member service \(dbus-list-known-names bus))"
1147 ;; "Ping" raises a D-Bus error if SERVICE does not exist. 1147 ;; "Ping" raises a D-Bus error if SERVICE does not exist.
1148 ;; Otherwise, it returns silently with nil. 1148 ;; Otherwise, it returns silently with nil.
1149 (condition-case nil 1149 (condition-case nil
@@ -1631,22 +1631,22 @@ name, and the cdr is the list of properties as returned by
1631 1631
1632\(dbus-get-all-managed-objects :session \"org.gnome.SettingsDaemon\" \"/\") 1632\(dbus-get-all-managed-objects :session \"org.gnome.SettingsDaemon\" \"/\")
1633 1633
1634 => \(\(\"/org/gnome/SettingsDaemon/MediaKeys\" 1634 => ((\"/org/gnome/SettingsDaemon/MediaKeys\"
1635 \(\"org.gnome.SettingsDaemon.MediaKeys\") 1635 (\"org.gnome.SettingsDaemon.MediaKeys\")
1636 \(\"org.freedesktop.DBus.Peer\") 1636 (\"org.freedesktop.DBus.Peer\")
1637 \(\"org.freedesktop.DBus.Introspectable\") 1637 (\"org.freedesktop.DBus.Introspectable\")
1638 \(\"org.freedesktop.DBus.Properties\") 1638 (\"org.freedesktop.DBus.Properties\")
1639 \(\"org.freedesktop.DBus.ObjectManager\")) 1639 (\"org.freedesktop.DBus.ObjectManager\"))
1640 \(\"/org/gnome/SettingsDaemon/Power\" 1640 (\"/org/gnome/SettingsDaemon/Power\"
1641 \(\"org.gnome.SettingsDaemon.Power.Keyboard\") 1641 (\"org.gnome.SettingsDaemon.Power.Keyboard\")
1642 \(\"org.gnome.SettingsDaemon.Power.Screen\") 1642 (\"org.gnome.SettingsDaemon.Power.Screen\")
1643 \(\"org.gnome.SettingsDaemon.Power\" 1643 (\"org.gnome.SettingsDaemon.Power\"
1644 \(\"Icon\" . \". GThemedIcon battery-full-charged-symbolic \") 1644 (\"Icon\" . \". GThemedIcon battery-full-charged-symbolic \")
1645 \(\"Tooltip\" . \"Laptop battery is charged\")) 1645 (\"Tooltip\" . \"Laptop battery is charged\"))
1646 \(\"org.freedesktop.DBus.Peer\") 1646 (\"org.freedesktop.DBus.Peer\")
1647 \(\"org.freedesktop.DBus.Introspectable\") 1647 (\"org.freedesktop.DBus.Introspectable\")
1648 \(\"org.freedesktop.DBus.Properties\") 1648 (\"org.freedesktop.DBus.Properties\")
1649 \(\"org.freedesktop.DBus.ObjectManager\")) 1649 (\"org.freedesktop.DBus.ObjectManager\"))
1650 ...) 1650 ...)
1651 1651
1652If possible, \"org.freedesktop.DBus.ObjectManager.GetManagedObjects\" 1652If possible, \"org.freedesktop.DBus.ObjectManager.GetManagedObjects\"
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index f2f5ecb8e88..d44890f1b09 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -263,7 +263,7 @@ word(s) will be searched for via `eww-search-prefix'."
263 ;; en.wikipedia.org/wiki/Free software 263 ;; en.wikipedia.org/wiki/Free software
264 (string-match "\\`[A-Za-z_]+\\.[A-Za-z._]+/" url) 264 (string-match "\\`[A-Za-z_]+\\.[A-Za-z._]+/" url)
265 (and (= (length (split-string url)) 1) 265 (and (= (length (split-string url)) 1)
266 (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url)) 266 (or (and (not (string-match-p "\\`[\"'].*[\"']\\'" url))
267 (> (length (split-string url "[.:]")) 1)) 267 (> (length (split-string url "[.:]")) 1))
268 (string-match eww-local-regex url)))) 268 (string-match eww-local-regex url))))
269 (progn 269 (progn
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 418796a89c9..479c9a579f3 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -111,9 +111,9 @@ specifying a port number to connect to.
111 111
112Usage example: 112Usage example:
113 113
114 \(with-temp-buffer 114 (with-temp-buffer
115 \(open-gnutls-stream \"tls\" 115 (open-gnutls-stream \"tls\"
116 \(current-buffer) 116 (current-buffer)
117 \"your server goes here\" 117 \"your server goes here\"
118 \"imaps\")) 118 \"imaps\"))
119 119
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index eaf1d7e22c4..c6d40b62415 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -204,7 +204,7 @@ This variable is only used if the variable
204 :group 'net-utils 204 :group 'net-utils
205 :type '(repeat string)) 205 :type '(repeat string))
206 206
207(defcustom smbclient-prompt-regexp "^smb: \>" 207(defcustom smbclient-prompt-regexp "^smb: >"
208 "Regexp which matches the smbclient program's prompt. 208 "Regexp which matches the smbclient program's prompt.
209 209
210This variable is only used if the variable 210This variable is only used if the variable
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 6c80e627477..072fd015b60 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -343,8 +343,8 @@ pattern-list is checked: The new headline will be marked as AGE
343if REGEXP matches the headline's TITLE-OR-DESCRIPTION. 343if REGEXP matches the headline's TITLE-OR-DESCRIPTION.
344 344
345If, for example, `newsticker-auto-mark-filter-list' looks like 345If, for example, `newsticker-auto-mark-filter-list' looks like
346 \((slashdot (\\='old \\='title \"^Forget me!$\") (\\='immortal \\='title \"Read me\") 346 ((slashdot (\\='old \\='title \"^Forget me!$\") (\\='immortal \\='title \"Read me\")
347 \(\\='immortal \\='all \"important\")))) 347 (\\='immortal \\='all \"important\"))))
348 348
349then all articles from slashdot are marked as old if they have 349then all articles from slashdot are marked as old if they have
350the title \"Forget me!\". All articles with a title containing 350the title \"Forget me!\". All articles with a title containing
@@ -562,7 +562,7 @@ If non-nil only the current headline is visible.")
562 "Return guid of ITEM." 562 "Return guid of ITEM."
563 (newsticker--guid-to-string (assoc 'guid (newsticker--extra item)))) 563 (newsticker--guid-to-string (assoc 'guid (newsticker--extra item))))
564(defsubst newsticker--enclosure (item) 564(defsubst newsticker--enclosure (item)
565 "Return enclosure element of ITEM in the form \(...FIXME...\) or nil." 565 "Return enclosure element of ITEM in the form (...FIXME...) or nil."
566 (let ((enclosure (assoc 'enclosure (newsticker--extra item)))) 566 (let ((enclosure (assoc 'enclosure (newsticker--extra item))))
567 (if enclosure 567 (if enclosure
568 (xml-node-attributes enclosure)))) 568 (xml-node-attributes enclosure))))
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index be4179e4b11..105b36e14a3 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -258,7 +258,7 @@ for formatting."
258(defun newsticker--image-read (feed-name-symbol disabled &optional max-height) 258(defun newsticker--image-read (feed-name-symbol disabled &optional max-height)
259 "Read the cached image for FEED-NAME-SYMBOL from disk. 259 "Read the cached image for FEED-NAME-SYMBOL from disk.
260If DISABLED is non-nil the image will be converted to a disabled look 260If DISABLED is non-nil the image will be converted to a disabled look
261\(unless `newsticker-enable-logo-manipulations' is not t\). 261\(unless `newsticker-enable-logo-manipulations' is not t).
262Optional argument MAX-HEIGHT specifies the maximal image height. 262Optional argument MAX-HEIGHT specifies the maximal image height.
263Return the image." 263Return the image."
264 (let ((image-name (concat (newsticker--images-dir) 264 (let ((image-name (concat (newsticker--images-dir)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index df0635066cc..d58f3ebd4ea 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2600,7 +2600,7 @@ If ARG is given, opens the URL in a new browser window."
2600 (cond ((rcirc-channel-p target) 2600 (cond ((rcirc-channel-p target)
2601 target) 2601 target)
2602 ;;; -ChanServ- [#gnu] Welcome... 2602 ;;; -ChanServ- [#gnu] Welcome...
2603 ((string-match "\\[\\(#[^\] ]+\\)\\]" message) 2603 ((string-match "\\[\\(#[^] ]+\\)\\]" message)
2604 (match-string 1 message)) 2604 (match-string 1 message))
2605 (sender 2605 (sender
2606 (if (string= sender (rcirc-server-name process)) 2606 (if (string= sender (rcirc-server-name process))
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index da46ec3f670..fead60eb8ab 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -145,7 +145,7 @@ other arguments for `rlogin'.
145Input is sent line-at-a-time to the remote connection. 145Input is sent line-at-a-time to the remote connection.
146 146
147Communication with the remote host is recorded in a buffer `*rlogin-HOST*' 147Communication with the remote host is recorded in a buffer `*rlogin-HOST*'
148\(or `*rlogin-USER@HOST*' if the remote username differs\). 148\(or `*rlogin-USER@HOST*' if the remote username differs).
149If a prefix argument is given and the buffer `*rlogin-HOST*' already exists, 149If a prefix argument is given and the buffer `*rlogin-HOST*' already exists,
150a new buffer with a different connection will be made. 150a new buffer with a different connection will be made.
151 151
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index c4102a18cef..5e0274029f1 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -598,7 +598,7 @@ If successful, return the object path of the collection."
598ATTRIBUTES are key-value pairs. The keys are keyword symbols, 598ATTRIBUTES are key-value pairs. The keys are keyword symbols,
599starting with a colon. Example: 599starting with a colon. Example:
600 600
601 \(secrets-search-items \"Tramp collection\" :user \"joe\") 601 (secrets-search-items \"Tramp collection\" :user \"joe\")
602 602
603The object labels of the found items are returned as list." 603The object labels of the found items are returned as list."
604 (let ((collection-path (secrets-unlock-collection collection)) 604 (let ((collection-path (secrets-unlock-collection collection))
@@ -635,8 +635,8 @@ The object labels of the found items are returned as list."
635ATTRIBUTES are key-value pairs set for the created item. The 635ATTRIBUTES are key-value pairs set for the created item. The
636keys are keyword symbols, starting with a colon. Example: 636keys are keyword symbols, starting with a colon. Example:
637 637
638 \(secrets-create-item \"Tramp collection\" \"item\" \"geheim\" 638 (secrets-create-item \"Tramp collection\" \"item\" \"geheim\"
639 :method \"sudo\" :user \"joe\" :host \"remote-host\"\) 639 :method \"sudo\" :user \"joe\" :host \"remote-host\")
640 640
641The object path of the created item is returned." 641The object path of the created item is returned."
642 (unless (member item (secrets-list-items collection)) 642 (unless (member item (secrets-list-items collection))
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index ada2767a4d1..509c021c644 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -167,7 +167,7 @@ namespace of LOCAL-NAME."
167 "Convert LOCAL-NAME into a fully qualified name. 167 "Convert LOCAL-NAME into a fully qualified name.
168A fully qualified name is a cons of the namespace name and the 168A fully qualified name is a cons of the namespace name and the
169name of the element itself. For example \"xsd:string\" is 169name of the element itself. For example \"xsd:string\" is
170converted to \(\"http://www.w3.org/2001/XMLSchema\" . \"string\"\). 170converted to \(\"http://www.w3.org/2001/XMLSchema\" . \"string\").
171 171
172The USE-TNS argument specifies what to do when LOCAL-NAME has no 172The USE-TNS argument specifies what to do when LOCAL-NAME has no
173namespace tag. If USE-TNS is non-nil, the `soap-target-xmlns' 173namespace tag. If USE-TNS is non-nil, the `soap-target-xmlns'
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 2a7f1a52f13..595e0ef6722 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -59,7 +59,7 @@ It is used for TCP/IP devices."
59 59
60;;;###tramp-autoload 60;;;###tramp-autoload
61(defcustom tramp-adb-prompt 61(defcustom tramp-adb-prompt
62 "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]\e;\[]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" 62 "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]\e;[]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
63 "Regexp used as prompt in almquist shell." 63 "Regexp used as prompt in almquist shell."
64 :type 'string 64 :type 'string
65 :version "24.4" 65 :version "24.4"
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8598f0e758a..206ddfbfb55 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4313,7 +4313,7 @@ process to set up. VEC specifies the connection."
4313 "List of local coding commands for inline transfer. 4313 "List of local coding commands for inline transfer.
4314Each item is a list that looks like this: 4314Each item is a list that looks like this:
4315 4315
4316\(FORMAT ENCODING DECODING\) 4316\(FORMAT ENCODING DECODING)
4317 4317
4318FORMAT is symbol describing the encoding/decoding format. It can be 4318FORMAT is symbol describing the encoding/decoding format. It can be
4319`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing. 4319`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
@@ -4351,7 +4351,7 @@ with the encoded or decoded results, respectively.")
4351 "List of remote coding commands for inline transfer. 4351 "List of remote coding commands for inline transfer.
4352Each item is a list that looks like this: 4352Each item is a list that looks like this:
4353 4353
4354\(FORMAT ENCODING DECODING [TEST]\) 4354\(FORMAT ENCODING DECODING [TEST])
4355 4355
4356FORMAT is a symbol describing the encoding/decoding format. It can be 4356FORMAT is a symbol describing the encoding/decoding format. It can be
4357`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing. 4357`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
@@ -4524,7 +4524,7 @@ means discard it)."
4524 "List of compress and decompress commands for inline transfer. 4524 "List of compress and decompress commands for inline transfer.
4525Each item is a list that looks like this: 4525Each item is a list that looks like this:
4526 4526
4527\(COMPRESS DECOMPRESS\) 4527\(COMPRESS DECOMPRESS)
4528 4528
4529COMPRESS or DECOMPRESS are strings with the respective commands.") 4529COMPRESS or DECOMPRESS are strings with the respective commands.")
4530 4530
@@ -5535,7 +5535,7 @@ Return ATTR."
5535 (tramp-get-remote-id vec) 5535 (tramp-get-remote-id vec)
5536 (if (equal id-format 'integer) "" "n") 5536 (if (equal id-format 'integer) "" "n")
5537 (if (equal id-format 'integer) 5537 (if (equal id-format 'integer)
5538 "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))) 5538 "" "| sed -e s/^/\\\"/ -e s/\\$/\\\"/"))))
5539 5539
5540(defun tramp-get-remote-uid-with-perl (vec id-format) 5540(defun tramp-get-remote-uid-with-perl (vec id-format)
5541 (tramp-send-command-and-read 5541 (tramp-send-command-and-read
@@ -5586,7 +5586,7 @@ Return ATTR."
5586 (tramp-get-remote-id vec) 5586 (tramp-get-remote-id vec)
5587 (if (equal id-format 'integer) "" "n") 5587 (if (equal id-format 'integer) "" "n")
5588 (if (equal id-format 'integer) 5588 (if (equal id-format 'integer)
5589 "" "| sed -e s/^/\\\"/ -e s/\$/\\\"/")))) 5589 "" "| sed -e s/^/\\\"/ -e s/\\$/\\\"/"))))
5590 5590
5591(defun tramp-get-remote-gid-with-perl (vec id-format) 5591(defun tramp-get-remote-gid-with-perl (vec id-format)
5592 (tramp-send-command-and-read 5592 (tramp-send-command-and-read
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8b6ad7f1dc3..9ec3226417c 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -110,9 +110,9 @@ Any level x includes messages for all levels 1 .. x-1. The levels are
110Each element looks like (REGEXP . DIRECTORY), with the same meaning like 110Each element looks like (REGEXP . DIRECTORY), with the same meaning like
111in `backup-directory-alist'. If a Tramp file is backed up, and DIRECTORY 111in `backup-directory-alist'. If a Tramp file is backed up, and DIRECTORY
112is a local file name, the backup directory is prepended with Tramp file 112is a local file name, the backup directory is prepended with Tramp file
113name prefix \(method, user, host\) of file. 113name prefix \(method, user, host) of file.
114 114
115\(setq tramp-backup-directory-alist backup-directory-alist\) 115\(setq tramp-backup-directory-alist backup-directory-alist)
116 116
117gives the same backup policy for Tramp files on their hosts like the 117gives the same backup policy for Tramp files on their hosts like the
118policy for local files." 118policy for local files."
@@ -129,9 +129,9 @@ policy for local files."
129It has the same meaning like `bkup-backup-directory-info' from package 129It has the same meaning like `bkup-backup-directory-info' from package
130`backup-dir'. If a Tramp file is backed up, and BACKUP-DIR is a local 130`backup-dir'. If a Tramp file is backed up, and BACKUP-DIR is a local
131file name, the backup directory is prepended with Tramp file name prefix 131file name, the backup directory is prepended with Tramp file name prefix
132\(method, user, host\) of file. 132\(method, user, host) of file.
133 133
134\(setq tramp-bkup-backup-directory-info bkup-backup-directory-info\) 134\(setq tramp-bkup-backup-directory-info bkup-backup-directory-info)
135 135
136gives the same backup policy for Tramp files on their hosts like the 136gives the same backup policy for Tramp files on their hosts like the
137policy for local files." 137policy for local files."
@@ -464,15 +464,15 @@ host runs a registered shell, it shall be added to this list, too."
464 (concat 464 (concat
465 "\\`" 465 "\\`"
466 (regexp-opt 466 (regexp-opt
467 (list "localhost" "localhost6" (system-name) "127\.0\.0\.1" "::1") t) 467 (list "localhost" "localhost6" (system-name) "127.0.0.1" "::1") t)
468 "\\'") 468 "\\'")
469 "Host names which are regarded as local host.") 469 "Host names which are regarded as local host.")
470 470
471(defvar tramp-completion-function-alist nil 471(defvar tramp-completion-function-alist nil
472 "Alist of methods for remote files. 472 "Alist of methods for remote files.
473This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\). 473This is a list of entries of the form \(NAME PAIR1 PAIR2 ...).
474Each NAME stands for a remote access method. Each PAIR is of the form 474Each NAME stands for a remote access method. Each PAIR is of the form
475\(FUNCTION FILE\). FUNCTION is responsible to extract user names and host 475\(FUNCTION FILE). FUNCTION is responsible to extract user names and host
476names from FILE for completion. The following predefined FUNCTIONs exists: 476names from FILE for completion. The following predefined FUNCTIONs exists:
477 477
478 * `tramp-parse-rhosts' for \"~/.rhosts\" like files, 478 * `tramp-parse-rhosts' for \"~/.rhosts\" like files,
@@ -908,7 +908,7 @@ and is a bit too general, then some files might be considered Tramp
908files which are not really Tramp files. 908files which are not really Tramp files.
909 909
910Please note that the entry in `file-name-handler-alist' is made when 910Please note that the entry in `file-name-handler-alist' is made when
911this file \(tramp.el\) is loaded. This means that this variable must be set 911this file \(tramp.el) is loaded. This means that this variable must be set
912before loading tramp.el. Alternatively, `file-name-handler-alist' can be 912before loading tramp.el. Alternatively, `file-name-handler-alist' can be
913updated after changing this variable. 913updated after changing this variable.
914 914
@@ -940,7 +940,7 @@ See `tramp-file-name-structure' for more explanations.")
940This regexp should match partial Tramp file names only. 940This regexp should match partial Tramp file names only.
941 941
942Please note that the entry in `file-name-handler-alist' is made when 942Please note that the entry in `file-name-handler-alist' is made when
943this file \(tramp.el\) is loaded. This means that this variable must be set 943this file \(tramp.el) is loaded. This means that this variable must be set
944before loading tramp.el. Alternatively, `file-name-handler-alist' can be 944before loading tramp.el. Alternatively, `file-name-handler-alist' can be
945updated after changing this variable. 945updated after changing this variable.
946 946
@@ -993,18 +993,18 @@ checked via the following code:
993 993
994In the Emacs normally running Tramp, evaluate the above code 994In the Emacs normally running Tramp, evaluate the above code
995\(replace \"xxx\" and \"yyy\" by the remote user and host name, 995\(replace \"xxx\" and \"yyy\" by the remote user and host name,
996respectively\). You can do this, for example, by pasting it into 996respectively). You can do this, for example, by pasting it into
997the `*scratch*' buffer and then hitting C-j with the cursor after the 997the `*scratch*' buffer and then hitting C-j with the cursor after the
998last closing parenthesis. Note that it works only if you have configured 998last closing parenthesis. Note that it works only if you have configured
999\"ssh\" to run without password query, see ssh-agent\(1\). 999\"ssh\" to run without password query, see ssh-agent(1).
1000 1000
1001You will see the number of bytes sent successfully to the remote host. 1001You will see the number of bytes sent successfully to the remote host.
1002If that number exceeds 1000, you can stop the execution by hitting 1002If that number exceeds 1000, you can stop the execution by hitting
1003C-g, because your Emacs is likely clean. 1003C-g, because your Emacs is likely clean.
1004 1004
1005When it is necessary to set `tramp-chunksize', you might consider to 1005When it is necessary to set `tramp-chunksize', you might consider to
1006use an out-of-the-band method \(like \"scp\"\) instead of an internal one 1006use an out-of-the-band method \(like \"scp\") instead of an internal one
1007\(like \"ssh\"\), because setting `tramp-chunksize' to non-nil decreases 1007\(like \"ssh\"), because setting `tramp-chunksize' to non-nil decreases
1008performance. 1008performance.
1009 1009
1010If your Emacs is buggy, the code stops and gives you an indication 1010If your Emacs is buggy, the code stops and gives you an indication
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index 7fae9e6acc6..794a4676a5e 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -197,7 +197,7 @@ The key of an entry is the concatenation of the service name and
197service type of a discovered service. The value is the service 197service type of a discovered service. The value is the service
198itself. The format of a service is 198itself. The format of a service is
199 199
200 \(INTERFACE PROTOCOL NAME TYPE DOMAIN FLAGS\) 200 \(INTERFACE PROTOCOL NAME TYPE DOMAIN FLAGS)
201 201
202The INTERFACE is a number, which represents the network interface 202The INTERFACE is a number, which represents the network interface
203the service is located at. The corresponding network interface 203the service is located at. The corresponding network interface
@@ -233,7 +233,7 @@ The key of an entry is the concatenation of the service name and
233service type of a resolved service. The value is the service 233service type of a resolved service. The value is the service
234itself. The format of a service is 234itself. The format of a service is
235 235
236 \(INTERFACE PROTOCOL NAME TYPE DOMAIN HOST APROTOCOL ADDRESS PORT TXT FLAGS\) 236 (INTERFACE PROTOCOL NAME TYPE DOMAIN HOST APROTOCOL ADDRESS PORT TXT FLAGS)
237 237
238INTERFACE, PROTOCOL, NAME, TYPE, DOMAIN and FLAGS have the same 238INTERFACE, PROTOCOL, NAME, TYPE, DOMAIN and FLAGS have the same
239meaning as in `zeroconf-services-hash'. 239meaning as in `zeroconf-services-hash'.
@@ -275,7 +275,7 @@ supported keys depend on the service type.")
275 "Returns all discovered Avahi services for a given service type TYPE. 275 "Returns all discovered Avahi services for a given service type TYPE.
276The service type is one of the returned values of 276The service type is one of the returned values of
277`zeroconf-list-service-types'. The return value is a list 277`zeroconf-list-service-types'. The return value is a list
278\(SERVICE1 SERVICE2 ...\). See `zeroconf-services-hash' for the 278\(SERVICE1 SERVICE2 ...). See `zeroconf-services-hash' for the
279format of SERVICE." 279format of SERVICE."
280 (let (result) 280 (let (result)
281 (maphash 281 (maphash
@@ -385,7 +385,7 @@ type used when registering FUNCTION."
385NAME must be a string. The service must be of service type 385NAME must be a string. The service must be of service type
386TYPE. The resulting list has the format 386TYPE. The resulting list has the format
387 387
388 \(INTERFACE PROTOCOL NAME TYPE DOMAIN FLAGS\)." 388 (INTERFACE PROTOCOL NAME TYPE DOMAIN FLAGS)."
389 ;; Due to the service browser, all known services are kept in 389 ;; Due to the service browser, all known services are kept in
390 ;; `zeroconf-services-hash'. 390 ;; `zeroconf-services-hash'.
391 (gethash (concat name "/" type) zeroconf-services-hash nil)) 391 (gethash (concat name "/" type) zeroconf-services-hash nil))
@@ -395,7 +395,7 @@ TYPE. The resulting list has the format
395NAME must be a string. The service must be of service type 395NAME must be a string. The service must be of service type
396TYPE. The resulting list has the format 396TYPE. The resulting list has the format
397 397
398 \(INTERFACE PROTOCOL NAME TYPE DOMAIN HOST APROTOCOL ADDRESS PORT TXT FLAGS\)." 398 (INTERFACE PROTOCOL NAME TYPE DOMAIN HOST APROTOCOL ADDRESS PORT TXT FLAGS)."
399 (let* ((name (zeroconf-service-name service)) 399 (let* ((name (zeroconf-service-name service))
400 (type (zeroconf-service-type service)) 400 (type (zeroconf-service-type service))
401 (key (concat name "/" type))) 401 (key (concat name "/" type)))
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 799e58b6af2..11cd2530dd7 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -502,7 +502,7 @@ be saved in the second match data.")
502 502
503(defvar org-babel-result-w-name-regexp 503(defvar org-babel-result-w-name-regexp
504 (concat org-babel-result-regexp 504 (concat org-babel-result-regexp
505 "\\([^ ()\f\t\n\r\v]+\\)\\(\(\\(.*\\)\)\\|\\)")) 505 "\\([^ ()\f\t\n\r\v]+\\)\\((\\(.*\\))\\|\\)"))
506 506
507(defvar org-babel-min-lines-for-block-output 10 507(defvar org-babel-min-lines-for-block-output 10
508 "The minimum number of lines for block output. 508 "The minimum number of lines for block output.
@@ -2456,7 +2456,7 @@ block but are passed literally to the \"example-block\"."
2456 (setq index (point)) 2456 (setq index (point))
2457 (while (and (re-search-forward (org-babel-noweb-wrap) nil t)) 2457 (while (and (re-search-forward (org-babel-noweb-wrap) nil t))
2458 (save-match-data (setf source-name (match-string 1))) 2458 (save-match-data (setf source-name (match-string 1)))
2459 (save-match-data (setq evaluate (string-match "\(.*\)" source-name))) 2459 (save-match-data (setq evaluate (string-match "(.*)" source-name)))
2460 (save-match-data 2460 (save-match-data
2461 (setq prefix 2461 (setq prefix
2462 (buffer-substring (match-beginning 0) 2462 (buffer-substring (match-beginning 0)
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 21a40b34f49..f4953a39eac 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -53,7 +53,7 @@
53 (value (cdr pair))) 53 (value (cdr pair)))
54 (setq body 54 (setq body
55 (replace-regexp-in-string 55 (replace-regexp-in-string
56 (concat "\$" (regexp-quote name)) 56 (concat "$" (regexp-quote name))
57 (if (stringp value) value (format "%S" value)) 57 (if (stringp value) value (format "%S" value))
58 body)))) 58 body))))
59 vars) 59 vars)
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 5391edff5fc..04eab7c31dd 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -111,7 +111,7 @@ blocks")
111 (value (cdr pair))) 111 (value (cdr pair)))
112 (setq body 112 (setq body
113 (replace-regexp-in-string 113 (replace-regexp-in-string
114 (concat "\$" (regexp-quote name)) 114 (concat "$" (regexp-quote name))
115 (if (stringp value) value (format "%S" value)) 115 (if (stringp value) value (format "%S" value))
116 body)))) 116 body))))
117 vars) 117 vars)
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index b083011bbf2..c25470666c8 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -64,14 +64,14 @@ To add files to this list use the `org-babel-lob-ingest' command."
64 64
65(defconst org-babel-block-lob-one-liner-regexp 65(defconst org-babel-block-lob-one-liner-regexp
66 (concat 66 (concat
67 "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" 67 "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^()\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)"
68 "\(\\([^\n]*?\\)\)\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?") 68 "(\\([^\n]*?\\))\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?")
69 "Regexp to match non-inline calls to predefined source block functions.") 69 "Regexp to match non-inline calls to predefined source block functions.")
70 70
71(defconst org-babel-inline-lob-one-liner-regexp 71(defconst org-babel-inline-lob-one-liner-regexp
72 (concat 72 (concat
73 "\\([^\n]*?\\)call_\\([^\(\)\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)" 73 "\\([^\n]*?\\)call_\\([^()\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)"
74 "\(\\([^\n]*?\\)\)\\(\\[\\(.*?\\)\\]\\)?") 74 "(\\([^\n]*?\\))\\(\\[\\(.*?\\)\\]\\)?")
75 "Regexp to match inline calls to predefined source block functions.") 75 "Regexp to match inline calls to predefined source block functions.")
76 76
77(defconst org-babel-lob-one-liner-regexp 77(defconst org-babel-lob-one-liner-regexp
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index e0775dba3bd..7ad474dfb4d 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -61,7 +61,7 @@ if ischar(ans), fid = fopen('%s', 'w'); fprintf(fid, '%%s\\n', ans); fclose(fid)
61else, dlmwrite('%s', ans, '\\t') 61else, dlmwrite('%s', ans, '\\t')
62end") 62end")
63 63
64(defvar org-babel-octave-eoe-indicator "\'org_babel_eoe\'") 64(defvar org-babel-octave-eoe-indicator "'org_babel_eoe'")
65 65
66(defvar org-babel-octave-eoe-output "ans = org_babel_eoe") 66(defvar org-babel-octave-eoe-output "ans = org_babel_eoe")
67 67
@@ -127,7 +127,7 @@ specifying a variable of the same value."
127 (if (listp (car var)) "; " ",")) "]") 127 (if (listp (car var)) "; " ",")) "]")
128 (cond 128 (cond
129 ((stringp var) 129 ((stringp var)
130 (format "\'%s\'" var)) 130 (format "'%s'" var))
131 (t 131 (t
132 (format "%s" var))))) 132 (format "%s" var)))))
133 133
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 3e79592f5a0..5c1e13142da 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -138,7 +138,7 @@ the variable."
138 (setq ref (substring ref 0 (match-beginning 0)))) 138 (setq ref (substring ref 0 (match-beginning 0))))
139 ;; assign any arguments to pass to source block 139 ;; assign any arguments to pass to source block
140 (when (string-match 140 (when (string-match
141 "^\\(.+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)\(\\(.*\\)\)$" ref) 141 "^\\(.+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)(\\(.*\\))$" ref)
142 (setq new-refere (match-string 1 ref)) 142 (setq new-refere (match-string 1 ref))
143 (setq new-header-args (match-string 3 ref)) 143 (setq new-header-args (match-string 3 ref))
144 (setq new-referent (match-string 5 ref)) 144 (setq new-referent (match-string 5 ref))
@@ -224,7 +224,7 @@ returned, or an empty string or \"*\" both of which are
224interpreted to mean the entire range and as such are equivalent 224interpreted to mean the entire range and as such are equivalent
225to \"0:-1\"." 225to \"0:-1\"."
226 (if (and (> (length index) 0) (string-match "^\\([^,]*\\),?" index)) 226 (if (and (> (length index) 0) (string-match "^\\([^,]*\\),?" index))
227 (let* ((ind-re "\\(\\([-[:digit:]]+\\):\\([-[:digit:]]+\\)\\|\*\\)") 227 (let* ((ind-re "\\(\\([-[:digit:]]+\\):\\([-[:digit:]]+\\)\\|\\*\\)")
228 (lgth (length lis)) 228 (lgth (length lis))
229 (portion (match-string 1 index)) 229 (portion (match-string 1 index))
230 (remainder (substring index (match-end 0))) 230 (remainder (substring index (match-end 0)))
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 7ed61b153e7..6dff9adca86 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -106,7 +106,7 @@ This function is called by `org-babel-execute-src-block'."
106 ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" 106 ('dbi (format "dbish --batch %s < %s | sed '%s' > %s"
107 (or cmdline "") 107 (or cmdline "")
108 (org-babel-process-file-name in-file) 108 (org-babel-process-file-name in-file)
109 "/^+/d;s/^\|//;s/(NULL)/ /g;$d" 109 "/^+/d;s/^|//;s/(NULL)/ /g;$d"
110 (org-babel-process-file-name out-file))) 110 (org-babel-process-file-name out-file)))
111 ('monetdb (format "mclient -f tab %s < %s > %s" 111 ('monetdb (format "mclient -f tab %s < %s > %s"
112 (or cmdline "") 112 (or cmdline "")
@@ -186,7 +186,7 @@ This function is called by `org-babel-execute-src-block'."
186 (lambda (pair) 186 (lambda (pair)
187 (setq body 187 (setq body
188 (replace-regexp-in-string 188 (replace-regexp-in-string
189 (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! 189 (format "$%s" (car pair))
190 (let ((val (cdr pair))) 190 (let ((val (cdr pair)))
191 (if (listp val) 191 (if (listp val)
192 (let ((data-file (org-babel-temp-file "sql-data-"))) 192 (let ((data-file (org-babel-temp-file "sql-data-")))
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 33c8d9b59fc..18d7fc8fd6a 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -119,7 +119,7 @@ This function is called by `org-babel-execute-src-block'."
119 (lambda (pair) 119 (lambda (pair)
120 (setq body 120 (setq body
121 (replace-regexp-in-string 121 (replace-regexp-in-string
122 (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! 122 (format "$%s" (car pair))
123 (let ((val (cdr pair))) 123 (let ((val (cdr pair)))
124 (if (listp val) 124 (if (listp val)
125 (let ((data-file (org-babel-temp-file "sqlite-data-"))) 125 (let ((data-file (org-babel-temp-file "sqlite-data-")))
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index c0846f9cd82..732522c3773 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -302,7 +302,7 @@ Insert the source-code specified by SPEC into the current source
302code file. This function uses `comment-region' which assumes 302code file. This function uses `comment-region' which assumes
303that the appropriate major-mode is set. SPEC has the form: 303that the appropriate major-mode is set. SPEC has the form:
304 304
305 \(start-line file link source-name params body comment)" 305 (start-line file link source-name params body comment)"
306 (let* ((start-line (nth 0 spec)) 306 (let* ((start-line (nth 0 spec))
307 (file (nth 1 spec)) 307 (file (nth 1 spec))
308 (link (nth 2 spec)) 308 (link (nth 2 spec))
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index ae5a252d8af..0b3be562489 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -4603,7 +4603,8 @@ in `org-agenda-text-search-extra-files'."
4603 (goto-char (1- end)) 4603 (goto-char (1- end))
4604 (throw :skip t))) 4604 (throw :skip t)))
4605 (if todo-only 4605 (if todo-only
4606 (cons (concat "^\*+[ \t]+" org-not-done-regexp) 4606 (cons (concat "^\\*+[ \t]+"
4607 org-not-done-regexp)
4607 regexps+) 4608 regexps+)
4608 regexps+)) 4609 regexps+))
4609 (goto-char beg) 4610 (goto-char beg)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 9489edf98bf..b386eb11652 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1235,7 +1235,7 @@ make this the default behavior.)"
1235 (looking-at 1235 (looking-at
1236 (concat "^[ \t]*" org-clock-string 1236 (concat "^[ \t]*" org-clock-string
1237 " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}" 1237 " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}"
1238 " *\\sw+\.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$"))) 1238 " *\\sw+.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")))
1239 (message "Matched %s" (match-string 1)) 1239 (message "Matched %s" (match-string 1))
1240 (setq ts (concat "[" (match-string 1) "]")) 1240 (setq ts (concat "[" (match-string 1) "]"))
1241 (goto-char (match-end 1)) 1241 (goto-char (match-end 1))
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index e938ab4ae4b..396aa3711d3 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -354,7 +354,7 @@ CPHR is the complex heading regexp to use for parsing ITEM."
354 (let (fixitem) 354 (let (fixitem)
355 (if (not cphr) 355 (if (not cphr)
356 item 356 item
357 (unless (string-match "^\*+ " item) 357 (unless (string-match "^\\*+ " item)
358 (setq item (concat "* " item) fixitem t)) 358 (setq item (concat "* " item) fixitem t))
359 (if (string-match cphr item) 359 (if (string-match cphr item)
360 (setq item 360 (setq item
@@ -369,7 +369,7 @@ CPHR is the complex heading regexp to use for parsing ITEM."
369 0 (1+ (match-end 1)) 369 0 (1+ (match-end 1))
370 (list 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1)))))) 370 (list 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1))))))
371 item)) 371 item))
372 (if fixitem (replace-regexp-in-string "^\*+ " "" item) item)))) 372 (if fixitem (replace-regexp-in-string "^\\*+ " "" item) item))))
373 373
374(defun org-columns-compact-links (s) 374(defun org-columns-compact-links (s)
375 "Replace [[link][desc]] with [desc] or [link]." 375 "Replace [[link][desc]] with [desc] or [link]."
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 573d7eeca2d..9f4cfa3ec66 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -4141,30 +4141,30 @@ Assuming TREE is a variable containing an Org buffer parse tree,
4141the following example will return a flat list of all `src-block' 4141the following example will return a flat list of all `src-block'
4142and `example-block' elements in it: 4142and `example-block' elements in it:
4143 4143
4144 \(org-element-map tree \\='(example-block src-block) \\='identity) 4144 (org-element-map tree \\='(example-block src-block) \\='identity)
4145 4145
4146The following snippet will find the first headline with a level 4146The following snippet will find the first headline with a level
4147of 1 and a \"phone\" tag, and will return its beginning position: 4147of 1 and a \"phone\" tag, and will return its beginning position:
4148 4148
4149 \(org-element-map tree \\='headline 4149 (org-element-map tree \\='headline
4150 \(lambda (hl) 4150 (lambda (hl)
4151 \(and (= (org-element-property :level hl) 1) 4151 (and (= (org-element-property :level hl) 1)
4152 \(member \"phone\" (org-element-property :tags hl)) 4152 (member \"phone\" (org-element-property :tags hl))
4153 \(org-element-property :begin hl))) 4153 (org-element-property :begin hl)))
4154 nil t) 4154 nil t)
4155 4155
4156The next example will return a flat list of all `plain-list' type 4156The next example will return a flat list of all `plain-list' type
4157elements in TREE that are not a sub-list themselves: 4157elements in TREE that are not a sub-list themselves:
4158 4158
4159 \(org-element-map tree \\='plain-list \\='identity nil nil \\='plain-list) 4159 (org-element-map tree \\='plain-list \\='identity nil nil \\='plain-list)
4160 4160
4161Eventually, this example will return a flat list of all `bold' 4161Eventually, this example will return a flat list of all `bold'
4162type objects containing a `latex-snippet' type object, even 4162type objects containing a `latex-snippet' type object, even
4163looking into captions: 4163looking into captions:
4164 4164
4165 \(org-element-map tree \\='bold 4165 (org-element-map tree \\='bold
4166 \(lambda (b) 4166 (lambda (b)
4167 \(and (org-element-map b \\='latex-snippet \\='identity nil t) b)) 4167 (and (org-element-map b \\='latex-snippet \\='identity nil t) b))
4168 nil nil nil t)" 4168 nil nil nil t)"
4169 ;; Ensure TYPES and NO-RECURSION are a list, even of one element. 4169 ;; Ensure TYPES and NO-RECURSION are a list, even of one element.
4170 (unless (listp types) (setq types (list types))) 4170 (unless (listp types) (setq types (list types)))
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 0f086975aa7..5d853e62bc1 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -243,7 +243,7 @@ positions, and the definition, when inlined."
243 243
244This matches only pure definitions like [1] or [fn:name] at the 244This matches only pure definitions like [1] or [fn:name] at the
245beginning of a line. It does not match references like 245beginning of a line. It does not match references like
246\[fn:name:definition], where the footnote text is included and 246[fn:name:definition], where the footnote text is included and
247defined locally. 247defined locally.
248 248
249The return value will be nil if not at a footnote definition, and 249The return value will be nil if not at a footnote definition, and
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 28bed8dcc59..c8266500fe3 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -230,7 +230,7 @@ This variable needs to be set before org.el is loaded. If you
230need to make a change while Emacs is running, use the customize 230need to make a change while Emacs is running, use the customize
231interface or run the following code after updating it: 231interface or run the following code after updating it:
232 232
233 \(when (featurep \\='org-element) (load \"org-element\" t t))" 233 (when (featurep \\='org-element) (load \"org-element\" t t))"
234 :group 'org-plain-lists 234 :group 'org-plain-lists
235 :version "24.1" 235 :version "24.1"
236 :type 'boolean 236 :type 'boolean
@@ -620,11 +620,11 @@ point-at-bol:
620 620
621will get the following structure: 621will get the following structure:
622 622
623\(\(1 0 \"- \" nil \"[X]\" nil 97\) 623 ((1 0 \"- \" nil \"[X]\" nil 97)
624 \(18 2 \"1. \" nil nil nil 34\) 624 (18 2 \"1. \" nil nil nil 34)
625 \(34 2 \"5. \" \"5\" nil nil 55\) 625 (34 2 \"5. \" \"5\" nil nil 55)
626 \(97 0 \"- \" nil nil nil 131\) 626 (97 0 \"- \" nil nil nil 131)
627 \(109 2 \"+ \" nil nil \"tag\" 131\) 627 (109 2 \"+ \" nil nil \"tag\" 131))
628 628
629Assume point is at an item." 629Assume point is at an item."
630 (save-excursion 630 (save-excursion
@@ -2015,7 +2015,7 @@ previous item, plus ARGS extra arguments.
2015 2015
2016FUNCTION is applied on items in reverse order. 2016FUNCTION is applied on items in reverse order.
2017 2017
2018As an example, \(org-apply-on-list \(lambda \(result\) \(1+ result\)\) 0\) 2018As an example, \(org-apply-on-list \(lambda \(result) \(1+ result)) 0)
2019will return the number of items in the current list. 2019will return the number of items in the current list.
2020 2020
2021Sublists of the list are skipped. Cursor is always at the 2021Sublists of the list are skipped. Cursor is always at the
@@ -2931,13 +2931,13 @@ For example, the following list:
2931 2931
2932will be parsed as: 2932will be parsed as:
2933 2933
2934\(ordered 2934 (ordered
2935 \(nil \"first item\" 2935 (nil \"first item\"
2936 \(unordered 2936 (unordered
2937 \(nil \"sub-item one\"\) 2937 (nil \"sub-item one\")
2938 \(nil \"[CBON] sub-item two\"\)\) 2938 (nil \"[CBON] sub-item two\"))
2939 \"more text in first item\"\) 2939 \"more text in first item\")
2940 \(3 \"last item\"\)\) 2940 (3 \"last item\"))
2941 2941
2942Point is left at list end." 2942Point is left at list end."
2943 (defvar parse-item) ;FIXME: Or use `cl-labels' or `letrec'. 2943 (defvar parse-item) ;FIXME: Or use `cl-labels' or `letrec'.
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 478ad933ae2..174e36ed632 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -440,8 +440,8 @@ available parameters."
440 "Check if the table has a marking column. 440 "Check if the table has a marking column.
441If yes remove the column and the special lines." 441If yes remove the column and the special lines."
442 (let ((special (if maybe-quoted 442 (let ((special (if maybe-quoted
443 "^[ \t]*| *\\\\?[\#!$*_^/ ] *|" 443 "^[ \t]*| *\\\\?[#!$*_^/ ] *|"
444 "^[ \t]*| *[\#!$*_^/ ] *|")) 444 "^[ \t]*| *[#!$*_^/ ] *|"))
445 (ignore (if maybe-quoted 445 (ignore (if maybe-quoted
446 "^[ \t]*| *\\\\?[!$_^/] *|" 446 "^[ \t]*| *\\\\?[!$_^/] *|"
447 "^[ \t]*| *[!$_^/] *|"))) 447 "^[ \t]*| *[!$_^/] *|")))
@@ -3248,7 +3248,7 @@ formulas that use a range of rows or columns, it may often be better
3248to anchor the formula with \"I\" row markers, or to offset from the 3248to anchor the formula with \"I\" row markers, or to offset from the
3249borders of the table using the @< @> $< $> makers." 3249borders of the table using the @< @> $< $> makers."
3250 (let (n nmax len char (start 0)) 3250 (let (n nmax len char (start 0))
3251 (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^\)]+)\\)" 3251 (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^)]+)\\)"
3252 s start) 3252 s start)
3253 (if (match-end 3) 3253 (if (match-end 3)
3254 (setq start (match-end 3)) 3254 (setq start (match-end 3))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c7b64cccb19..7a6d6cc1b3f 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -381,7 +381,7 @@ core modules, nor modules from the CONTRIB directory). Just add symbols
381to the end of the list. If the package is called org-xyz.el, then you need 381to the end of the list. If the package is called org-xyz.el, then you need
382to add the symbol `xyz', and the package must have a call to: 382to add the symbol `xyz', and the package must have a call to:
383 383
384 \(provide \\='org-xyz) 384 (provide \\='org-xyz)
385 385
386For export specific modules, see also `org-export-backends'." 386For export specific modules, see also `org-export-backends'."
387 :group 'org 387 :group 'org
@@ -465,26 +465,26 @@ need to make a change while Emacs is running, use the customize
465interface or run the following code, where VAL stands for the new 465interface or run the following code, where VAL stands for the new
466value of the variable, after updating it: 466value of the variable, after updating it:
467 467
468 \(progn 468 (progn
469 \(setq org-export--registered-backends 469 (setq org-export--registered-backends
470 \(org-remove-if-not 470 (org-remove-if-not
471 \(lambda (backend) 471 (lambda (backend)
472 \(let ((name (org-export-backend-name backend))) 472 (let ((name (org-export-backend-name backend)))
473 \(or (memq name val) 473 (or (memq name val)
474 \(catch \\='parentp 474 (catch \\='parentp
475 \(dolist (b val) 475 (dolist (b val)
476 \(and (org-export-derived-backend-p b name) 476 (and (org-export-derived-backend-p b name)
477 \(throw \\='parentp t))))))) 477 (throw \\='parentp t)))))))
478 org-export--registered-backends)) 478 org-export--registered-backends))
479 \(let ((new-list (mapcar \\='org-export-backend-name 479 (let ((new-list (mapcar \\='org-export-backend-name
480 org-export--registered-backends))) 480 org-export--registered-backends)))
481 \(dolist (backend val) 481 (dolist (backend val)
482 \(cond 482 (cond
483 \((not (load (format \"ox-%s\" backend) t t)) 483 ((not (load (format \"ox-%s\" backend) t t))
484 \(message \"Problems while trying to load export back-end \\=`%s\\='\" 484 (message \"Problems while trying to load export back-end \\=`%s\\='\"
485 backend)) 485 backend))
486 \((not (memq backend new-list)) (push backend new-list)))) 486 ((not (memq backend new-list)) (push backend new-list))))
487 \(set-default \\='org-export-backends new-list))) 487 (set-default \\='org-export-backends new-list)))
488 488
489Adding a back-end to this list will also pull the back-end it 489Adding a back-end to this list will also pull the back-end it
490depends on, if any." 490depends on, if any."
@@ -2957,7 +2957,7 @@ its value is 0.
2957 2957
2958For example, 2958For example,
2959 2959
2960 \(:days \"%dd\" :hours \"%d\" :require-hours t :minutes \":%02d\" 2960 (:days \"%dd\" :hours \"%d\" :require-hours t :minutes \":%02d\"
2961 :require-minutes t) 2961 :require-minutes t)
2962 2962
2963means durations longer than a day will be expressed in days, 2963means durations longer than a day will be expressed in days,
@@ -2967,7 +2967,7 @@ hour).
2967 2967
2968The value 2968The value
2969 2969
2970 \(:days \"%dd\" :minutes \"%dm\") 2970 (:days \"%dd\" :minutes \"%dm\")
2971 2971
2972means durations longer than a day will be expressed in days and 2972means durations longer than a day will be expressed in days and
2973minutes, and durations less than a day will be expressed entirely 2973minutes, and durations less than a day will be expressed entirely
@@ -3802,8 +3802,8 @@ images at the same place."
3802 3802
3803(defcustom org-format-latex-header "\\documentclass{article} 3803(defcustom org-format-latex-header "\\documentclass{article}
3804\\usepackage[usenames]{color} 3804\\usepackage[usenames]{color}
3805\[PACKAGES] 3805[PACKAGES]
3806\[DEFAULT-PACKAGES] 3806[DEFAULT-PACKAGES]
3807\\pagestyle{empty} % do not remove 3807\\pagestyle{empty} % do not remove
3808% The settings below are copied from fullpage.sty 3808% The settings below are copied from fullpage.sty
3809\\setlength{\\textwidth}{\\paperwidth} 3809\\setlength{\\textwidth}{\\paperwidth}
@@ -3889,7 +3889,7 @@ a string.
3889 3889
3890A cell is of the format: 3890A cell is of the format:
3891 3891
3892 \( \"options\" \"package\" SNIPPET-FLAG). 3892 ( \"options\" \"package\" SNIPPET-FLAG).
3893 3893
3894If SNIPPET-FLAG is non-nil, the package also needs to be included 3894If SNIPPET-FLAG is non-nil, the package also needs to be included
3895when compiling LaTeX snippets into images for inclusion into 3895when compiling LaTeX snippets into images for inclusion into
@@ -3917,7 +3917,7 @@ Each element is either a cell or a string.
3917 3917
3918A cell is of the format: 3918A cell is of the format:
3919 3919
3920 \(\"options\" \"package\" SNIPPET-FLAG) 3920 (\"options\" \"package\" SNIPPET-FLAG)
3921 3921
3922SNIPPET-FLAG, when non-nil, indicates that this package is also 3922SNIPPET-FLAG, when non-nil, indicates that this package is also
3923needed when turning LaTeX snippets into images for inclusion into 3923needed when turning LaTeX snippets into images for inclusion into
@@ -7302,7 +7302,7 @@ Optional arguments START and END can be used to limit the range."
7302(defconst org-goto-help 7302(defconst org-goto-help
7303 "Browse buffer copy, to find location or copy text.%s 7303 "Browse buffer copy, to find location or copy text.%s
7304RET=jump to location C-g=quit and return to previous location 7304RET=jump to location C-g=quit and return to previous location
7305\[Up]/[Down]=next/prev headline TAB=cycle visibility [/] org-occur") 7305[Up]/[Down]=next/prev headline TAB=cycle visibility [/] org-occur")
7306 7306
7307(defvar org-goto-start-pos) ; dynamically scoped parameter 7307(defvar org-goto-start-pos) ; dynamically scoped parameter
7308 7308
@@ -7682,7 +7682,7 @@ command."
7682 (re-search-forward org-outline-regexp-bol) 7682 (re-search-forward org-outline-regexp-bol)
7683 (beginning-of-line 0)) 7683 (beginning-of-line 0))
7684 (skip-chars-backward " \r\n") 7684 (skip-chars-backward " \r\n")
7685 (and (not (looking-back "^\*+" (line-beginning-position))) 7685 (and (not (looking-back "^\\*+" (line-beginning-position)))
7686 (looking-at "[ \t]+") (replace-match "")) 7686 (looking-at "[ \t]+") (replace-match ""))
7687 (unless (eobp) (forward-char 1)) 7687 (unless (eobp) (forward-char 1))
7688 (when (looking-at "^\\*") 7688 (when (looking-at "^\\*")
@@ -11389,7 +11389,7 @@ on the system \"/user@host:\"."
11389 (setq level (org-reduced-level 11389 (setq level (org-reduced-level
11390 (- (match-end 1) (match-beginning 1))) 11390 (- (match-end 1) (match-beginning 1)))
11391 txt (org-link-display-format (match-string 4)) 11391 txt (org-link-display-format (match-string 4))
11392 txt (replace-regexp-in-string "\\( *\[[0-9]+/?[0-9]*%?\]\\)+$" "" txt) 11392 txt (replace-regexp-in-string "\\( *[[0-9]+/?[0-9]*%?]\\)+$" "" txt)
11393 re (format org-complex-heading-regexp-format 11393 re (format org-complex-heading-regexp-format
11394 (regexp-quote (match-string 4)))) 11394 (regexp-quote (match-string 4))))
11395 (when org-refile-use-outline-path 11395 (when org-refile-use-outline-path
@@ -16355,7 +16355,7 @@ While prompting, a calendar is popped up - you can also select the
16355date with the mouse (button 1). The calendar shows a period of three 16355date with the mouse (button 1). The calendar shows a period of three
16356months. To scroll it to other months, use the keys `>' and `<'. 16356months. To scroll it to other months, use the keys `>' and `<'.
16357If you don't like the calendar, turn it off with 16357If you don't like the calendar, turn it off with
16358 \(setq org-read-date-popup-calendar nil) 16358 (setq org-read-date-popup-calendar nil)
16359 16359
16360With optional argument TO-TIME, the date will immediately be converted 16360With optional argument TO-TIME, the date will immediately be converted
16361to an internal time. 16361to an internal time.
@@ -17912,7 +17912,7 @@ If EXCLUDE-TMP is non-nil, ignore temporary buffers."
17912 ((eq predicate 'files) 17912 ((eq predicate 'files)
17913 (lambda (b) (with-current-buffer b (derived-mode-p 'org-mode)))) 17913 (lambda (b) (with-current-buffer b (derived-mode-p 'org-mode))))
17914 ((eq predicate 'export) 17914 ((eq predicate 'export)
17915 (lambda (b) (string-match "\*Org .*Export" (buffer-name b)))) 17915 (lambda (b) (string-match "\\*Org .*Export" (buffer-name b))))
17916 ((eq predicate 'agenda) 17916 ((eq predicate 'agenda)
17917 (lambda (b) 17917 (lambda (b)
17918 (with-current-buffer b 17918 (with-current-buffer b
@@ -17921,7 +17921,7 @@ If EXCLUDE-TMP is non-nil, ignore temporary buffers."
17921 (member (file-truename bfn) agenda-files))))) 17921 (member (file-truename bfn) agenda-files)))))
17922 (t (lambda (b) (with-current-buffer b 17922 (t (lambda (b) (with-current-buffer b
17923 (or (derived-mode-p 'org-mode) 17923 (or (derived-mode-p 'org-mode)
17924 (string-match "\*Org .*Export" 17924 (string-match "\\*Org .*Export"
17925 (buffer-name b))))))))) 17925 (buffer-name b)))))))))
17926 (delq nil 17926 (delq nil
17927 (mapcar 17927 (mapcar
@@ -23005,7 +23005,7 @@ no special treatment. In particular, a simple \\[universal-argument] prefix \
23005will just 23005will just
23006plainly yank the text as it is. 23006plainly yank the text as it is.
23007 23007
23008\[1] The test checks if the first non-white line is a heading 23008[1] The test checks if the first non-white line is a heading
23009 and if there are no other headings with fewer stars." 23009 and if there are no other headings with fewer stars."
23010 (interactive "P") 23010 (interactive "P")
23011 (org-yank-generic 'yank arg)) 23011 (org-yank-generic 'yank arg))
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index fc4f574a4c4..2b2d92ee2fc 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -2598,7 +2598,7 @@ Bind `org-html-standalone-image-predicate' to constrain paragraph
2598further. For example, to check for only captioned standalone 2598further. For example, to check for only captioned standalone
2599images, set it to: 2599images, set it to:
2600 2600
2601 \(lambda (paragraph) (org-element-property :caption paragraph))" 2601 (lambda (paragraph) (org-element-property :caption paragraph))"
2602 (let ((paragraph (case (org-element-type element) 2602 (let ((paragraph (case (org-element-type element)
2603 (paragraph element) 2603 (paragraph element)
2604 (link (org-export-get-parent element))))) 2604 (link (org-export-get-parent element)))))
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index cea02ff4548..91a864eee6e 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -212,9 +212,9 @@
212If #+LATEX_CLASS is set in the buffer, use its value and the 212If #+LATEX_CLASS is set in the buffer, use its value and the
213associated information. Here is the structure of each cell: 213associated information. Here is the structure of each cell:
214 214
215 \(class-name 215 (class-name
216 header-string 216 header-string
217 \(numbered-section . unnumbered-section) 217 (numbered-section . unnumbered-section)
218 ...) 218 ...)
219 219
220The header string 220The header string
@@ -281,11 +281,11 @@ section string and will be replaced by the title of the section.
281Instead of a cons cell (numbered . unnumbered), you can also 281Instead of a cons cell (numbered . unnumbered), you can also
282provide a list of 2 or 4 elements, 282provide a list of 2 or 4 elements,
283 283
284 \(numbered-open numbered-close) 284 (numbered-open numbered-close)
285 285
286or 286or
287 287
288 \(numbered-open numbered-close unnumbered-open unnumbered-close) 288 (numbered-open numbered-close unnumbered-open unnumbered-close)
289 289
290providing opening and closing strings for a LaTeX environment 290providing opening and closing strings for a LaTeX environment
291that should represent the document section. The opening clause 291that should represent the document section. The opening clause
@@ -591,18 +591,18 @@ The function should return the string to be exported.
591For example, the variable could be set to the following function 591For example, the variable could be set to the following function
592in order to mimic default behavior: 592in order to mimic default behavior:
593 593
594\(defun org-latex-format-inlinetask \(todo type priority name tags contents\) 594\(defun org-latex-format-inlinetask (todo type priority name tags contents)
595\"Format an inline task element for LaTeX export.\" 595\"Format an inline task element for LaTeX export.\"
596 \(let ((full-title 596 (let ((full-title
597 \(concat 597 (concat
598 \(when todo 598 (when todo
599 \(format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo)) 599 (format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo))
600 \(when priority (format \"\\\\framebox{\\\\#%c} \" priority)) 600 (when priority (format \"\\\\framebox{\\\\#%c} \" priority))
601 title 601 title
602 \(when tags 602 (when tags
603 \(format \"\\\\hfill{}\\\\textsc{:%s:}\" 603 (format \"\\\\hfill{}\\\\textsc{:%s:}\"
604 \(mapconcat \\='identity tags \":\"))))) 604 (mapconcat \\='identity tags \":\")))))
605 \(format (concat \"\\\\begin{center}\\n\" 605 (format (concat \"\\\\begin{center}\\n\"
606 \"\\\\fbox{\\n\" 606 \"\\\\fbox{\\n\"
607 \"\\\\begin{minipage}[c]{.6\\\\textwidth}\\n\" 607 \"\\\\begin{minipage}[c]{.6\\\\textwidth}\\n\"
608 \"%s\\n\\n\" 608 \"%s\\n\\n\"
@@ -626,21 +626,21 @@ listings package, and if you want to have color, the color
626package. Just add these to `org-latex-packages-alist', for 626package. Just add these to `org-latex-packages-alist', for
627example using customize, or with something like: 627example using customize, or with something like:
628 628
629 \(require \\='ox-latex) 629 (require \\='ox-latex)
630 \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\")) 630 (add-to-list \\='org-latex-packages-alist \\='(\"\" \"listings\"))
631 \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\")) 631 (add-to-list \\='org-latex-packages-alist \\='(\"\" \"color\"))
632 632
633Alternatively, 633Alternatively,
634 634
635 \(setq org-latex-listings \\='minted) 635 (setq org-latex-listings \\='minted)
636 636
637causes source code to be exported using the minted package as 637causes source code to be exported using the minted package as
638opposed to listings. If you want to use minted, you need to add 638opposed to listings. If you want to use minted, you need to add
639the minted package to `org-latex-packages-alist', for example 639the minted package to `org-latex-packages-alist', for example
640using customize, or with 640using customize, or with
641 641
642 \(require \\='ox-latex) 642 (require \\='ox-latex)
643 \(add-to-list \\='org-latex-packages-alist \\='(\"\" \"minted\")) 643 (add-to-list \\='org-latex-packages-alist \\='(\"\" \"minted\"))
644 644
645In addition, it is necessary to install pygments 645In addition, it is necessary to install pygments
646\(http://pygments.org), and to configure the variable 646\(http://pygments.org), and to configure the variable
@@ -689,9 +689,9 @@ These options are supplied as a comma-separated list to the
689a list containing two strings: the name of the option, and the 689a list containing two strings: the name of the option, and the
690value. For example, 690value. For example,
691 691
692 \(setq org-latex-listings-options 692 (setq org-latex-listings-options
693 '((\"basicstyle\" \"\\\\small\") 693 '((\"basicstyle\" \"\\\\small\")
694 \(\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\"))) 694 (\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\")))
695 695
696will typeset the code in a small size font with underlined, bold 696will typeset the code in a small size font with underlined, bold
697black keywords. 697black keywords.
@@ -736,8 +736,8 @@ These options are supplied within square brackets in
736be a list containing two strings: the name of the option, and the 736be a list containing two strings: the name of the option, and the
737value. For example, 737value. For example,
738 738
739 \(setq org-latex-minted-options 739 (setq org-latex-minted-options
740 '\((\"bgcolor\" \"bg\") \(\"frame\" \"lines\"))) 740 '((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
741 741
742will result in src blocks being exported with 742will result in src blocks being exported with
743 743
@@ -757,8 +757,8 @@ options will be applied to blocks of all languages."
757It is used during export of src blocks by the listings and minted 757It is used during export of src blocks by the listings and minted
758latex packages. For example, 758latex packages. For example,
759 759
760 \(setq org-latex-custom-lang-environments 760 (setq org-latex-custom-lang-environments
761 '\(\(python \"pythoncode\"\)\)\) 761 '((python \"pythoncode\")))
762 762
763would have the effect that if org encounters begin_src python 763would have the effect that if org encounters begin_src python
764during latex export it will output 764during latex export it will output
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index 8b4ddc7e651..d7adcd5486d 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -206,8 +206,8 @@ in this list - but it does not hurt if it is present."
206It is used during export of src blocks by the listings and 206It is used during export of src blocks by the listings and
207man packages. For example, 207man packages. For example,
208 208
209 \(setq org-man-custom-lang-environments 209 (setq org-man-custom-lang-environments
210 '\(\(python \"pythoncode\"\)\)\) 210 '((python \"pythoncode\")))
211 211
212would have the effect that if org encounters begin_src python 212would have the effect that if org encounters begin_src python
213during man export." 213during man export."
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index a0281420317..1ee201ba23f 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -231,13 +231,13 @@ standard Emacs.")
231(defvar org-odt-automatic-styles '() 231(defvar org-odt-automatic-styles '()
232 "Registry of automatic styles for various OBJECT-TYPEs. 232 "Registry of automatic styles for various OBJECT-TYPEs.
233The variable has the following form: 233The variable has the following form:
234\(\(OBJECT-TYPE-A 234 ((OBJECT-TYPE-A
235 \(\(OBJECT-NAME-A.1 OBJECT-PROPS-A.1\) 235 ((OBJECT-NAME-A.1 OBJECT-PROPS-A.1)
236 \(OBJECT-NAME-A.2 OBJECT-PROPS-A.2\) ...\)\) 236 (OBJECT-NAME-A.2 OBJECT-PROPS-A.2) ...))
237 \(OBJECT-TYPE-B 237 (OBJECT-TYPE-B
238 \(\(OBJECT-NAME-B.1 OBJECT-PROPS-B.1\) 238 ((OBJECT-NAME-B.1 OBJECT-PROPS-B.1)
239 \(OBJECT-NAME-B.2 OBJECT-PROPS-B.2\) ...\)\) 239 (OBJECT-NAME-B.2 OBJECT-PROPS-B.2) ...))
240 ...\). 240 ...).
241 241
242OBJECT-TYPEs could be \"Section\", \"Table\", \"Figure\" etc. 242OBJECT-TYPEs could be \"Section\", \"Table\", \"Figure\" etc.
243OBJECT-PROPS is (typically) a plist created by passing 243OBJECT-PROPS is (typically) a plist created by passing
@@ -292,7 +292,7 @@ according to the default face identified by the `htmlfontify'.")
292 292
293This is an alist where each element is of the form: 293This is an alist where each element is of the form:
294 294
295 \(STYLE-NAME ATTACH-FMT REF-MODE REF-FMT) 295 (STYLE-NAME ATTACH-FMT REF-MODE REF-FMT)
296 296
297ATTACH-FMT controls how labels and captions are attached to an 297ATTACH-FMT controls how labels and captions are attached to an
298entity. It may contain following specifiers - %e and %c. %e is 298entity. It may contain following specifiers - %e and %c. %e is
@@ -319,7 +319,7 @@ See also `org-odt-format-label'.")
319 319
320This is a list where each entry is of the form: 320This is a list where each entry is of the form:
321 321
322 \(CATEGORY-HANDLE OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE) 322 (CATEGORY-HANDLE OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE)
323 323
324CATEGORY_HANDLE identifies the captionable entity in question. 324CATEGORY_HANDLE identifies the captionable entity in question.
325 325
@@ -670,11 +670,11 @@ The default value simply returns the value of CONTENTS."
670 "Function to format headline text. 670 "Function to format headline text.
671 671
672This function will be called with 5 arguments: 672This function will be called with 5 arguments:
673TODO the todo keyword \(string or nil\). 673TODO the todo keyword (string or nil).
674TODO-TYPE the type of todo \(symbol: `todo', `done', nil\) 674TODO-TYPE the type of todo (symbol: `todo', `done', nil)
675PRIORITY the priority of the headline \(integer or nil\) 675PRIORITY the priority of the headline (integer or nil)
676TEXT the main headline text \(string\). 676TEXT the main headline text (string).
677TAGS the tags string, separated with colons \(string or nil\). 677TAGS the tags string, separated with colons (string or nil).
678 678
679The function result will be used as headline text." 679The function result will be used as headline text."
680 :group 'org-export-odt 680 :group 'org-export-odt
@@ -852,11 +852,11 @@ ON-OR-OFF := t | nil
852For example, with the following configuration 852For example, with the following configuration
853 853
854\(setq org-odt-table-styles 854\(setq org-odt-table-styles
855 '\(\(\"TableWithHeaderRowsAndColumns\" \"Custom\" 855 '((\"TableWithHeaderRowsAndColumns\" \"Custom\"
856 \(\(use-first-row-styles . t\) 856 ((use-first-row-styles . t)
857 \(use-first-column-styles . t\)\)\) 857 (use-first-column-styles . t)))
858 \(\"TableWithHeaderColumns\" \"Custom\" 858 (\"TableWithHeaderColumns\" \"Custom\"
859 \(\(use-first-column-styles . t\)\)\)\)\) 859 ((use-first-column-styles . t)))))
860 860
8611. A table associated with \"TableWithHeaderRowsAndColumns\" 8611. A table associated with \"TableWithHeaderRowsAndColumns\"
862 style will use the following table-cell styles - 862 style will use the following table-cell styles -
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 08762fbbfdd..52d925adbf9 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -69,12 +69,12 @@ CDR of each element is in one of the following forms:
69 alternating keys and values, specifying parameters for the 69 alternating keys and values, specifying parameters for the
70 publishing process. 70 publishing process.
71 71
72 \(:property value :property value ... ) 72 (:property value :property value ... )
73 73
742. A meta-project definition, specifying of a list of 742. A meta-project definition, specifying of a list of
75 sub-projects: 75 sub-projects:
76 76
77 \(:components (\"project-1\" \"project-2\" ...)) 77 (:components (\"project-1\" \"project-2\" ...))
78 78
79When the CDR of an element of org-publish-project-alist is in 79When the CDR of an element of org-publish-project-alist is in
80this second form, the elements of the list after `:components' 80this second form, the elements of the list after `:components'
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index d5e650afb79..5130329d4b4 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -137,9 +137,9 @@ If nil it will default to `buffer-file-coding-system'."
137If #+TEXINFO_CLASS is set in the buffer, use its value and the 137If #+TEXINFO_CLASS is set in the buffer, use its value and the
138associated information. Here is the structure of each cell: 138associated information. Here is the structure of each cell:
139 139
140 \(class-name 140 (class-name
141 header-string 141 header-string
142 \(numbered-section . unnumbered-section) 142 (numbered-section . unnumbered-section)
143 ...) 143 ...)
144 144
145 145
@@ -210,14 +210,14 @@ order to reproduce the default set-up:
210 210
211\(defun org-texinfo-format-headline (todo todo-type priority text tags) 211\(defun org-texinfo-format-headline (todo todo-type priority text tags)
212 \"Default format function for a headline.\" 212 \"Default format function for a headline.\"
213 \(concat (when todo 213 (concat (when todo
214 \(format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo)) 214 (format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo))
215 \(when priority 215 (when priority
216 \(format \"\\\\framebox{\\\\#%c} \" priority)) 216 (format \"\\\\framebox{\\\\#%c} \" priority))
217 text 217 text
218 \(when tags 218 (when tags
219 \(format \"\\\\hfill{}\\\\textsc{%s}\" 219 (format \"\\\\hfill{}\\\\textsc{%s}\"
220 \(mapconcat \\='identity tags \":\"))))" 220 (mapconcat \\='identity tags \":\"))))"
221 :group 'org-export-texinfo 221 :group 'org-export-texinfo
222 :type 'function) 222 :type 'function)
223 223
@@ -337,18 +337,18 @@ The function should return the string to be exported.
337For example, the variable could be set to the following function 337For example, the variable could be set to the following function
338in order to mimic default behavior: 338in order to mimic default behavior:
339 339
340\(defun org-texinfo-format-inlinetask \(todo type priority name tags contents\) 340\(defun org-texinfo-format-inlinetask (todo type priority name tags contents)
341\"Format an inline task element for Texinfo export.\" 341\"Format an inline task element for Texinfo export.\"
342 \(let ((full-title 342 (let ((full-title
343 \(concat 343 (concat
344 \(when todo 344 (when todo
345 \(format \"@strong{%s} \" todo)) 345 (format \"@strong{%s} \" todo))
346 \(when priority (format \"#%c \" priority)) 346 (when priority (format \"#%c \" priority))
347 title 347 title
348 \(when tags 348 (when tags
349 \(format \":%s:\" 349 (format \":%s:\"
350 \(mapconcat \\='identity tags \":\"))))) 350 (mapconcat \\='identity tags \":\")))))
351 \(format (concat \"@center %s\n\n\" 351 (format (concat \"@center %s\n\n\"
352 \"%s\" 352 \"%s\"
353 \"\n\")) 353 \"\n\"))
354 full-title contents))" 354 full-title contents))"
@@ -1578,7 +1578,7 @@ none."
1578 (re-search-forward "requires a sectioning" nil t)) 1578 (re-search-forward "requires a sectioning" nil t))
1579 (setq errors (concat errors " [invalid section command]"))) 1579 (setq errors (concat errors " [invalid section command]")))
1580 (when (save-excursion 1580 (when (save-excursion
1581 (re-search-forward "\\[unexpected\]" nil t)) 1581 (re-search-forward "\\[unexpected\ ]" nil t))
1582 (setq errors (concat errors " [unexpected error]"))) 1582 (setq errors (concat errors " [unexpected error]")))
1583 (when (save-excursion 1583 (when (save-excursion
1584 (re-search-forward "misplaced " nil t)) 1584 (re-search-forward "misplaced " nil t))
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 3493b837cec..2fa03866281 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -849,7 +849,7 @@ output is restricted to body only, \"s\" when it is restricted to
849the current subtree, \"v\" when only visible elements are 849the current subtree, \"v\" when only visible elements are
850considered for export, \"f\" when publishing functions should be 850considered for export, \"f\" when publishing functions should be
851passed the FORCE argument and \"a\" when the export should be 851passed the FORCE argument and \"a\" when the export should be
852asynchronous). Also, \[?] allows to switch back to standard 852asynchronous). Also, [?] allows to switch back to standard
853mode." 853mode."
854 :group 'org-export-general 854 :group 'org-export-general
855 :version "24.4" 855 :version "24.4"
@@ -1095,19 +1095,19 @@ keywords are understood:
1095 or 1095 or
1096 1096
1097 (?l \"Export to LaTeX\" 1097 (?l \"Export to LaTeX\"
1098 \(?p \"As PDF file\" org-latex-export-to-pdf) 1098 (?p \"As PDF file\" org-latex-export-to-pdf)
1099 \(?o \"As PDF file and open\" 1099 (?o \"As PDF file and open\"
1100 \(lambda (a s v b) 1100 (lambda (a s v b)
1101 \(if a (org-latex-export-to-pdf t s v b) 1101 (if a (org-latex-export-to-pdf t s v b)
1102 \(org-open-file 1102 (org-open-file
1103 \(org-latex-export-to-pdf nil s v b))))))) 1103 (org-latex-export-to-pdf nil s v b)))))))
1104 1104
1105 or the following, which will be added to the previous 1105 or the following, which will be added to the previous
1106 sub-menu, 1106 sub-menu,
1107 1107
1108 (?l 1 1108 (?l 1
1109 \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) 1109 ((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex)
1110 \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) 1110 (?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf)))
1111 1111
1112 :options-alist 1112 :options-alist
1113 1113
@@ -1180,12 +1180,12 @@ keywords are understood:
1180As an example, here is how one could define \"my-latex\" back-end 1180As an example, here is how one could define \"my-latex\" back-end
1181as a variant of `latex' back-end with a custom template function: 1181as a variant of `latex' back-end with a custom template function:
1182 1182
1183 \(org-export-define-derived-backend \\='my-latex \\='latex 1183 (org-export-define-derived-backend \\='my-latex \\='latex
1184 :translate-alist \\='((template . my-latex-template-fun))) 1184 :translate-alist \\='((template . my-latex-template-fun)))
1185 1185
1186The back-end could then be called with, for example: 1186The back-end could then be called with, for example:
1187 1187
1188 \(org-export-to-buffer \\='my-latex \"*Test my-latex*\")" 1188 (org-export-to-buffer \\='my-latex \"*Test my-latex*\")"
1189 (declare (indent 2)) 1189 (declare (indent 2))
1190 (let (blocks filters menu-entry options transcoders contents) 1190 (let (blocks filters menu-entry options transcoders contents)
1191 (while (keywordp (car body)) 1191 (while (keywordp (car body))
@@ -1962,7 +1962,7 @@ DATA is the parse tree. OPTIONS is the plist holding export
1962options. 1962options.
1963 1963
1964Return an alist whose key is a headline and value is its 1964Return an alist whose key is a headline and value is its
1965associated numbering \(in the shape of a list of numbers\) or nil 1965associated numbering \(in the shape of a list of numbers) or nil
1966for a footnotes section." 1966for a footnotes section."
1967 (let ((numbering (make-vector org-export-max-depth 0))) 1967 (let ((numbering (make-vector org-export-max-depth 0)))
1968 (org-element-map data 'headline 1968 (org-element-map data 'headline
@@ -3314,7 +3314,7 @@ lines, include only those lines.
3314Optional argument IND, when non-nil, is an integer specifying the 3314Optional argument IND, when non-nil, is an integer specifying the
3315global indentation of returned contents. Since its purpose is to 3315global indentation of returned contents. Since its purpose is to
3316allow an included file to stay in the same environment it was 3316allow an included file to stay in the same environment it was
3317created \(i.e. a list item), it doesn't apply past the first 3317created \(i.e., a list item), it doesn't apply past the first
3318headline encountered. 3318headline encountered.
3319 3319
3320Optional argument MINLEVEL, when non-nil, is an integer 3320Optional argument MINLEVEL, when non-nil, is an integer
@@ -3893,7 +3893,7 @@ PATH is the link path. DESC is its description."
3893Optional argument is a set of RULES defining inline images. It 3893Optional argument is a set of RULES defining inline images. It
3894is an alist where associations have the following shape: 3894is an alist where associations have the following shape:
3895 3895
3896 \(TYPE . REGEXP) 3896 (TYPE . REGEXP)
3897 3897
3898Applying a rule means apply REGEXP against LINK's path when its 3898Applying a rule means apply REGEXP against LINK's path when its
3899type is TYPE. The function will return a non-nil value if any of 3899type is TYPE. The function will return a non-nil value if any of
@@ -3952,7 +3952,7 @@ Return value can be an object, an element, or nil:
3952- If LINK path matches a target object (i.e. <<path>>) return it. 3952- If LINK path matches a target object (i.e. <<path>>) return it.
3953 3953
3954- If LINK path exactly matches the name affiliated keyword 3954- If LINK path exactly matches the name affiliated keyword
3955 \(i.e. #+NAME: path) of an element, return that element. 3955 (i.e. #+NAME: path) of an element, return that element.
3956 3956
3957- If LINK path exactly matches any headline name, return that 3957- If LINK path exactly matches any headline name, return that
3958 element. If more than one headline share that name, priority 3958 element. If more than one headline share that name, priority
@@ -5586,10 +5586,10 @@ no argument. It is always called within the current process,
5586from BUFFER, with point at its beginning. Export back-ends can 5586from BUFFER, with point at its beginning. Export back-ends can
5587use it to set a major mode there, e.g, 5587use it to set a major mode there, e.g,
5588 5588
5589 \(defun org-latex-export-as-latex 5589 (defun org-latex-export-as-latex
5590 \(&optional async subtreep visible-only body-only ext-plist) 5590 (&optional async subtreep visible-only body-only ext-plist)
5591 \(interactive) 5591 (interactive)
5592 \(org-export-to-buffer \\='latex \"*Org LATEX Export*\" 5592 (org-export-to-buffer \\='latex \"*Org LATEX Export*\"
5593 async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode)))) 5593 async subtreep visible-only body-only ext-plist (lambda () (LaTeX-mode))))
5594 5594
5595This function returns BUFFER." 5595This function returns BUFFER."
@@ -5646,13 +5646,13 @@ argument and happens asynchronously when ASYNC is non-nil. It
5646has to return a file name, or nil. Export back-ends can use this 5646has to return a file name, or nil. Export back-ends can use this
5647to send the output file through additional processing, e.g, 5647to send the output file through additional processing, e.g,
5648 5648
5649 \(defun org-latex-export-to-latex 5649 (defun org-latex-export-to-latex
5650 \(&optional async subtreep visible-only body-only ext-plist) 5650 (&optional async subtreep visible-only body-only ext-plist)
5651 \(interactive) 5651 (interactive)
5652 \(let ((outfile (org-export-output-file-name \".tex\" subtreep))) 5652 (let ((outfile (org-export-output-file-name \".tex\" subtreep)))
5653 \(org-export-to-file \\='latex outfile 5653 (org-export-to-file \\='latex outfile
5654 async subtreep visible-only body-only ext-plist 5654 async subtreep visible-only body-only ext-plist
5655 \(lambda (file) (org-latex-compile file))) 5655 (lambda (file) (org-latex-compile file)))
5656 5656
5657The function returns either a file name returned by POST-PROCESS, 5657The function returns either a file name returned by POST-PROCESS,
5658or FILE." 5658or FILE."
@@ -5985,7 +5985,7 @@ is nil when this menu hasn't been selected yet.
5985 5985
5986EXPERTP, when non-nil, triggers expert UI. In that case, no help 5986EXPERTP, when non-nil, triggers expert UI. In that case, no help
5987buffer is provided, but indications about currently active 5987buffer is provided, but indications about currently active
5988options are given in the prompt. Moreover, \[?] allows to switch 5988options are given in the prompt. Moreover, [?] allows to switch
5989back to standard interface." 5989back to standard interface."
5990 (let* ((fontify-key 5990 (let* ((fontify-key
5991 (lambda (key &optional access-key) 5991 (lambda (key &optional access-key)
@@ -6037,8 +6037,8 @@ back to standard interface."
6037 (concat 6037 (concat
6038 ;; Options are hard-coded. 6038 ;; Options are hard-coded.
6039 (format "[%s] Body only: %s [%s] Visible only: %s 6039 (format "[%s] Body only: %s [%s] Visible only: %s
6040\[%s] Export scope: %s [%s] Force publishing: %s 6040[%s] Export scope: %s [%s] Force publishing: %s
6041\[%s] Async export: %s\n\n" 6041[%s] Async export: %s\n\n"
6042 (funcall fontify-key "C-b" t) 6042 (funcall fontify-key "C-b" t)
6043 (funcall fontify-value 6043 (funcall fontify-value
6044 (if (memq 'body options) "On " "Off")) 6044 (if (memq 'body options) "On " "Off"))
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 3da7267ca8e..3c9d87fa81e 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -989,7 +989,7 @@ Otherwise call the Doctor to parse preceding sentence."
989Put dialogue in buffer." 989Put dialogue in buffer."
990 (let (a 990 (let (a
991 (prompt (concat (doctor-make-string x) 991 (prompt (concat (doctor-make-string x)
992 " what \? ")) 992 " what ? "))
993 retval) 993 retval)
994 (while (not retval) 994 (while (not retval)
995 (while (not a) 995 (while (not a)
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index 2c68c40d893..a07a24d5195 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -324,7 +324,7 @@ This value is simply the outline heading level of the current line."
324(defun gametree-hack-file-layout () 324(defun gametree-hack-file-layout ()
325 (save-excursion 325 (save-excursion
326 (goto-char (point-min)) 326 (goto-char (point-min))
327 (if (looking-at "[^\n]*-\*-[^\n]*gametree-local-layout: \\([^;\n]*\\);") 327 (if (looking-at "[^\n]*-*-[^\n]*gametree-local-layout: \\([^;\n]*\\);")
328 (progn 328 (progn
329 (goto-char (match-beginning 1)) 329 (goto-char (match-beginning 1))
330 (delete-region (point) (match-end 1)) 330 (delete-region (point) (match-end 1))
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 452f3b99742..529b691ee79 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -2682,7 +2682,7 @@ if INITIAL-POS is non-nil, moves point to INITIAL-POS before calculation."
2682 ;; "then" has to be included in the case of "select...then abort" 2682 ;; "then" has to be included in the case of "select...then abort"
2683 ;; statements, since (goto-stmt-start) at the beginning of 2683 ;; statements, since (goto-stmt-start) at the beginning of
2684 ;; the current function would leave the cursor on that position 2684 ;; the current function would leave the cursor on that position
2685 ((looking-at "\\(\\(els\\)?if\\>\\)\\|then abort\\\>") 2685 ((looking-at "\\(\\(els\\)?if\\>\\)\\|then abort\\>")
2686 (ada-get-indent-if orgpoint)) 2686 (ada-get-indent-if orgpoint))
2687 ;; 2687 ;;
2688 ((looking-at "case\\>") 2688 ((looking-at "case\\>")
@@ -5290,7 +5290,7 @@ for `ada-procedure-start-regexp'."
5290 (setq functype (buffer-substring (point) 5290 (setq functype (buffer-substring (point)
5291 (progn 5291 (progn
5292 (skip-chars-forward 5292 (skip-chars-forward
5293 "a-zA-Z0-9_\.") 5293 "a-zA-Z0-9_.")
5294 (point)))))) 5294 (point))))))
5295 ;; look for next non WS 5295 ;; look for next non WS
5296 (cond 5296 (cond
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 816de12cbdb..0ea33c16878 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -420,7 +420,7 @@ As a special case, ${current} is replaced with the name of the current
420file, minus extension but with directory, and ${full_current} is 420file, minus extension but with directory, and ${full_current} is
421replaced by the name including the extension." 421replaced by the name including the extension."
422 422
423 (while (string-match "\\(-[^-\$IO]*[IO]\\)?\${\\([^}]+\\)}" cmd-string) 423 (while (string-match "\\(-[^-$IO]*[IO]\\)?${\\([^}]+\\)}" cmd-string)
424 (let (value 424 (let (value
425 (name (match-string 2 cmd-string))) 425 (name (match-string 2 cmd-string)))
426 (cond 426 (cond
@@ -1724,7 +1724,7 @@ Information is extracted from the ali file."
1724 (concat "^" (ada-line-of identlist) 1724 (concat "^" (ada-line-of identlist)
1725 "." (ada-column-of identlist) 1725 "." (ada-column-of identlist)
1726 "[ *]" (ada-name-of identlist) 1726 "[ *]" (ada-name-of identlist)
1727 "[{\[\(<= ]?\\(.*\\)$") bound t)) 1727 "[{[(<= ]?\\(.*\\)$") bound t))
1728 (if declaration-found 1728 (if declaration-found
1729 (ada-set-on-declaration identlist t)) 1729 (ada-set-on-declaration identlist t))
1730 )) 1730 ))
@@ -1756,7 +1756,7 @@ Information is extracted from the ali file."
1756 (concat 1756 (concat
1757 "^[0-9]+.[0-9]+[ *]" 1757 "^[0-9]+.[0-9]+[ *]"
1758 (ada-name-of identlist) 1758 (ada-name-of identlist)
1759 "[ <{=\(\[]\\(.\\|\n\\.\\)*\\<" 1759 "[ <{=([]\\(.\\|\n\\.\\)*\\<"
1760 (ada-line-of identlist) 1760 (ada-line-of identlist)
1761 "[^0-9]" 1761 "[^0-9]"
1762 (ada-column-of identlist) "\\>") 1762 (ada-column-of identlist) "\\>")
@@ -1779,7 +1779,7 @@ Information is extracted from the ali file."
1779 (forward-line -1) 1779 (forward-line -1)
1780 (beginning-of-line)) 1780 (beginning-of-line))
1781 (unless (looking-at (concat "[0-9]+.[0-9]+[ *]" 1781 (unless (looking-at (concat "[0-9]+.[0-9]+[ *]"
1782 (ada-name-of identlist) "[ <{=\(\[]")) 1782 (ada-name-of identlist) "[ <{=([]"))
1783 (setq declaration-found nil)))) 1783 (setq declaration-found nil))))
1784 1784
1785 ;; Still no success ! The ali file must be too old, and we need to 1785 ;; Still no success ! The ali file must be too old, and we need to
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 2d9bd487bb9..9cac400c27b 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -225,7 +225,7 @@ variable list\" near the end of the file, see
225 (c++-mode "C++" "\"Cpp\"" "Cpp")) 225 (c++-mode "C++" "\"Cpp\"" "Cpp"))
226 "List of ANTLR's supported languages. 226 "List of ANTLR's supported languages.
227Each element in this list looks like 227Each element in this list looks like
228 \(MAJOR-MODE MODELINE-STRING OPTION-VALUE...) 228 (MAJOR-MODE MODELINE-STRING OPTION-VALUE...)
229 229
230MAJOR-MODE, the major mode of the code in the grammar's actions, is the 230MAJOR-MODE, the major mode of the code in the grammar's actions, is the
231value of `antlr-language' if the first group in the string matched by 231value of `antlr-language' if the first group in the string matched by
@@ -243,7 +243,7 @@ also displayed in the mode line next to \"Antlr\"."
243(defcustom antlr-language-limit-n-regexp 243(defcustom antlr-language-limit-n-regexp
244 '(8192 . "language[ \t]*=[ \t]*\\(\"?[A-Z][A-Za-z_]*\"?\\)") 244 '(8192 . "language[ \t]*=[ \t]*\\(\"?[A-Z][A-Za-z_]*\"?\\)")
245 "Used to set a reasonable value for `antlr-language'. 245 "Used to set a reasonable value for `antlr-language'.
246Looks like \(LIMIT \. REGEXP). Search for REGEXP from the beginning of 246Looks like \(LIMIT . REGEXP). Search for REGEXP from the beginning of
247the buffer to LIMIT and use the first group in the matched string to set 247the buffer to LIMIT and use the first group in the matched string to set
248the language according to `antlr-language-alist'." 248the language according to `antlr-language-alist'."
249 :group 'antlr 249 :group 'antlr
@@ -620,7 +620,7 @@ COUNT starts with 1. GEN-SEP is used to separate long variable values."
620 (c++-mode ("%sTokenTypes.hpp") ("%s.cpp" "%s.hpp"))) 620 (c++-mode ("%sTokenTypes.hpp") ("%s.cpp" "%s.hpp")))
621 "Language dependent formats which specify generated files. 621 "Language dependent formats which specify generated files.
622Each element in this list looks looks like 622Each element in this list looks looks like
623 \(MAJOR-MODE (VOCAB-FILE-FORMAT...) (CLASS-FILE-FORMAT...)). 623 (MAJOR-MODE (VOCAB-FILE-FORMAT...) (CLASS-FILE-FORMAT...)).
624 624
625The element whose MAJOR-MODE is equal to `antlr-language' is used to 625The element whose MAJOR-MODE is equal to `antlr-language' is used to
626specify the generated files which are language dependent. See variable 626specify the generated files which are language dependent. See variable
@@ -779,7 +779,7 @@ fontification, see `antlr-font-lock-keywords-alist'.
779 779
780While calculating the decoration level for actions, `major-mode' is 780While calculating the decoration level for actions, `major-mode' is
781bound to `antlr-language'. For example, with value 781bound to `antlr-language'. For example, with value
782 \((java-mode \. 2) (c++-mode \. 0)) 782 ((java-mode . 2) (c++-mode . 0))
783Java actions are fontified with level 2 and C++ actions are not 783Java actions are fontified with level 2 and C++ actions are not
784fontified at all." 784fontified at all."
785 :group 'antlr 785 :group 'antlr
@@ -817,7 +817,7 @@ Do not change the value of this constant.")
817 c++-font-lock-keywords-3)) 817 c++-font-lock-keywords-3))
818 "List of font-lock keywords for actions in the grammar. 818 "List of font-lock keywords for actions in the grammar.
819Each element in this list looks like 819Each element in this list looks like
820 \(MAJOR-MODE KEYWORD...) 820 (MAJOR-MODE KEYWORD...)
821 821
822If `antlr-language' is equal to MAJOR-MODE, the KEYWORDs are the 822If `antlr-language' is equal to MAJOR-MODE, the KEYWORDs are the
823font-lock keywords according to `font-lock-defaults' used for the code 823font-lock keywords according to `font-lock-defaults' used for the code
@@ -1570,8 +1570,8 @@ Inserting an option with this command works as follows:
1570 4. Ask user for confirmation if the given OPTION does not seem to be a 1570 4. Ask user for confirmation if the given OPTION does not seem to be a
1571 valid option to insert into the current file. 1571 valid option to insert into the current file.
1572 5. Find a correct position to insert the option. 1572 5. Find a correct position to insert the option.
1573 6. Depending on the option, insert it the following way \(inserting an 1573 6. Depending on the option, insert it the following way (inserting an
1574 option also means inserting the option section if necessary\): 1574 option also means inserting the option section if necessary):
1575 - Insert the option and let user insert the value at point. 1575 - Insert the option and let user insert the value at point.
1576 - Read a value (with completion) from the minibuffer, using a 1576 - Read a value (with completion) from the minibuffer, using a
1577 previous value as initial contents, and insert option with value. 1577 previous value as initial contents, and insert option with value.
@@ -1687,9 +1687,9 @@ Return \(LEVEL OPTION LOCATION)."
1687(defun antlr-option-kind (requested) 1687(defun antlr-option-kind (requested)
1688 "Return level and location for option to insert near point. 1688 "Return level and location for option to insert near point.
1689Call function `antlr-option-level' with argument REQUESTED. If the 1689Call function `antlr-option-level' with argument REQUESTED. If the
1690result is nil, return \(REQUESTED \. error). If the result has the 1690result is nil, return \(REQUESTED . error). If the result has the
1691non-nil value LEVEL, return \(LEVEL \. LOCATION) where LOCATION looks 1691non-nil value LEVEL, return \(LEVEL . LOCATION) where LOCATION looks
1692like \(AREA \. PLACE), see `antlr-option-location'." 1692like \(AREA . PLACE), see `antlr-option-location'."
1693 (save-excursion 1693 (save-excursion
1694 (save-restriction 1694 (save-restriction
1695 (let ((min0 (point-min)) ; before `widen'! 1695 (let ((min0 (point-min)) ; before `widen'!
@@ -1845,7 +1845,7 @@ WARNING: this may alter `match-data'."
1845(defun antlr-insert-option-do (level option old area pos) 1845(defun antlr-insert-option-do (level option old area pos)
1846 "Insert option into buffer at position POS. 1846 "Insert option into buffer at position POS.
1847Insert option of level LEVEL and name OPTION. If OLD is non-nil, an 1847Insert option of level LEVEL and name OPTION. If OLD is non-nil, an
1848options area is already exists. If OLD looks like \(BEG \. END), the 1848options area is already exists. If OLD looks like \(BEG . END), the
1849option already exists. Then, BEG is the start position of the option 1849option already exists. Then, BEG is the start position of the option
1850value, the position of the `=' or nil, and END is the end position of 1850value, the position of the `=' or nil, and END is the end position of
1851the option value or nil. 1851the option value or nil.
@@ -2104,7 +2104,7 @@ Called in PHASE `before-input', see `antlr-options-alists'."
2104 2104
2105(defun antlr-file-dependencies () 2105(defun antlr-file-dependencies ()
2106 "Return dependencies for grammar in current buffer. 2106 "Return dependencies for grammar in current buffer.
2107The result looks like \(FILE \(CLASSES \. SUPERS) VOCABS \. LANGUAGE) 2107The result looks like \(FILE \(CLASSES . SUPERS) VOCABS . LANGUAGE)
2108 where CLASSES = ((CLASS . CLASS-EVOCAB) ...), 2108 where CLASSES = ((CLASS . CLASS-EVOCAB) ...),
2109 SUPERS = ((SUPER . USE-EVOCAB-P) ...), and 2109 SUPERS = ((SUPER . USE-EVOCAB-P) ...), and
2110 VOCABS = ((EVOCAB ...) . (IVOCAB ...)) 2110 VOCABS = ((EVOCAB ...) . (IVOCAB ...))
@@ -2168,8 +2168,8 @@ its export vocabulary is used as an import vocabulary."
2168 2168
2169(defun antlr-directory-dependencies (dirname) 2169(defun antlr-directory-dependencies (dirname)
2170 "Return dependencies for all grammar files in directory DIRNAME. 2170 "Return dependencies for all grammar files in directory DIRNAME.
2171The result looks like \((CLASS-SPEC ...) \. \(FILE-DEP ...)) 2171The result looks like \((CLASS-SPEC ...) . \(FILE-DEP ...))
2172 where CLASS-SPEC = (CLASS (FILE \. EVOCAB) ...). 2172 where CLASS-SPEC = (CLASS (FILE . EVOCAB) ...).
2173 2173
2174FILE-DEP are the dependencies for each grammar file in DIRNAME, see 2174FILE-DEP are the dependencies for each grammar file in DIRNAME, see
2175`antlr-file-dependencies'. For each grammar class CLASS, FILE is a 2175`antlr-file-dependencies'. For each grammar class CLASS, FILE is a
@@ -2220,7 +2220,7 @@ The result looks like \(OPTION WITH-UNKNOWN GLIB ...). OPTION is the
2220complete \"-glib\" option. WITH-UNKNOWN is t if there is none or more 2220complete \"-glib\" option. WITH-UNKNOWN is t if there is none or more
2221than one grammar file for at least one super grammar. 2221than one grammar file for at least one super grammar.
2222 2222
2223Each GLIB looks like \(GRAMMAR-FILE \. EVOCAB). GRAMMAR-FILE is a file 2223Each GLIB looks like \(GRAMMAR-FILE . EVOCAB). GRAMMAR-FILE is a file
2224in which a super-grammar is defined. EVOCAB is the value of the export 2224in which a super-grammar is defined. EVOCAB is the value of the export
2225vocabulary of the super-grammar or nil if it is not needed." 2225vocabulary of the super-grammar or nil if it is not needed."
2226 ;; If the superclass is defined in the same file, that file will be included 2226 ;; If the superclass is defined in the same file, that file will be included
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index b0c4a6425bf..1e3cb8e16f9 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -1075,7 +1075,7 @@ Works with: brace-list-entry, brace-entry-open, statement,
1075arglist-cont." 1075arglist-cont."
1076 (save-excursion 1076 (save-excursion
1077 (goto-char (c-langelem-pos langelem)) 1077 (goto-char (c-langelem-pos langelem))
1078 (when (looking-at "\\s\(") 1078 (when (looking-at "\\s(")
1079 (if (c-go-up-list-backward) 1079 (if (c-go-up-list-backward)
1080 (let ((pos (point))) 1080 (let ((pos (point)))
1081 (back-to-indentation) 1081 (back-to-indentation)
@@ -1093,24 +1093,24 @@ v beg of preceding constr v beg of preceding constr
1093const char msg[] = if (!running) 1093const char msg[] = if (!running)
1094 \"Some text.\"; error(\"Not running!\"); 1094 \"Some text.\"; error(\"Not running!\");
1095 1095
1096#define X(A, B) \ #define X(A, B) \ 1096#define X(A, B) \\ #define X(A, B) \\
1097do { \ <-> do { \ <- c-lineup-cpp-define 1097do { \\ <-> do { \\ <- c-lineup-cpp-define
1098 printf (A, B); \ printf (A, B); \ 1098 printf (A, B); \\ printf (A, B); \\
1099} while (0) } while (0) 1099} while (0) } while (0)
1100 1100
1101If `c-syntactic-indentation-in-macros' is non-nil, the function 1101If `c-syntactic-indentation-in-macros' is non-nil, the function
1102returns the relative indentation to the macro start line to allow 1102returns the relative indentation to the macro start line to allow
1103accumulation with other offsets. E.g. in the following cases, 1103accumulation with other offsets. E.g. in the following cases,
1104cpp-define-intro is combined with the statement-block-intro that comes 1104cpp-define-intro is combined with the statement-block-intro that comes
1105from the \"do {\" that hangs on the \"#define\" line: 1105from the `do {' that hangs on the `#define' line:
1106 1106
1107 int dribble() { 1107 int dribble() {
1108const char msg[] = if (!running) 1108const char msg[] = if (!running)
1109 \"Some text.\"; error(\"Not running!\"); 1109 \"Some text.\"; error(\"Not running!\");
1110 1110
1111#define X(A, B) do { \ #define X(A, B) do { \ 1111#define X(A, B) do { \\ #define X(A, B) do { \\
1112 printf (A, B); \ <-> printf (A, B); \ <- c-lineup-cpp-define 1112 printf (A, B); \\ <-> printf (A, B); \\ <- c-lineup-cpp-define
1113 this->refs++; \ this->refs++; \ 1113 this->refs++; \\ this->refs++; \\
1114} while (0) <-> } while (0) <- c-lineup-cpp-define 1114} while (0) <-> } while (0) <- c-lineup-cpp-define
1115 1115
1116The relative indentation returned by `c-lineup-cpp-define' is zero and 1116The relative indentation returned by `c-lineup-cpp-define' is zero and
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 337fdc800b1..077a18cc597 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -215,7 +215,7 @@
215(defconst c-awk-neutrals*-re 215(defconst c-awk-neutrals*-re
216 (concat "\\(" c-awk-neutral-re "\\)*")) 216 (concat "\\(" c-awk-neutral-re "\\)*"))
217;; A (possibly empty) string of neutral characters (or character pairs). 217;; A (possibly empty) string of neutral characters (or character pairs).
218(defconst c-awk-var-num-ket-re "[]\)0-9a-zA-Z_$.\x80-\xff]+") 218(defconst c-awk-var-num-ket-re "[])0-9a-zA-Z_$.\x80-\xff]+")
219;; Matches a char which is a constituent of a variable or number, or a ket 219;; Matches a char which is a constituent of a variable or number, or a ket
220;; (i.e. closing bracKET), round or square. Assume that all characters \x80 to 220;; (i.e. closing bracKET), round or square. Assume that all characters \x80 to
221;; \xff are "letters". 221;; \xff are "letters".
@@ -227,7 +227,7 @@
227;; will only work when there won't be a preceding " or / before the sought / 227;; will only work when there won't be a preceding " or / before the sought /
228;; to foul things up. 228;; to foul things up.
229(defconst c-awk-non-arith-op-bra-re 229(defconst c-awk-non-arith-op-bra-re
230 "[[\({&=:!><,?;'~|]") 230 "[[({&=:!><,?;'~|]")
231;; Matches an opening BRAcket (of any sort), or any operator character 231;; Matches an opening BRAcket (of any sort), or any operator character
232;; apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a 232;; apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a
233;; regexp bracket) these arith ops are unnecessary and a pain, because of "++" 233;; regexp bracket) these arith ops are unnecessary and a pain, because of "++"
@@ -266,7 +266,7 @@
266;; Matches optional whitespace followed by a "/" with string syntax (a matched 266;; Matches optional whitespace followed by a "/" with string syntax (a matched
267;; regexp delimiter). 267;; regexp delimiter).
268(defconst c-awk-space*-unclosed-regexp-/-re 268(defconst c-awk-space*-unclosed-regexp-/-re
269 (concat c-awk-escaped-nls*-with-space* "\\s\|")) 269 (concat c-awk-escaped-nls*-with-space* "\\s|"))
270;; Matches optional whitespace followed by a "/" with string fence syntax (an 270;; Matches optional whitespace followed by a "/" with string fence syntax (an
271;; unmatched regexp delimiter). 271;; unmatched regexp delimiter).
272 272
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 0e249bd4212..32ce8c6a249 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -428,7 +428,7 @@ the function `delete-forward-p' is defined and returns non-nil, it
428deletes forward. Otherwise it deletes backward. 428deletes forward. Otherwise it deletes backward.
429 429
430Note: This is the way in XEmacs to choose the correct action for the 430Note: This is the way in XEmacs to choose the correct action for the
431\[delete] key, whichever key that means. Other flavors don't use this 431[delete] key, whichever key that means. Other flavors don't use this
432function to control that." 432function to control that."
433 (interactive "*P") 433 (interactive "*P")
434 (if (and (fboundp 'delete-forward-p) 434 (if (and (fboundp 'delete-forward-p)
@@ -445,7 +445,7 @@ forward using `c-hungry-delete-forward'. Otherwise it deletes
445backward using `c-hungry-backspace'. 445backward using `c-hungry-backspace'.
446 446
447Note: This is the way in XEmacs to choose the correct action for the 447Note: This is the way in XEmacs to choose the correct action for the
448\[delete] key, whichever key that means. Other flavors don't use this 448[delete] key, whichever key that means. Other flavors don't use this
449function to control that." 449function to control that."
450 (interactive) 450 (interactive)
451 (if (and (fboundp 'delete-forward-p) 451 (if (and (fboundp 'delete-forward-p)
@@ -1143,9 +1143,9 @@ numeric argument is supplied, or the point is inside a literal."
1143 (eq (char-before) ?<)) 1143 (eq (char-before) ?<))
1144 (progn 1144 (progn
1145 (backward-char) 1145 (backward-char)
1146 (looking-at "\\s\(")))) 1146 (looking-at "\\s("))))
1147 (and (eq (char-after) ?<) 1147 (and (eq (char-after) ?<)
1148 (not (looking-at "\\s\(")) 1148 (not (looking-at "\\s("))
1149 (progn (c-backward-syntactic-ws) 1149 (progn (c-backward-syntactic-ws)
1150 (c-simple-skip-symbol-backward)) 1150 (c-simple-skip-symbol-backward))
1151 (or (looking-at c-opt-<>-sexp-key) 1151 (or (looking-at c-opt-<>-sexp-key)
@@ -1380,13 +1380,13 @@ No indentation or other \"electric\" behavior is performed."
1380 ;; be the return type of a function, or the like. Exclude 1380 ;; be the return type of a function, or the like. Exclude
1381 ;; this case. 1381 ;; this case.
1382 (c-syntactic-re-search-forward 1382 (c-syntactic-re-search-forward
1383 (concat "[;=\(\[{]\\|\\(" 1383 (concat "[;=([{]\\|\\("
1384 c-opt-block-decls-with-vars-key 1384 c-opt-block-decls-with-vars-key
1385 "\\)") 1385 "\\)")
1386 eo-block t t t) 1386 eo-block t t t)
1387 (match-beginning 1) ; Is there a "struct" etc., somewhere? 1387 (match-beginning 1) ; Is there a "struct" etc., somewhere?
1388 (not (eq (char-before) ?_)) 1388 (not (eq (char-before) ?_))
1389 (c-syntactic-re-search-forward "[;=\(\[{]" eo-block t t t) 1389 (c-syntactic-re-search-forward "[;=([{]" eo-block t t t)
1390 (eq (char-before) ?\{) 1390 (eq (char-before) ?\{)
1391 bod))))) 1391 bod)))))
1392 1392
@@ -4455,7 +4455,7 @@ is in situations like the following:
4455 4455
4456char description[] = \"\\ 4456char description[] = \"\\
4457A very long description of something that you want to fill to make 4457A very long description of something that you want to fill to make
4458nicely formatted output.\"\; 4458nicely formatted output.\";
4459 4459
4460If point is in any other situation, i.e. in normal code, do nothing. 4460If point is in any other situation, i.e. in normal code, do nothing.
4461 4461
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 0422ca0b028..6bd58159fce 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -500,10 +500,10 @@ even if the user undoes the command which set them.
500 500
501This macro should ALWAYS be placed around \"temporary\" internal buffer 501This macro should ALWAYS be placed around \"temporary\" internal buffer
502changes \(like adding a newline to calculate a text-property then 502changes \(like adding a newline to calculate a text-property then
503deleting it again\), so that the user never sees them on his 503deleting it again), so that the user never sees them on his
504`buffer-undo-list'. See also `c-tentative-buffer-changes'. 504`buffer-undo-list'. See also `c-tentative-buffer-changes'.
505 505
506However, any user-visible changes to the buffer \(like auto-newlines\) 506However, any user-visible changes to the buffer \(like auto-newlines)
507must not be within a `c-save-buffer-state', since the user then 507must not be within a `c-save-buffer-state', since the user then
508wouldn't be able to undo them. 508wouldn't be able to undo them.
509 509
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 82f0d722d03..6382b145211 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1060,7 +1060,7 @@ comment at the start of cc-engine.el for more info."
1060 (save-excursion 1060 (save-excursion
1061 (c-forward-sexp) (point))) 1061 (c-forward-sexp) (point)))
1062 ;; Just gone back over some paren block? 1062 ;; Just gone back over some paren block?
1063 ((looking-at "\\s\(") 1063 ((looking-at "\\s(")
1064 (save-excursion 1064 (save-excursion
1065 (goto-char (1+ (c-down-list-backward 1065 (goto-char (1+ (c-down-list-backward
1066 before-sws-pos))) 1066 before-sws-pos)))
@@ -1233,7 +1233,7 @@ The variable `c-maybe-labelp' is set to the position of the first `:' that
1233might start a label (i.e. not part of `::' and not preceded by `?'). If a 1233might start a label (i.e. not part of `::' and not preceded by `?'). If a
1234single `?' is found, then `c-maybe-labelp' is cleared. 1234single `?' is found, then `c-maybe-labelp' is cleared.
1235 1235
1236For AWK, a statement which is terminated by an EOL (not a \; or a }) is 1236For AWK, a statement which is terminated by an EOL (not a ; or a }) is
1237regarded as having a \"virtual semicolon\" immediately after the last token on 1237regarded as having a \"virtual semicolon\" immediately after the last token on
1238the line. If this virtual semicolon is _at_ from, the function recognizes it. 1238the line. If this virtual semicolon is _at_ from, the function recognizes it.
1239 1239
@@ -3792,8 +3792,8 @@ comment at the start of cc-engine.el for more info."
3792 3792
3793(defconst c-jump-syntax-balanced 3793(defconst c-jump-syntax-balanced
3794 (if (memq 'gen-string-delim c-emacs-features) 3794 (if (memq 'gen-string-delim c-emacs-features)
3795 "\\w\\|\\s_\\|\\s\(\\|\\s\)\\|\\s\"\\|\\s|" 3795 "\\w\\|\\s_\\|\\s(\\|\\s)\\|\\s\"\\|\\s|"
3796 "\\w\\|\\s_\\|\\s\(\\|\\s\)\\|\\s\"")) 3796 "\\w\\|\\s_\\|\\s(\\|\\s)\\|\\s\""))
3797 3797
3798(defconst c-jump-syntax-unbalanced 3798(defconst c-jump-syntax-unbalanced
3799 (if (memq 'gen-string-delim c-emacs-features) 3799 (if (memq 'gen-string-delim c-emacs-features)
@@ -3960,7 +3960,7 @@ See `c-forward-token-2' for details."
3960tokens like \"==\" as single tokens, i.e. all sequences of symbol 3960tokens like \"==\" as single tokens, i.e. all sequences of symbol
3961characters are jumped over character by character. This function is 3961characters are jumped over character by character. This function is
3962for compatibility only; it's only a wrapper over `c-forward-token-2'." 3962for compatibility only; it's only a wrapper over `c-forward-token-2'."
3963 (let ((c-nonsymbol-token-regexp "\\s.\\|\\s\(\\|\\s\)")) 3963 (let ((c-nonsymbol-token-regexp "\\s."))
3964 (c-forward-token-2 count balanced limit))) 3964 (c-forward-token-2 count balanced limit)))
3965 3965
3966(defun c-backward-token-1 (&optional count balanced limit) 3966(defun c-backward-token-1 (&optional count balanced limit)
@@ -3968,7 +3968,7 @@ for compatibility only; it's only a wrapper over `c-forward-token-2'."
3968tokens like \"==\" as single tokens, i.e. all sequences of symbol 3968tokens like \"==\" as single tokens, i.e. all sequences of symbol
3969characters are jumped over character by character. This function is 3969characters are jumped over character by character. This function is
3970for compatibility only; it's only a wrapper over `c-backward-token-2'." 3970for compatibility only; it's only a wrapper over `c-backward-token-2'."
3971 (let ((c-nonsymbol-token-regexp "\\s.\\|\\s\(\\|\\s\)")) 3971 (let ((c-nonsymbol-token-regexp "\\s."))
3972 (c-backward-token-2 count balanced limit))) 3972 (c-backward-token-2 count balanced limit)))
3973 3973
3974 3974
@@ -7124,7 +7124,7 @@ comment at the start of cc-engine.el for more info."
7124 (setq paren-depth (1- paren-depth)) 7124 (setq paren-depth (1- paren-depth))
7125 (forward-char) 7125 (forward-char)
7126 t) 7126 t)
7127 (when (if (save-match-data (looking-at "\\s\(")) 7127 (when (if (save-match-data (looking-at "\\s("))
7128 (c-safe (c-forward-sexp 1) t) 7128 (c-safe (c-forward-sexp 1) t)
7129 (goto-char (match-end 1)) 7129 (goto-char (match-end 1))
7130 t) 7130 t)
@@ -7198,7 +7198,7 @@ comment at the start of cc-engine.el for more info."
7198 7198
7199 (setq at-decl-end 7199 (setq at-decl-end
7200 (looking-at (cond ((eq context '<>) "[,>]") 7200 (looking-at (cond ((eq context '<>) "[,>]")
7201 (context "[,\)]") 7201 (context "[,)]")
7202 (t "[,;]")))) 7202 (t "[,;]"))))
7203 7203
7204 ;; Now we've collected info about various characteristics of 7204 ;; Now we've collected info about various characteristics of
@@ -7522,7 +7522,7 @@ comment at the start of cc-engine.el for more info."
7522 ;; The closing paren should follow. 7522 ;; The closing paren should follow.
7523 (progn 7523 (progn
7524 (c-forward-syntactic-ws) 7524 (c-forward-syntactic-ws)
7525 (looking-at "\\s\)")) 7525 (looking-at "\\s)"))
7526 7526
7527 ;; There should be a primary expression after it. 7527 ;; There should be a primary expression after it.
7528 (let (pos) 7528 (let (pos)
@@ -7919,7 +7919,7 @@ comment at the start of cc-engine.el for more info."
7919 7919
7920 (catch 'break 7920 (catch 'break
7921 ;; Look for ": superclass-name" or "( category-name )". 7921 ;; Look for ": superclass-name" or "( category-name )".
7922 (when (looking-at "[:\(]") 7922 (when (looking-at "[:(]")
7923 (setq start-char (char-after)) 7923 (setq start-char (char-after))
7924 (forward-char) 7924 (forward-char)
7925 (c-forward-syntactic-ws) 7925 (c-forward-syntactic-ws)
@@ -8434,7 +8434,7 @@ comment at the start of cc-engine.el for more info."
8434 ;; Check for `c-opt-block-decls-with-vars-key' 8434 ;; Check for `c-opt-block-decls-with-vars-key'
8435 ;; before the first paren. 8435 ;; before the first paren.
8436 (c-syntactic-re-search-forward 8436 (c-syntactic-re-search-forward
8437 (concat "[;=\(\[{]\\|\\(" 8437 (concat "[;=([{]\\|\\("
8438 c-opt-block-decls-with-vars-key 8438 c-opt-block-decls-with-vars-key
8439 "\\)") 8439 "\\)")
8440 lim t t t) 8440 lim t t t)
@@ -8442,7 +8442,7 @@ comment at the start of cc-engine.el for more info."
8442 (not (eq (char-before) ?_)) 8442 (not (eq (char-before) ?_))
8443 ;; Check that the first following paren is 8443 ;; Check that the first following paren is
8444 ;; the block. 8444 ;; the block.
8445 (c-syntactic-re-search-forward "[;=\(\[{]" 8445 (c-syntactic-re-search-forward "[;=([{]"
8446 lim t t t) 8446 lim t t t)
8447 (eq (char-before) ?{))))))) 8447 (eq (char-before) ?{)))))))
8448 ;; The declaration doesn't have any of the 8448 ;; The declaration doesn't have any of the
@@ -8961,7 +8961,7 @@ comment at the start of cc-engine.el for more info."
8961 (> (point) closest-lim)) 8961 (> (point) closest-lim))
8962 (not (bobp)) 8962 (not (bobp))
8963 (progn (backward-char) 8963 (progn (backward-char)
8964 (looking-at "[\]\).]\\|\\w\\|\\s_")) 8964 (looking-at "[]).]\\|\\w\\|\\s_"))
8965 (c-safe (forward-char) 8965 (c-safe (forward-char)
8966 (goto-char (scan-sexps (point) -1)))) 8966 (goto-char (scan-sexps (point) -1))))
8967 8967
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index f05d6a06595..ad112d720d8 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -575,10 +575,10 @@ stuff. Used on level 1 and higher."
575 c-symbol-key) "\\)" 575 c-symbol-key) "\\)"
576 (concat "\\(" ; 2 + ncle + nsws + c-sym-key 576 (concat "\\(" ; 2 + ncle + nsws + c-sym-key
577 ;; Macro with arguments - a "function". 577 ;; Macro with arguments - a "function".
578 "\\(\(\\)" ; 3 + ncle + nsws + c-sym-key 578 "\\((\\)" ; 3 + ncle + nsws + c-sym-key
579 "\\|" 579 "\\|"
580 ;; Macro without arguments - a "variable". 580 ;; Macro without arguments - a "variable".
581 "\\([^\(]\\|$\\)" 581 "\\([^(]\\|$\\)"
582 "\\)")) 582 "\\)"))
583 `((if (match-beginning 583 `((if (match-beginning
584 ,(+ 3 ncle-depth nsws-depth 584 ,(+ 3 ncle-depth nsws-depth
@@ -1082,7 +1082,7 @@ casts and declarations are fontified. Used on level 2 and higher."
1082 1082
1083 ;; Search syntactically to the end of the declarator (";", 1083 ;; Search syntactically to the end of the declarator (";",
1084 ;; ",", a closing paren, eob etc) or to the beginning of an 1084 ;; ",", a closing paren, eob etc) or to the beginning of an
1085 ;; initializer or function prototype ("=" or "\\s\("). 1085 ;; initializer or function prototype ("=" or "\\s(").
1086 ;; Note that square brackets are now not also treated as 1086 ;; Note that square brackets are now not also treated as
1087 ;; initializers, since this broke when there were also 1087 ;; initializers, since this broke when there were also
1088 ;; initializing brace lists. 1088 ;; initializing brace lists.
@@ -1867,7 +1867,7 @@ higher."
1867 "\\)\\>" 1867 "\\)\\>"
1868 ;; Disallow various common punctuation chars that can't come 1868 ;; Disallow various common punctuation chars that can't come
1869 ;; before the '{' of the enum list, to avoid searching too far. 1869 ;; before the '{' of the enum list, to avoid searching too far.
1870 "[^\]\[{}();/#=]*" 1870 "[^][{}();/#=]*"
1871 "{") 1871 "{")
1872 '((c-font-lock-declarators limit t nil) 1872 '((c-font-lock-declarators limit t nil)
1873 (save-match-data 1873 (save-match-data
@@ -2112,7 +2112,7 @@ need for `c-font-lock-extra-types'.")
2112 (unless (looking-at 2112 (unless (looking-at
2113 (cc-eval-when-compile 2113 (cc-eval-when-compile
2114 (concat (c-lang-const c-symbol-start c++) 2114 (concat (c-lang-const c-symbol-start c++)
2115 "\\|[*:\)\[]"))) 2115 "\\|[*:)[]")))
2116 ;; There's something after the would-be type that 2116 ;; There's something after the would-be type that
2117 ;; can't be there, so this is a placement arglist. 2117 ;; can't be there, so this is a placement arglist.
2118 (setq expr1-res nil))) 2118 (setq expr1-res nil)))
@@ -2122,7 +2122,7 @@ need for `c-font-lock-extra-types'.")
2122 (unless (looking-at 2122 (unless (looking-at
2123 (cc-eval-when-compile 2123 (cc-eval-when-compile
2124 (concat (c-lang-const c-symbol-start c++) 2124 (concat (c-lang-const c-symbol-start c++)
2125 "\\|[*:\)\[]"))) 2125 "\\|[*:)[]")))
2126 ;; There's something after the would-be type that can't 2126 ;; There's something after the would-be type that can't
2127 ;; be there, so this is an initialization expression. 2127 ;; be there, so this is an initialization expression.
2128 (setq expr2-res nil)) 2128 (setq expr2-res nil))
@@ -2675,7 +2675,7 @@ need for `pike-font-lock-extra-types'.")
2675 nil) 2675 nil)
2676 2676
2677(defconst autodoc-font-lock-doc-comments 2677(defconst autodoc-font-lock-doc-comments
2678 `(("@\\(\\w+{\\|\\[\\([^\]@\n\r]\\|@@\\)*\\]\\|[@}]\\|$\\)" 2678 `(("@\\(\\w+{\\|\\[\\([^]@\n\r]\\|@@\\)*\\]\\|[@}]\\|$\\)"
2679 ;; In-text markup. 2679 ;; In-text markup.
2680 0 ,c-doc-markup-face-name prepend nil) 2680 0 ,c-doc-markup-face-name prepend nil)
2681 (autodoc-font-lock-line-markup) 2681 (autodoc-font-lock-line-markup)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index dcd51164ce8..7cda5ceaf1d 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -870,7 +870,7 @@ definition, or nil if the language doesn't have any."
870 t (if (c-lang-const c-opt-cpp-macro-define) 870 t (if (c-lang-const c-opt-cpp-macro-define)
871 (concat (c-lang-const c-opt-cpp-prefix) 871 (concat (c-lang-const c-opt-cpp-prefix)
872 (c-lang-const c-opt-cpp-macro-define) 872 (c-lang-const c-opt-cpp-macro-define)
873 "[ \t]+\\(\\(\\sw\\|_\\)+\\)\\(\([^\)]*\)\\)?" 873 "[ \t]+\\(\\(\\sw\\|_\\)+\\)\\(([^)]*)\\)?"
874 ;; ^ ^ #defined name 874 ;; ^ ^ #defined name
875 "\\([ \t]\\|\\\\\n\\)*"))) 875 "\\([ \t]\\|\\\\\n\\)*")))
876(c-lang-defvar c-opt-cpp-macro-define-start 876(c-lang-defvar c-opt-cpp-macro-define-start
@@ -1190,7 +1190,7 @@ operators."
1190 t (c-make-keywords-re nil 1190 t (c-make-keywords-re nil
1191 (c-filter-ops (c-lang-const c-all-op-syntax-tokens) 1191 (c-filter-ops (c-lang-const c-all-op-syntax-tokens)
1192 t 1192 t
1193 "\\`\\(\\s.\\|\\s\(\\|\\s\)\\)+\\'"))) 1193 "\\`\\(\\s.\\)+\\'")))
1194(c-lang-defvar c-nonsymbol-token-regexp 1194(c-lang-defvar c-nonsymbol-token-regexp
1195 (c-lang-const c-nonsymbol-token-regexp)) 1195 (c-lang-const c-nonsymbol-token-regexp))
1196 1196
@@ -1694,7 +1694,7 @@ be a subset of `c-primitive-type-kwds'."
1694 "strong")) 1694 "strong"))
1695 1695
1696(c-lang-defconst c-typedef-kwds 1696(c-lang-defconst c-typedef-kwds
1697 "Prefix keyword\(s\) like \"typedef\" which make a type declaration out 1697 "Prefix keyword(s) like \"typedef\" which make a type declaration out
1698of a variable declaration." 1698of a variable declaration."
1699 t '("typedef") 1699 t '("typedef")
1700 (awk idl java) nil) 1700 (awk idl java) nil)
@@ -2202,7 +2202,7 @@ regexp if `c-colon-type-list-kwds' isn't nil."
2202 ;; before the ":" that starts the inherit list after "class" 2202 ;; before the ":" that starts the inherit list after "class"
2203 ;; or "struct" in C++. (Also used as default for other 2203 ;; or "struct" in C++. (Also used as default for other
2204 ;; languages.) 2204 ;; languages.)
2205 "[^\]\[{}();,/#=:]*:")) 2205 "[^][{}();,/#=:]*:"))
2206(c-lang-defvar c-colon-type-list-re (c-lang-const c-colon-type-list-re)) 2206(c-lang-defvar c-colon-type-list-re (c-lang-const c-colon-type-list-re))
2207 2207
2208(c-lang-defconst c-paren-nontype-kwds 2208(c-lang-defconst c-paren-nontype-kwds
@@ -2366,7 +2366,7 @@ nevertheless contains a list separated with `;' and not `,'."
2366(c-lang-defvar c-opt-asm-stmt-key (c-lang-const c-opt-asm-stmt-key)) 2366(c-lang-defvar c-opt-asm-stmt-key (c-lang-const c-opt-asm-stmt-key))
2367 2367
2368(c-lang-defconst c-case-kwds 2368(c-lang-defconst c-case-kwds
2369 "The keyword\(s) which introduce a \"case\" like construct. 2369 "The keyword(s) which introduce a \"case\" like construct.
2370This construct is \"<keyword> <expression> :\"." 2370This construct is \"<keyword> <expression> :\"."
2371 t '("case") 2371 t '("case")
2372 awk nil) 2372 awk nil)
@@ -2729,25 +2729,25 @@ more info."
2729 ;; more quickly. We match ")" in C for K&R region declarations, and 2729 ;; more quickly. We match ")" in C for K&R region declarations, and
2730 ;; in all languages except Java for when a cpp macro definition 2730 ;; in all languages except Java for when a cpp macro definition
2731 ;; begins with a declaration. 2731 ;; begins with a declaration.
2732 t "\\([\{\}\(\);,]+\\)" 2732 t "\\([{}();,]+\\)"
2733 java "\\([\{\}\(;,<]+\\)" 2733 java "\\([{}(;,<]+\\)"
2734 ;; Match "<" in C++ to get the first argument in a template arglist. 2734 ;; Match "<" in C++ to get the first argument in a template arglist.
2735 ;; In that case there's an additional check in `c-find-decl-spots' 2735 ;; In that case there's an additional check in `c-find-decl-spots'
2736 ;; that it got open paren syntax. Match ":" to aid in picking up 2736 ;; that it got open paren syntax. Match ":" to aid in picking up
2737 ;; "public:", etc. This involves additional checks in 2737 ;; "public:", etc. This involves additional checks in
2738 ;; `c-find-decl-prefix-search' to prevent a match of identifiers 2738 ;; `c-find-decl-prefix-search' to prevent a match of identifiers
2739 ;; or labels. 2739 ;; or labels.
2740 c++ "\\([\{\}\(\);:,<]+\\)" 2740 c++ "\\([{}();:,<]+\\)"
2741 ;; Additionally match the protection directives in Objective-C. 2741 ;; Additionally match the protection directives in Objective-C.
2742 ;; Note that this doesn't cope with the longer directives, which we 2742 ;; Note that this doesn't cope with the longer directives, which we
2743 ;; would have to match from start to end since they don't end with 2743 ;; would have to match from start to end since they don't end with
2744 ;; any easily recognized characters. 2744 ;; any easily recognized characters.
2745 objc (concat "\\([\{\}\(\);,]+\\|" 2745 objc (concat "\\([{}();,]+\\|"
2746 (c-make-keywords-re nil (c-lang-const c-protection-kwds)) 2746 (c-make-keywords-re nil (c-lang-const c-protection-kwds))
2747 "\\)") 2747 "\\)")
2748 ;; Pike is like C but we also match "[" for multiple value 2748 ;; Pike is like C but we also match "[" for multiple value
2749 ;; assignments and type casts. 2749 ;; assignments and type casts.
2750 pike "\\([\{\}\(\)\[;,]+\\)") 2750 pike "\\([{}()[;,]+\\)")
2751(c-lang-defvar c-decl-prefix-re (c-lang-const c-decl-prefix-re) 2751(c-lang-defvar c-decl-prefix-re (c-lang-const c-decl-prefix-re)
2752 'dont-doc) 2752 'dont-doc)
2753 2753
@@ -2792,7 +2792,7 @@ constructs."
2792 ;; languages without casts. 2792 ;; languages without casts.
2793 t (c-filter-ops (c-lang-const c-operators) 2793 t (c-filter-ops (c-lang-const c-operators)
2794 '(prefix) 2794 '(prefix)
2795 "\\`\\s\(\\'" 2795 "\\`\\s(\\'"
2796 (lambda (op) (elt op 0)))) 2796 (lambda (op) (elt op 0))))
2797(c-lang-defvar c-cast-parens (c-lang-const c-cast-parens)) 2797(c-lang-defvar c-cast-parens (c-lang-const c-cast-parens))
2798 2798
@@ -2875,13 +2875,13 @@ Identifier syntax is in effect when this is matched \(see
2875 ;; Check that there's no "=" afterwards to avoid matching tokens 2875 ;; Check that there's no "=" afterwards to avoid matching tokens
2876 ;; like "*=". 2876 ;; like "*=".
2877 (c objc) (concat "\\(" 2877 (c objc) (concat "\\("
2878 "[*\(]" 2878 "[*(]"
2879 "\\|" 2879 "\\|"
2880 (c-lang-const c-type-decl-prefix-key) 2880 (c-lang-const c-type-decl-prefix-key)
2881 "\\)" 2881 "\\)"
2882 "\\([^=]\\|$\\)") 2882 "\\([^=]\\|$\\)")
2883 c++ (concat "\\(" 2883 c++ (concat "\\("
2884 "[*\(&]" 2884 "[*(&]"
2885 "\\|" 2885 "\\|"
2886 (c-lang-const c-type-decl-prefix-key) 2886 (c-lang-const c-type-decl-prefix-key)
2887 "\\|" 2887 "\\|"
@@ -2909,13 +2909,13 @@ is in effect when this is matched (see `c-identifier-syntax-table')."
2909 ;; Default to a regexp that matches `c-type-modifier-kwds' and a 2909 ;; Default to a regexp that matches `c-type-modifier-kwds' and a
2910 ;; function argument list parenthesis. 2910 ;; function argument list parenthesis.
2911 t (if (c-lang-const c-type-modifier-kwds) 2911 t (if (c-lang-const c-type-modifier-kwds)
2912 (concat "\\(\(\\|" 2912 (concat "\\((\\|"
2913 (regexp-opt (c-lang-const c-type-modifier-kwds) t) "\\>" 2913 (regexp-opt (c-lang-const c-type-modifier-kwds) t) "\\>"
2914 "\\)") 2914 "\\)")
2915 "\\(\(\\)") 2915 "\\((\\)")
2916 (c c++ objc) (concat 2916 (c c++ objc) (concat
2917 "\\(" 2917 "\\("
2918 "[\)\[\(]" 2918 "[)[(]"
2919 (if (c-lang-const c-type-modifier-kwds) 2919 (if (c-lang-const c-type-modifier-kwds)
2920 (concat 2920 (concat
2921 "\\|" 2921 "\\|"
@@ -2926,8 +2926,8 @@ is in effect when this is matched (see `c-identifier-syntax-table')."
2926 "\\>") 2926 "\\>")
2927 "") 2927 "")
2928 "\\)") 2928 "\\)")
2929 java "\\([\[\(\)]\\)" 2929 java "\\([[()]\\)"
2930 idl "\\([\[\(]\\)") 2930 idl "\\([[(]\\)")
2931(c-lang-defvar c-type-decl-suffix-key (c-lang-const c-type-decl-suffix-key) 2931(c-lang-defvar c-type-decl-suffix-key (c-lang-const c-type-decl-suffix-key)
2932 'dont-doc) 2932 'dont-doc)
2933 2933
@@ -3111,7 +3111,7 @@ i.e. compound statements surrounded by parentheses inside expressions."
3111 t (if (c-lang-const c-opt-<>-arglist-start) 3111 t (if (c-lang-const c-opt-<>-arglist-start)
3112 (concat "\\(" 3112 (concat "\\("
3113 (c-lang-const c-opt-<>-arglist-start) 3113 (c-lang-const c-opt-<>-arglist-start)
3114 "\\)\\|\\s\)"))) 3114 "\\)\\|\\s)")))
3115(c-lang-defvar c-opt-<>-arglist-start-in-paren 3115(c-lang-defvar c-opt-<>-arglist-start-in-paren
3116 (c-lang-const c-opt-<>-arglist-start-in-paren)) 3116 (c-lang-const c-opt-<>-arglist-start-in-paren))
3117 3117
@@ -3168,7 +3168,7 @@ i.e. before \":\". Only used if `c-recognize-colon-labels' is set."
3168 ;; Also check for open parens in C++, to catch member init lists in 3168 ;; Also check for open parens in C++, to catch member init lists in
3169 ;; constructors. We normally allow it so that macros with arguments 3169 ;; constructors. We normally allow it so that macros with arguments
3170 ;; work in labels. 3170 ;; work in labels.
3171 c++ (concat "\\s\(\\|\"\\|" (c-lang-const c-nonlabel-token-key))) 3171 c++ (concat "\\s(\\|\"\\|" (c-lang-const c-nonlabel-token-key)))
3172(c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) 3172(c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key))
3173 3173
3174(c-lang-defconst c-nonlabel-token-2-key 3174(c-lang-defconst c-nonlabel-token-2-key
@@ -3216,7 +3216,7 @@ way."
3216 "\\([+-]\\)" 3216 "\\([+-]\\)"
3217 (c-lang-const c-simple-ws) "*" 3217 (c-lang-const c-simple-ws) "*"
3218 (concat "\\(" ; Return type. 3218 (concat "\\(" ; Return type.
3219 "([^\)]*)" 3219 "([^)]*)"
3220 (c-lang-const c-simple-ws) "*" 3220 (c-lang-const c-simple-ws) "*"
3221 "\\)?") 3221 "\\)?")
3222 "\\(" (c-lang-const c-symbol-key) "\\)")) 3222 "\\(" (c-lang-const c-symbol-key) "\\)"))
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index da36647f2cd..9afece9e30b 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -277,7 +277,7 @@ nil."
277If t, hitting TAB always just indents the current line. If nil, hitting 277If t, hitting TAB always just indents the current line. If nil, hitting
278TAB indents the current line if point is at the left margin or in the 278TAB indents the current line if point is at the left margin or in the
279line's indentation, otherwise it inserts a `real' tab character \(see 279line's indentation, otherwise it inserts a `real' tab character \(see
280note\). If some other value (not nil or t), then tab is inserted only 280note). If some other value \(not nil or t), then tab is inserted only
281within literals \(comments and strings), but the line is always 281within literals \(comments and strings), but the line is always
282reindented. 282reindented.
283 283
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 96bb8d3a112..78c8d94576b 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1005,12 +1005,12 @@ Intended as the value of `indent-line-function'."
1005 (point)))) 1005 (point))))
1006 (let ((paragraph-start 1006 (let ((paragraph-start
1007 ;; Include start of parenthesized block. 1007 ;; Include start of parenthesized block.
1008 "\f\\|[ \t]*$\\|.*\(") 1008 "\f\\|[ \t]*$\\|.*(")
1009 (paragraph-separate 1009 (paragraph-separate
1010 ;; Include action and class lines, start and end of 1010 ;; Include action and class lines, start and end of
1011 ;; bracketed blocks and end of parenthesized blocks to 1011 ;; bracketed blocks and end of parenthesized blocks to
1012 ;; avoid including these in fill. This isn't ideal. 1012 ;; avoid including these in fill. This isn't ideal.
1013 "[ \t\f]*$\\|.*#\\|.*[\){}]\\|\\s-*[[:alpha:]_().|!]+:") 1013 "[ \t\f]*$\\|.*#\\|.*[){}]\\|\\s-*[[:alpha:]_().|!]+:")
1014 fill-paragraph-function) 1014 fill-paragraph-function)
1015 (fill-paragraph justify)) 1015 (fill-paragraph justify))
1016 t)) 1016 t))
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 005e71a825e..0f5b1bb8c6a 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -390,7 +390,7 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
390 ;; the way of font-lock, highlighting etc. 390 ;; the way of font-lock, highlighting etc.
391 (insert 391 (insert
392 (format 392 (format
393 "/* Preprocessor terminated with status %s\n\n Messages from '%s\':\n\n" 393 "/* Preprocessor terminated with status %s\n\n Messages from '%s':\n\n"
394 exit-status cppcommand)) 394 exit-status cppcommand))
395 (goto-char (+ (point) 395 (goto-char (+ (point)
396 (nth 1 (insert-file-contents tempname)))) 396 (nth 1 (insert-file-contents tempname))))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a6e9ed8889a..f9c097e00ec 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -167,7 +167,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
167 167
168 (cucumber 168 (cucumber
169 "\\(?:^cucumber\\(?: -p [^[:space:]]+\\)?\\|#\\)\ 169 "\\(?:^cucumber\\(?: -p [^[:space:]]+\\)?\\|#\\)\
170\\(?: \\)\\([^\(].*\\):\\([1-9][0-9]*\\)" 1 2) 170\\(?: \\)\\([^(].*\\):\\([1-9][0-9]*\\)" 1 2)
171 171
172 (msft 172 (msft
173 ;; Must be before edg-1, so that MSVC's longer messages are 173 ;; Must be before edg-1, so that MSVC's longer messages are
@@ -230,7 +230,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
230 1 2 3 (4 . 5)) 230 1 2 3 (4 . 5))
231 231
232 (ruby-Test::Unit 232 (ruby-Test::Unit
233 "^[\t ]*\\[\\([^\(].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:in " 1 2) 233 "^[\t ]*\\[\\([^(].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:in " 1 2)
234 234
235 (gnu 235 (gnu
236 ;; The first line matches the program name for 236 ;; The first line matches the program name for
@@ -377,7 +377,7 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
377 3 4 5 (1 . 2)) 377 3 4 5 (1 . 2))
378 378
379 (sun-ada 379 (sun-ada
380 "^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., \(-]" 1 2 3) 380 "^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., (-]" 1 2 3)
381 381
382 (watcom 382 (watcom
383 "^[ \t]*\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)): ?\ 383 "^[ \t]*\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)): ?\
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 528bc44f8a8..ab3aa7f993a 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -395,12 +395,12 @@ Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
395 :type 'boolean 395 :type 'boolean
396 :group 'cperl-indentation-details) 396 :group 'cperl-indentation-details)
397 397
398(defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;") 398(defcustom cperl-vc-sccs-header '("($sccs) = ('%W\ %' =~ /(\\d+(\\.\\d+)+)/) ;")
399 "*Special version of `vc-sccs-header' that is used in CPerl mode buffers." 399 "*Special version of `vc-sccs-header' that is used in CPerl mode buffers."
400 :type '(repeat string) 400 :type '(repeat string)
401 :group 'cperl) 401 :group 'cperl)
402 402
403(defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/);") 403(defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\ $ ' =~ /(\\d+(\\.\\d+)+)/);")
404 "*Special version of `vc-rcs-header' that is used in CPerl mode buffers." 404 "*Special version of `vc-rcs-header' that is used in CPerl mode buffers."
405 :type '(repeat string) 405 :type '(repeat string)
406 :group 'cperl) 406 :group 'cperl)
@@ -793,7 +793,7 @@ corrected problems are: POD sections, here-documents, regexps. The
793operations are: highlighting, indentation, electric keywords, electric 793operations are: highlighting, indentation, electric keywords, electric
794braces. 794braces.
795 795
796This may be confusing, since the regexp s#//#/#\; may be highlighted 796This may be confusing, since the regexp s#//#/#; may be highlighted
797as a comment, but it will be recognized as a regexp by the indentation 797as a comment, but it will be recognized as a regexp by the indentation
798code. Or the opposite case, when a POD section is highlighted, but 798code. Or the opposite case, when a POD section is highlighted, but
799may break the indentation of the following code (though indentation 799may break the indentation of the following code (though indentation
@@ -4585,13 +4585,13 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4585 ((eq (char-after b) ?\: ) 4585 ((eq (char-after b) ?\: )
4586 "\\\\*\\[\\\\:\\^?\\sw+\\\\:]") 4586 "\\\\*\\[\\\\:\\^?\\sw+\\\\:]")
4587 ((eq (char-after b) ?^ ) 4587 ((eq (char-after b) ?^ )
4588 "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:\]") 4588 "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:]")
4589 ((eq (char-syntax (char-after b)) 4589 ((eq (char-syntax (char-after b))
4590 ?w) 4590 ?w)
4591 (concat 4591 (concat
4592 "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\" 4592 "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\"
4593 (char-to-string (char-after b)) 4593 (char-to-string (char-after b))
4594 "\\|\\sw\\)+:\]")) 4594 "\\|\\sw\\)+:]"))
4595 (t "\\\\*\\[:\\^?\\sw*:]"))) 4595 (t "\\\\*\\[:\\^?\\sw*:]")))
4596 (goto-char REx-subgr-end) 4596 (goto-char REx-subgr-end)
4597 (cperl-highlight-charclass 4597 (cperl-highlight-charclass
@@ -5706,7 +5706,7 @@ indentation and initial hashes. Behaves usually outside of comment."
5706 "redo" "return" "local" "exec" "sub" "do" "dump" "use" "our" 5706 "redo" "return" "local" "exec" "sub" "do" "dump" "use" "our"
5707 "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT") 5707 "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT")
5708 "\\|") ; Flow control 5708 "\\|") ; Flow control
5709 "\\)\\>") 2) ; was "\\)[ \n\t;():,\|&]" 5709 "\\)\\>") 2) ; was "\\)[ \n\t;():,|&]"
5710 ; In what follows we use `type' style 5710 ; In what follows we use `type' style
5711 ; for overwritable builtins 5711 ; for overwritable builtins
5712 (list 5712 (list
@@ -5850,7 +5850,7 @@ indentation and initial hashes. Behaves usually outside of comment."
5850 (1 font-lock-string-face t)))) 5850 (1 font-lock-string-face t))))
5851 (t '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" 5851 (t '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}"
5852 2 font-lock-string-face t))) 5852 2 font-lock-string-face t)))
5853 '("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1 5853 '("[[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1
5854 font-lock-string-face t) 5854 font-lock-string-face t)
5855 '("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1 5855 '("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1
5856 font-lock-constant-face) ; labels 5856 font-lock-constant-face) ; labels
@@ -5935,7 +5935,7 @@ indentation and initial hashes. Behaves usually outside of comment."
5935 (and (string< "21.1.10" emacs-version) 5935 (and (string< "21.1.10" emacs-version)
5936 (string< emacs-version "21.1.2"))) 5936 (string< emacs-version "21.1.2")))
5937 '( 5937 '(
5938 ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1 5938 ("\\(\\([@%]\\|\\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
5939 (if (eq (char-after (match-beginning 2)) ?%) 5939 (if (eq (char-after (match-beginning 2)) ?%)
5940 'cperl-hash-face 5940 'cperl-hash-face
5941 'cperl-array-face) 5941 'cperl-array-face)
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 4c997bdd4d0..8c8bef06ecc 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -259,12 +259,12 @@ never indented."
259 :group 'dcl) 259 :group 'dcl)
260 260
261(defcustom dcl-imenu-generic-expression 261(defcustom dcl-imenu-generic-expression
262 `((nil "^\\$[ \t]*\\([A-Za-z0-9_\$]+\\):[ \t]+SUBROUTINE\\b" 1) 262 `((nil "^\\$[ \t]*\\([A-Za-z0-9_$]+\\):[ \t]+SUBROUTINE\\b" 1)
263 (,dcl-imenu-label-labels 263 (,dcl-imenu-label-labels
264 "^\\$[ \t]*\\([A-Za-z0-9_\$]+\\):\\([ \t]\\|$\\)" 1) 264 "^\\$[ \t]*\\([A-Za-z0-9_$]+\\):\\([ \t]\\|$\\)" 1)
265 (,dcl-imenu-label-goto "\\s-GOTO[ \t]+\\([A-Za-z0-9_\$]+\\)" 1) 265 (,dcl-imenu-label-goto "\\s-GOTO[ \t]+\\([A-Za-z0-9_$]+\\)" 1)
266 (,dcl-imenu-label-gosub "\\s-GOSUB[ \t]+\\([A-Za-z0-9_\$]+\\)" 1) 266 (,dcl-imenu-label-gosub "\\s-GOSUB[ \t]+\\([A-Za-z0-9_$]+\\)" 1)
267 (,dcl-imenu-label-call "\\s-CALL[ \t]+\\([A-Za-z0-9_\$]+\\)" 1)) 267 (,dcl-imenu-label-call "\\s-CALL[ \t]+\\([A-Za-z0-9_$]+\\)" 1))
268 "Default imenu generic expression for DCL. 268 "Default imenu generic expression for DCL.
269 269
270The default includes SUBROUTINE labels in the main listing and 270The default includes SUBROUTINE labels in the main listing and
@@ -369,7 +369,7 @@ followed by space or tab."
369 369
370 370
371(defcustom dcl-label-r 371(defcustom dcl-label-r
372 "[a-zA-Z0-9_\$]*:\\([ \t!]\\|$\\)" 372 "[a-zA-Z0-9_$]*:\\([ \t!]\\|$\\)"
373 "Regular expression describing a label. 373 "Regular expression describing a label.
374A label is a name followed by a colon followed by white-space or end-of-line." 374A label is a name followed by a colon followed by white-space or end-of-line."
375 :type 'regexp 375 :type 'regexp
@@ -453,12 +453,12 @@ Preloaded with all known option names from dcl-option-alist")
453;; above. This version won't find GOTOs in comments or text strings. 453;; above. This version won't find GOTOs in comments or text strings.
454;(defvar dcl-imenu-generic-expression 454;(defvar dcl-imenu-generic-expression
455; (` 455; (`
456; ((nil "^\\$[ \t]*\\([A-Za-z0-9_\$]+\\):[ \t]+SUBROUTINE\\b" 1) 456; ((nil "^\\$[ \t]*\\([A-Za-z0-9_$]+\\):[ \t]+SUBROUTINE\\b" 1)
457; ("Labels" "^\\$[ \t]*\\([A-Za-z0-9_\$]+\\):\\([ \t]\\|$\\)" 1) 457; ("Labels" "^\\$[ \t]*\\([A-Za-z0-9_$]+\\):\\([ \t]\\|$\\)" 1)
458; ("GOTO" (, (concat dcl-cmd-r "GOTO[ \t]+\\([A-Za-z0-9_\$]+\\)")) 5) 458; ("GOTO" (, (concat dcl-cmd-r "GOTO[ \t]+\\([A-Za-z0-9_$]+\\)")) 5)
459; ("GOSUB" (, (concat dcl-cmd-r 459; ("GOSUB" (, (concat dcl-cmd-r
460; "GOSUB[ \t]+\\([A-Za-z0-9_\$]+\\)")) 5) 460; "GOSUB[ \t]+\\([A-Za-z0-9_$]+\\)")) 5)
461; ("CALL" (, (concat dcl-cmd-r "CALL[ \t]+\\([A-Za-z0-9_\$]+\\)")) 5))) 461; ("CALL" (, (concat dcl-cmd-r "CALL[ \t]+\\([A-Za-z0-9_$]+\\)")) 5)))
462; "*Default imenu generic expression for DCL. 462; "*Default imenu generic expression for DCL.
463 463
464;The default includes SUBROUTINE labels in the main listing and 464;The default includes SUBROUTINE labels in the main listing and
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 7614bacf1bb..bdc304e0aa5 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1247,7 +1247,7 @@ If the current defun is actually a call to `defvar',
1247then reset the variable using the initial value expression 1247then reset the variable using the initial value expression
1248even if the variable already has some other value. 1248even if the variable already has some other value.
1249\(Normally `defvar' does not change the variable's value 1249\(Normally `defvar' does not change the variable's value
1250if it already has a value.\) 1250if it already has a value.)
1251 1251
1252Return the result of evaluation." 1252Return the result of evaluation."
1253 ;; FIXME: the print-length/level bindings should only be applied while 1253 ;; FIXME: the print-length/level bindings should only be applied while
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index e8a1ae455ee..0ac59e1a1ea 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -240,7 +240,7 @@
240 :group 'f90-indent) 240 :group 'f90-indent)
241 241
242(defcustom f90-beginning-ampersand t 242(defcustom f90-beginning-ampersand t
243 "Non-nil gives automatic insertion of \& at start of continuation line." 243 "Non-nil gives automatic insertion of `&' at start of continuation line."
244 :type 'boolean 244 :type 'boolean
245 :safe 'booleanp 245 :safe 'booleanp
246 :group 'f90) 246 :group 'f90)
@@ -649,7 +649,7 @@ forall\\|block\\|critical\\)\\)\\_>"
649\\|enumerator\\|procedure\\|\ 649\\|enumerator\\|procedure\\|\
650logical\\|double[ \t]*precision\\|type[ \t]*(\\(?:\\sw\\|\\s_\\)+)\\|none\\)[ \t]*" 650logical\\|double[ \t]*precision\\|type[ \t]*(\\(?:\\sw\\|\\s_\\)+)\\|none\\)[ \t]*"
651 (1 font-lock-keyword-face) (2 font-lock-type-face)) 651 (1 font-lock-keyword-face) (2 font-lock-type-face))
652 '("\\_<\\(namelist\\|common\\)[ \t]*\/\\(\\(?:\\sw\\|\\s_\\)+\\)?\/" 652 '("\\_<\\(namelist\\|common\\)[ \t]*/\\(\\(?:\\sw\\|\\s_\\)+\\)?\/"
653 (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) 653 (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
654 "\\_<else\\([ \t]*if\\|where\\)?\\_>" 654 "\\_<else\\([ \t]*if\\|where\\)?\\_>"
655 '("\\(&\\)[ \t]*\\(!\\|$\\)" (1 font-lock-keyword-face)) 655 '("\\(&\\)[ \t]*\\(!\\|$\\)" (1 font-lock-keyword-face))
@@ -954,8 +954,8 @@ Used in the F90 entry in `hs-special-modes-alist'.")
954 ;; and also variables of derived type "type (foo)". 954 ;; and also variables of derived type "type (foo)".
955 ;; "type, foo" must be a block (?). 955 ;; "type, foo" must be a block (?).
956 "type[ \t,]\\(" 956 "type[ \t,]\\("
957 "[^i(!\n\"\& \t]\\|" ; not-i( 957 "[^i(!\n\"& \t]\\|" ; not-i(
958 "i[^s!\n\"\& \t]\\|" ; i not-s 958 "i[^s!\n\"& \t]\\|" ; i not-s
959 "is\\(?:\\sw\\|\\s_\\)\\)\\|" 959 "is\\(?:\\sw\\|\\s_\\)\\)\\|"
960 ;; "abstract interface" is F2003; "submodule" is F2008. 960 ;; "abstract interface" is F2003; "submodule" is F2008.
961 "program\\|\\(?:abstract[ \t]*\\)?interface\\|\\(?:sub\\)?module\\|" 961 "program\\|\\(?:abstract[ \t]*\\)?interface\\|\\(?:sub\\)?module\\|"
@@ -992,9 +992,9 @@ Set subexpression 1 in the match-data to the name of the type."
992 found)) 992 found))
993 993
994(defvar f90-imenu-generic-expression 994(defvar f90-imenu-generic-expression
995 (let ((good-char "[^!\"\&\n \t]") (not-e "[^e!\n\"\& \t]") 995 (let ((good-char "[^!\"&\n \t]") (not-e "[^e!\n\"& \t]")
996 (not-n "[^n!\n\"\& \t]") (not-d "[^d!\n\"\& \t]") 996 (not-n "[^n!\n\"& \t]") (not-d "[^d!\n\"& \t]")
997 ;; (not-ib "[^i(!\n\"\& \t]") (not-s "[^s!\n\"\& \t]") 997 ;; (not-ib "[^i(!\n\"& \t]") (not-s "[^s!\n\"& \t]")
998 ) 998 )
999 `((nil "^[ \t0-9]*program[ \t]+\\(\\(?:\\sw\\|\\s_\\)+\\)" 1) 999 `((nil "^[ \t0-9]*program[ \t]+\\(\\(?:\\sw\\|\\s_\\)+\\)" 1)
1000 ("Submodules" "^[ \t0-9]*submodule[ \t]*([^)\n]+)[ \t]*\ 1000 ("Submodules" "^[ \t0-9]*submodule[ \t]*([^)\n]+)[ \t]*\
@@ -1015,7 +1015,7 @@ Set subexpression 1 in the match-data to the name of the type."
1015 "\\(" 1015 "\\("
1016 ;; At least three non-space characters before function/subroutine. 1016 ;; At least three non-space characters before function/subroutine.
1017 ;; Check that the last three non-space characters do not spell E N D. 1017 ;; Check that the last three non-space characters do not spell E N D.
1018 "[^!\"\&\n]*\\(" 1018 "[^!\"&\n]*\\("
1019 not-e good-char good-char "\\|" 1019 not-e good-char good-char "\\|"
1020 good-char not-n good-char "\\|" 1020 good-char not-n good-char "\\|"
1021 good-char good-char not-d "\\)" 1021 good-char good-char not-d "\\)"
@@ -1154,7 +1154,7 @@ Variables controlling indentation style and extra features:
1154 Non-nil causes `f90-do-auto-fill' to break lines before delimiters 1154 Non-nil causes `f90-do-auto-fill' to break lines before delimiters
1155 (default t). 1155 (default t).
1156`f90-beginning-ampersand' 1156`f90-beginning-ampersand'
1157 Automatic insertion of \& at beginning of continuation lines (default t). 1157 Automatic insertion of `&' at beginning of continuation lines (default t).
1158`f90-smart-end' 1158`f90-smart-end'
1159 From an END statement, check and fill the end using matching block start. 1159 From an END statement, check and fill the end using matching block start.
1160 Allowed values are `blink', `no-blink', and nil, which determine 1160 Allowed values are `blink', `no-blink', and nil, which determine
@@ -1378,7 +1378,7 @@ write\\)[ \t]*([^)\n]*)")
1378 ((looking-at "\\(submodule\\)[ \t]*([^)\n]+)[ \t]*\\(\\(?:\\sw\\|\\s_\\)+\\)\\_>") 1378 ((looking-at "\\(submodule\\)[ \t]*([^)\n]+)[ \t]*\\(\\(?:\\sw\\|\\s_\\)+\\)\\_>")
1379 (list (match-string 1) (match-string 2))) 1379 (list (match-string 1) (match-string 2)))
1380 ((and (not (looking-at "end[ \t]*\\(function\\|subroutine\\)")) 1380 ((and (not (looking-at "end[ \t]*\\(function\\|subroutine\\)"))
1381 (looking-at "[^!'\"\&\n]*\\(function\\|subroutine\\)[ \t]+\ 1381 (looking-at "[^!'\"&\n]*\\(function\\|subroutine\\)[ \t]+\
1382\\(\\(?:\\sw\\|\\s_\\)+\\)")) 1382\\(\\(?:\\sw\\|\\s_\\)+\\)"))
1383 (list (match-string 1) (match-string 2))))) 1383 (list (match-string 1) (match-string 2)))))
1384;; Following will match an un-named main program block; however 1384;; Following will match an un-named main program block; however
@@ -2110,7 +2110,7 @@ Like `join-line', but handles F90 syntax."
2110 (if arg (forward-line 1)) 2110 (if arg (forward-line 1))
2111 (when (eq (preceding-char) ?\n) 2111 (when (eq (preceding-char) ?\n)
2112 (skip-chars-forward " \t") 2112 (skip-chars-forward " \t")
2113 (if (looking-at "\&") (delete-char 1)) 2113 (if (looking-at "&") (delete-char 1))
2114 (beginning-of-line) 2114 (beginning-of-line)
2115 (delete-region (point) (1- (point))) 2115 (delete-region (point) (1- (point)))
2116 (skip-chars-backward " \t") 2116 (skip-chars-backward " \t")
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index a9d47431e51..3adadd1386e 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -826,16 +826,16 @@ Convert it to flymake internal format."
826 (append 826 (append
827 '( 827 '(
828 ;; MS Visual C++ 6.0 828 ;; MS Visual C++ 6.0
829 ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \: \\(\\(error\\|warning\\|fatal error\\) \\(C[0-9]+\\):[ \t\n]*\\(.+\\)\\)" 829 ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) : \\(\\(error\\|warning\\|fatal error\\) \\(C[0-9]+\\):[ \t\n]*\\(.+\\)\\)"
830 1 3 nil 4) 830 1 3 nil 4)
831 ;; jikes 831 ;; jikes
832 ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[0-9]+\:[0-9]+\:[0-9]+\: \\(\\(Error\\|Warning\\|Caution\\|Semantic Error\\):[ \t\n]*\\(.+\\)\\)" 832 ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\):\\([0-9]+\\):[0-9]+:[0-9]+:[0-9]+: \\(\\(Error\\|Warning\\|Caution\\|Semantic Error\\):[ \t\n]*\\(.+\\)\\)"
833 1 3 nil 4) 833 1 3 nil 4)
834 ;; MS midl 834 ;; MS midl
835 ("midl[ ]*:[ ]*\\(command line error .*\\)" 835 ("midl[ ]*:[ ]*\\(command line error .*\\)"
836 nil nil nil 1) 836 nil nil nil 1)
837 ;; MS C# 837 ;; MS C#
838 ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\),[0-9]+)\: \\(\\(error\\|warning\\|fatal error\\) \\(CS[0-9]+\\):[ \t\n]*\\(.+\\)\\)" 838 ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\),[0-9]+): \\(\\(error\\|warning\\|fatal error\\) \\(CS[0-9]+\\):[ \t\n]*\\(.+\\)\\)"
839 1 3 nil 4) 839 1 3 nil 4)
840 ;; perl 840 ;; perl
841 ("\\(.*\\) at \\([^ \n]+\\) line \\([0-9]+\\)[,.\n]" 2 3 nil 1) 841 ("\\(.*\\) at \\([^ \n]+\\) line \\([0-9]+\\)[,.\n]" 2 3 nil 1)
@@ -843,7 +843,7 @@ Convert it to flymake internal format."
843 ("\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" 2 3 nil 1) 843 ("\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" 2 3 nil 1)
844 ;; LaTeX warnings (fileless) ("\\(LaTeX \\(Warning\\|Error\\): .*\\) on input line \\([0-9]+\\)" 20 3 nil 1) 844 ;; LaTeX warnings (fileless) ("\\(LaTeX \\(Warning\\|Error\\): .*\\) on input line \\([0-9]+\\)" 20 3 nil 1)
845 ;; ant/javac. Note this also matches gcc warnings! 845 ;; ant/javac. Note this also matches gcc warnings!
846 (" *\\(\\[javac\\] *\\)?\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\\(?:\:[0-9]+\\)?\:[ \t\n]*\\(.+\\)" 846 (" *\\(\\[javac\\] *\\)?\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\):\\([0-9]+\\)\\(?::[0-9]+\\)?:[ \t\n]*\\(.+\\)"
847 2 4 nil 5)) 847 2 4 nil 5))
848 ;; compilation-error-regexp-alist) 848 ;; compilation-error-regexp-alist)
849 (flymake-reformat-err-line-patterns-from-compile-el compilation-error-regexp-alist-alist)) 849 (flymake-reformat-err-line-patterns-from-compile-el compilation-error-regexp-alist-alist))
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index ee4733f6e4e..ef470055065 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -244,8 +244,8 @@ line in region."
244(defcustom fortran-column-ruler-fixed 244(defcustom fortran-column-ruler-fixed
245 "0 4 6 10 20 30 40 5\ 245 "0 4 6 10 20 30 40 5\
2460 60 70\n\ 2460 60 70\n\
247\[ ]|{ | | | | | | | | \ 247[ ]|{ | | | | | | | | \
248\| | | | |}\n" 248| | | | |}\n"
249 "String displayed above current line by \\[fortran-column-ruler]. 249 "String displayed above current line by \\[fortran-column-ruler].
250This variable is used in fixed format mode. 250This variable is used in fixed format mode.
251See the variable `fortran-column-ruler-tab' for TAB format mode." 251See the variable `fortran-column-ruler-tab' for TAB format mode."
@@ -257,8 +257,8 @@ See the variable `fortran-column-ruler-tab' for TAB format mode."
257(defcustom fortran-column-ruler-tab 257(defcustom fortran-column-ruler-tab
258 "0 810 20 30 40 5\ 258 "0 810 20 30 40 5\
2590 60 70\n\ 2590 60 70\n\
260\[ ]| { | | | | | | | | \ 260[ ]| { | | | | | | | | \
261\| | | | |}\n" 261| | | | |}\n"
262 "String displayed above current line by \\[fortran-column-ruler]. 262 "String displayed above current line by \\[fortran-column-ruler].
263This variable is used in TAB format mode. 263This variable is used in TAB format mode.
264See the variable `fortran-column-ruler-fixed' for fixed format mode." 264See the variable `fortran-column-ruler-fixed' for fixed format mode."
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index 257c3d2a80f..6ee32b0b3ee 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -252,7 +252,7 @@ CATEGORY is the overlay category. If it is nil, use the `glasses' category."
252 ;; Parentheses 252 ;; Parentheses
253 (when glasses-separate-parentheses-p 253 (when glasses-separate-parentheses-p
254 (goto-char beg) 254 (goto-char beg)
255 (while (re-search-forward "[a-zA-Z]_*\\(\(\\)" end t) 255 (while (re-search-forward "[a-zA-Z]_*\\((\\)" end t)
256 (unless (glasses-parenthesis-exception-p (point-at-bol) (match-end 1)) 256 (unless (glasses-parenthesis-exception-p (point-at-bol) (match-end 1))
257 (glasses-make-overlay (match-beginning 1) (match-end 1) 257 (glasses-make-overlay (match-beginning 1) (match-end 1)
258 'glasses-parenthesis)))))))) 258 'glasses-parenthesis))))))))
@@ -291,7 +291,7 @@ recognized according to the current value of the variable `glasses-separator'."
291 (goto-char (match-beginning 1))))) 291 (goto-char (match-beginning 1)))))
292 (when glasses-separate-parentheses-p 292 (when glasses-separate-parentheses-p
293 (goto-char (point-min)) 293 (goto-char (point-min))
294 (while (re-search-forward "[a-zA-Z]_*\\( \\)\(" nil t) 294 (while (re-search-forward "[a-zA-Z]_*\\( \\)(" nil t)
295 (unless (glasses-parenthesis-exception-p (point-at-bol) (1+ (match-end 1))) 295 (unless (glasses-parenthesis-exception-p (point-at-bol) (1+ (match-end 1)))
296 (replace-match "" t nil nil 1))))))) 296 (replace-match "" t nil nil 1)))))))
297 ;; nil must be returned to allow use in write file hooks 297 ;; nil must be returned to allow use in write file hooks
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 50ebadf733b..5aeb4ea1a07 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -732,7 +732,7 @@ it contains an error message, even if hide-output is non-nil.")
732 732
733(defvar idlwave-shell-pending-commands nil 733(defvar idlwave-shell-pending-commands nil
734 "List of commands to be sent to IDL. 734 "List of commands to be sent to IDL.
735Each element of the list is list of \(CMD PCMD HIDE\), where CMD is a 735Each element of the list is list of \(CMD PCMD HIDE), where CMD is a
736string to be sent to IDL and PCMD is a post-command to be placed on 736string to be sent to IDL and PCMD is a post-command to be placed on
737`idlwave-shell-post-command-hook'. If HIDE is non-nil, hide the output 737`idlwave-shell-post-command-hook'. If HIDE is non-nil, hide the output
738from command CMD. PCMD and HIDE are optional.") 738from command CMD. PCMD and HIDE are optional.")
@@ -1240,7 +1240,7 @@ Return either nil or 'hide."
1240 show-if-error) 1240 show-if-error)
1241 "Send a command to IDL process. 1241 "Send a command to IDL process.
1242 1242
1243\(CMD PCMD HIDE\) are placed at the end of `idlwave-shell-pending-commands'. 1243\(CMD PCMD HIDE) are placed at the end of `idlwave-shell-pending-commands'.
1244If IDL is ready the first command in `idlwave-shell-pending-commands', 1244If IDL is ready the first command in `idlwave-shell-pending-commands',
1245CMD, is sent to the IDL process. 1245CMD, is sent to the IDL process.
1246 1246
@@ -1256,7 +1256,7 @@ stepping through code with output.
1256If optional fourth argument PREEMPT is non-nil CMD is put at front of 1256If optional fourth argument PREEMPT is non-nil CMD is put at front of
1257`idlwave-shell-pending-commands'. If PREEMPT is 'wait, wait for all 1257`idlwave-shell-pending-commands'. If PREEMPT is 'wait, wait for all
1258output to complete and the next prompt to arrive before returning 1258output to complete and the next prompt to arrive before returning
1259\(useful if you need an answer now\). IDL is considered ready if the 1259\(useful if you need an answer now). IDL is considered ready if the
1260prompt is present and if `idlwave-shell-ready' is non-nil. 1260prompt is present and if `idlwave-shell-ready' is non-nil.
1261 1261
1262If SHOW-IF-ERROR is non-nil, show the output if it contains an error 1262If SHOW-IF-ERROR is non-nil, show the output if it contains an error
@@ -3122,7 +3122,7 @@ versions of IDL."
3122 (string-match "\\.\\'" pre))) ;; structure member 3122 (string-match "\\.\\'" pre))) ;; structure member
3123 3123
3124 ;; Skip over strings 3124 ;; Skip over strings
3125 ((and (string-match "\\([\"\']\\)[^\1]*$" pre) 3125 ((and (string-match "\\([\"']\\)[^\1]*$" pre)
3126 (string-match (concat "^[^" (match-string 1 pre) "]*" 3126 (string-match (concat "^[^" (match-string 1 pre) "]*"
3127 (match-string 1 pre)) post)) 3127 (match-string 1 pre)) post))
3128 (setq start (+ start (match-end 0)))) 3128 (setq start (+ start (match-end 0))))
@@ -3212,7 +3212,7 @@ size(___,/DIMENSIONS)"
3212 3212
3213(defvar idlwave-shell-bp-alist nil 3213(defvar idlwave-shell-bp-alist nil
3214 "Alist of breakpoints. 3214 "Alist of breakpoints.
3215A breakpoint is a cons cell \(\(file line\) . \(\(index module\) data\)\) 3215A breakpoint is a cons cell \((file line) . \((index module) data))
3216 3216
3217The car is the `frame' for the breakpoint: 3217The car is the `frame' for the breakpoint:
3218file - full path file name. 3218file - full path file name.
@@ -3921,7 +3921,7 @@ Query as a function if TYPE set to something beside `pro'."
3921 "Get module source, and update `idlwave-shell-sources-alist'." 3921 "Get module source, and update `idlwave-shell-sources-alist'."
3922 (let ((old (assoc (upcase module) idlwave-shell-sources-alist)) 3922 (let ((old (assoc (upcase module) idlwave-shell-sources-alist))
3923 filename) 3923 filename)
3924 (when (string-match "\.PATH *[\n\r]\\([^%][^\r\n]+\\)[\n\r]" 3924 (when (string-match ".PATH *[\n\r]\\([^%][^\r\n]+\\)[\n\r]"
3925 idlwave-shell-command-output) 3925 idlwave-shell-command-output)
3926 (setq filename (substring idlwave-shell-command-output 3926 (setq filename (substring idlwave-shell-command-output
3927 (match-beginning 1) (match-end 1))) 3927 (match-beginning 1) (match-end 1)))
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index b524b761b75..ac2259df6a4 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -742,7 +742,7 @@ The actions that can be performed are listed in `idlwave-indent-action-table'."
742 742
743(defcustom idlwave-abbrev-start-char "\\" 743(defcustom idlwave-abbrev-start-char "\\"
744 "A single character string used to start abbreviations in abbrev mode. 744 "A single character string used to start abbreviations in abbrev mode.
745Possible characters to choose from: ~\\=`\% 745Possible characters to choose from: ~\\=`%
746or even `?'. `.' is not a good choice because it can make structure 746or even `?'. `.' is not a good choice because it can make structure
747field names act like abbrevs in certain circumstances. 747field names act like abbrevs in certain circumstances.
748 748
@@ -1559,7 +1559,7 @@ KEY in `idlwave-mode-map' by defining an anonymous function calling
1559`self-insert-command' followed by CMD. If KEY contains more than one 1559`self-insert-command' followed by CMD. If KEY contains more than one
1560character a binding will only be set if SELECT is 'both. 1560character a binding will only be set if SELECT is 'both.
1561 1561
1562\(KEY . CMD\) is also placed in the `idlwave-indent-expand-table', 1562\(KEY . CMD) is also placed in the `idlwave-indent-expand-table',
1563replacing any previous value for KEY. If a binding is not set then it 1563replacing any previous value for KEY. If a binding is not set then it
1564will instead be placed in `idlwave-indent-action-table'. 1564will instead be placed in `idlwave-indent-action-table'.
1565 1565
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 17aaab9e2c3..290ebeea290 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -510,7 +510,7 @@ Used by these commands to determine defaults."
510 (file-name-nondirectory file-name))) 510 (file-name-nondirectory file-name)))
511 (comint-send-string (inferior-lisp-proc) (concat "(compile-file \"" 511 (comint-send-string (inferior-lisp-proc) (concat "(compile-file \""
512 file-name 512 file-name
513 "\"\)\n")) 513 "\")\n"))
514 (switch-to-lisp t)) 514 (switch-to-lisp t))
515 515
516 516
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 98a22dd8441..71d0229471a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -126,7 +126,7 @@ An example of this is \"Class.prototype = { method1: ...}\".")
126(defconst js--prototype-objextend-class-decl-re-2 126(defconst js--prototype-objextend-class-decl-re-2
127 (concat "^\\s-*\\(?:var\\s-+\\)?" 127 (concat "^\\s-*\\(?:var\\s-+\\)?"
128 "\\(" js--dotted-name-re "\\)" 128 "\\(" js--dotted-name-re "\\)"
129 "\\s-*=\\s-*Object\\.extend\\s-*\(")) 129 "\\s-*=\\s-*Object\\.extend\\s-*("))
130 130
131;; var NewClass = Class.create({ 131;; var NewClass = Class.create({
132(defconst js--prototype-class-decl-re 132(defconst js--prototype-class-decl-re
@@ -639,7 +639,7 @@ enabled frameworks."
639 (js--maybe-join 639 (js--maybe-join
640 "\\(?:var[ \t]+\\)?[a-zA-Z_$0-9.]+[ \t]*=[ \t]*\\(?:" 640 "\\(?:var[ \t]+\\)?[a-zA-Z_$0-9.]+[ \t]*=[ \t]*\\(?:"
641 "\\|" 641 "\\|"
642 "\\)[ \t]*\(" 642 "\\)[ \t]*("
643 643
644 (when (memq 'prototype js-enabled-frameworks) 644 (when (memq 'prototype js-enabled-frameworks)
645 "Class\\.create") 645 "Class\\.create")
@@ -651,10 +651,10 @@ enabled frameworks."
651 "[a-zA-Z_$0-9]+\\.extend\\(?:Final\\)?")) 651 "[a-zA-Z_$0-9]+\\.extend\\(?:Final\\)?"))
652 652
653 (when (memq 'dojo js-enabled-frameworks) 653 (when (memq 'dojo js-enabled-frameworks)
654 "dojo\\.declare[ \t]*\(") 654 "dojo\\.declare[ \t]*(")
655 655
656 (when (memq 'mochikit js-enabled-frameworks) 656 (when (memq 'mochikit js-enabled-frameworks)
657 "MochiKit\\.Base\\.update[ \t]*\(") 657 "MochiKit\\.Base\\.update[ \t]*(")
658 658
659 ;; mumble.prototypeTHING 659 ;; mumble.prototypeTHING
660 (js--maybe-join 660 (js--maybe-join
@@ -662,7 +662,7 @@ enabled frameworks."
662 662
663 (when (memq 'javascript js-enabled-frameworks) 663 (when (memq 'javascript js-enabled-frameworks)
664 '( ;; foo.prototype.bar = function( 664 '( ;; foo.prototype.bar = function(
665 "\\.[a-zA-Z_$0-9]+[ \t]*=[ \t]*function[ \t]*\(" 665 "\\.[a-zA-Z_$0-9]+[ \t]*=[ \t]*function[ \t]*("
666 666
667 ;; mumble.prototype = { 667 ;; mumble.prototype = {
668 "[ \t]*=[ \t]*{"))))) 668 "[ \t]*=[ \t]*{")))))
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index 511b25486a2..b0b0bdcef04 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -67,8 +67,8 @@ If m4 is not in your PATH, set this to an absolute file name."
67 `( 67 `(
68 ("\\(\\_<\\(m4_\\)?dnl\\_>\\).*$" . font-lock-comment-face) 68 ("\\(\\_<\\(m4_\\)?dnl\\_>\\).*$" . font-lock-comment-face)
69 ("\\$[*#@0-9]" . font-lock-variable-name-face) 69 ("\\$[*#@0-9]" . font-lock-variable-name-face)
70 ("\\\$\\\@" . font-lock-variable-name-face) 70 ("\\$\\@" . font-lock-variable-name-face)
71 ("\\\$\\\*" . font-lock-variable-name-face) 71 ("\\$\\*" . font-lock-variable-name-face)
72 ("\\b\\(builtin\\|change\\(com\\|quote\\|word\\)\\|d\\(e\\(bug\\(file\\|mode\\)\\|cr\\|f\\(ine\\|n\\)\\)\\|iv\\(ert\\|num\\)\\|nl\\|umpdef\\)\\|e\\(rrprint\\|syscmd\\|val\\)\\|f\\(ile\\|ormat\\)\\|gnu\\|i\\(f\\(def\\|else\\)\\|n\\(c\\(lude\\|r\\)\\|d\\(ex\\|ir\\)\\)\\)\\|l\\(en\\|ine\\)\\|m\\(4\\(exit\\|wrap\\)\\|aketemp\\)\\|p\\(atsubst\\|opdef\\|ushdef\\)\\|regexp\\|s\\(hift\\|include\\|ubstr\\|ys\\(cmd\\|val\\)\\)\\|tra\\(ceo\\(ff\\|n\\)\\|nslit\\)\\|un\\(d\\(efine\\|ivert\\)\\|ix\\)\\)\\b" . font-lock-keyword-face) 72 ("\\b\\(builtin\\|change\\(com\\|quote\\|word\\)\\|d\\(e\\(bug\\(file\\|mode\\)\\|cr\\|f\\(ine\\|n\\)\\)\\|iv\\(ert\\|num\\)\\|nl\\|umpdef\\)\\|e\\(rrprint\\|syscmd\\|val\\)\\|f\\(ile\\|ormat\\)\\|gnu\\|i\\(f\\(def\\|else\\)\\|n\\(c\\(lude\\|r\\)\\|d\\(ex\\|ir\\)\\)\\)\\|l\\(en\\|ine\\)\\|m\\(4\\(exit\\|wrap\\)\\|aketemp\\)\\|p\\(atsubst\\|opdef\\|ushdef\\)\\|regexp\\|s\\(hift\\|include\\|ubstr\\|ys\\(cmd\\|val\\)\\)\\|tra\\(ceo\\(ff\\|n\\)\\|nslit\\)\\|un\\(d\\(efine\\|ivert\\)\\|ix\\)\\)\\b" . font-lock-keyword-face)
73 ("\\b\\(m4_\\(builtin\\|change\\(com\\|quote\\|word\\)\\|d\\(e\\(bug\\(file\\|mode\\)\\|cr\\|f\\(ine\\|n\\)\\)\\|iv\\(ert\\|num\\)\\|nl\\|umpdef\\)\\|e\\(rrprint\\|syscmd\\|val\\)\\|f\\(ile\\|ormat\\)\\|i\\(f\\(def\\|else\\)\\|n\\(c\\(lude\\|r\\)\\|d\\(ex\\|ir\\)\\)\\)\\|l\\(en\\|ine\\)\\|m\\(4\\(_undefine\\|exit\\|wrap\\)\\|aketemp\\)\\|p\\(atsubst\\|opdef\\|ushdef\\)\\|regexp\\|s\\(hift\\|include\\|ubstr\\|ys\\(cmd\\|val\\)\\)\\|tra\\(ceo\\(ff\\|n\\)\\|nslit\\)\\|undivert\\)\\)\\b" . font-lock-keyword-face)) 73 ("\\b\\(m4_\\(builtin\\|change\\(com\\|quote\\|word\\)\\|d\\(e\\(bug\\(file\\|mode\\)\\|cr\\|f\\(ine\\|n\\)\\)\\|iv\\(ert\\|num\\)\\|nl\\|umpdef\\)\\|e\\(rrprint\\|syscmd\\|val\\)\\|f\\(ile\\|ormat\\)\\|i\\(f\\(def\\|else\\)\\|n\\(c\\(lude\\|r\\)\\|d\\(ex\\|ir\\)\\)\\)\\|l\\(en\\|ine\\)\\|m\\(4\\(_undefine\\|exit\\|wrap\\)\\|aketemp\\)\\|p\\(atsubst\\|opdef\\|ushdef\\)\\|regexp\\|s\\(hift\\|include\\|ubstr\\|ys\\(cmd\\|val\\)\\)\\|tra\\(ceo\\(ff\\|n\\)\\|nslit\\)\\|undivert\\)\\)\\b" . font-lock-keyword-face))
74 "Default `font-lock-keywords' for M4 mode.") 74 "Default `font-lock-keywords' for M4 mode.")
diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el
index 6b92c7ee2d6..a0f50fc0f19 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/progmodes/mantemp.el
@@ -89,7 +89,7 @@
89 (save-excursion 89 (save-excursion
90 (goto-char (point-min)) 90 (goto-char (point-min))
91 (message "Removing comments") 91 (message "Removing comments")
92 (while (re-search-forward "^[A-z\.()+0-9: ]*`\\|'.*$" nil t) 92 (while (re-search-forward "^[A-z.()+0-9: ]*`\\|'.*$" nil t)
93 (replace-match "")))) 93 (replace-match ""))))
94 94
95(defun mantemp-remove-memfuncs () 95(defun mantemp-remove-memfuncs ()
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 3521a139809..55d69bfddff 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -932,7 +932,7 @@ Returns (parse-state) if line starts inside a string."
932 (if (save-excursion (goto-char indent-point) 932 (if (save-excursion (goto-char indent-point)
933 (looking-at 933 (looking-at
934 (if perl-indent-parens-as-block 934 (if perl-indent-parens-as-block
935 "[ \t]*[{(\[]" "[ \t]*{"))) 935 "[ \t]*[{([]" "[ \t]*{")))
936 perl-continued-brace-offset 0))) 936 perl-continued-brace-offset 0)))
937 (t 937 (t
938 ;; This line starts a new statement. 938 ;; This line starts a new statement.
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 8f50887113e..f1aa35f2871 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -61,7 +61,7 @@ indentation of a line/region to the indentation engine of the sub
61mode, it is supposed to bind this variable to non-nil around the call. 61mode, it is supposed to bind this variable to non-nil around the call.
62 62
63The non-nil value looks as follows 63The non-nil value looks as follows
64 \(FIRST-COLUMN (START . END) PREVIOUS-CHUNKS) 64 (FIRST-COLUMN (START . END) PREVIOUS-CHUNKS)
65 65
66FIRST-COLUMN is the column the indentation engine of the sub mode 66FIRST-COLUMN is the column the indentation engine of the sub mode
67should usually choose for top-level language constructs inside 67should usually choose for top-level language constructs inside
@@ -86,7 +86,7 @@ values are:
86 86
87 - A function called with the start position of the current 87 - A function called with the start position of the current
88 chunk. It will return either the region of the previous chunk 88 chunk. It will return either the region of the previous chunk
89 as \(PREV-START . PREV-END) or nil if there is no further 89 as (PREV-START . PREV-END) or nil if there is no further
90 previous chunk. 90 previous chunk.
91 91
92 A typical use case are literate programming sources - the 92 A typical use case are literate programming sources - the
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 5a4ed84c346..b36df213ce1 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -2357,7 +2357,7 @@ This function is only available when `prolog-system' is set to `swi'."
2357(defun prolog-atom-under-point () 2357(defun prolog-atom-under-point ()
2358 "Return the atom under or left to the point." 2358 "Return the atom under or left to the point."
2359 (save-excursion 2359 (save-excursion
2360 (let ((nonatom_chars "[](){},\. \t\n") 2360 (let ((nonatom_chars "[](){},. \t\n")
2361 start) 2361 start)
2362 (skip-chars-forward (concat "^" nonatom_chars)) 2362 (skip-chars-forward (concat "^" nonatom_chars))
2363 (skip-chars-backward nonatom_chars) 2363 (skip-chars-backward nonatom_chars)
@@ -2826,10 +2826,10 @@ objects (relevant only if `prolog-system' is set to `sicstus')."
2826 (eq prolog-system 'sicstus) 2826 (eq prolog-system 'sicstus)
2827 (prolog-in-object)) 2827 (prolog-in-object))
2828 (format 2828 (format
2829 "^\\(%s\\|%s\\|[^\n\'\"%%]\\)*&[ \t]*\\(\\|%%.*\\)$\\|[ \t]*}" 2829 "^\\(%s\\|%s\\|[^\n'\"%%]\\)*&[ \t]*\\(\\|%%.*\\)$\\|[ \t]*}"
2830 prolog-quoted-atom-regexp prolog-string-regexp) 2830 prolog-quoted-atom-regexp prolog-string-regexp)
2831 (format 2831 (format
2832 "^\\(%s\\|%s\\|[^\n\'\"%%]\\)*\\.[ \t]*\\(\\|%%.*\\)$" 2832 "^\\(%s\\|%s\\|[^\n'\"%%]\\)*\\.[ \t]*\\(\\|%%.*\\)$"
2833 prolog-quoted-atom-regexp prolog-string-regexp)) 2833 prolog-quoted-atom-regexp prolog-string-regexp))
2834 nil t) 2834 nil t)
2835 (if (and (nth 8 (syntax-ppss)) 2835 (if (and (nth 8 (syntax-ppss))
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 026616e68f4..a5efb934a22 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -695,7 +695,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
695 (let ((index-alist '()) (case-fold-search nil) 695 (let ((index-alist '()) (case-fold-search nil)
696 name next pos decl sing) 696 name next pos decl sing)
697 (goto-char beg) 697 (goto-char beg)
698 (while (re-search-forward "^\\s *\\(\\(class\\s +\\|\\(class\\s *<<\\s *\\)\\|module\\s +\\)\\([^\(<\n ]+\\)\\|\\(def\\|alias\\)\\s +\\([^\(\n ]+\\)\\)" end t) 698 (while (re-search-forward "^\\s *\\(\\(class\\s +\\|\\(class\\s *<<\\s *\\)\\|module\\s +\\)\\([^(<\n ]+\\)\\|\\(def\\|alias\\)\\s +\\([^(\n ]+\\)\\)" end t)
699 (setq sing (match-beginning 3)) 699 (setq sing (match-beginning 3))
700 (setq decl (match-string 5)) 700 (setq decl (match-string 5))
701 (setq next (match-end 0)) 701 (setq next (match-end 0))
@@ -1795,7 +1795,7 @@ If the result is do-end block, it will always be multiline."
1795 (setq content 1795 (setq content
1796 (if (equal string-quote "\"") 1796 (if (equal string-quote "\"")
1797 (replace-regexp-in-string "\\\\\"" "\"" (replace-regexp-in-string "\\([^\\\\]\\)'" "\\1\\\\'" content)) 1797 (replace-regexp-in-string "\\\\\"" "\"" (replace-regexp-in-string "\\([^\\\\]\\)'" "\\1\\\\'" content))
1798 (replace-regexp-in-string "\\\\\'" "'" (replace-regexp-in-string "\\([^\\\\]\\)\"" "\\1\\\\\"" content)))) 1798 (replace-regexp-in-string "\\\\'" "'" (replace-regexp-in-string "\\([^\\\\]\\)\"" "\\1\\\\\"" content))))
1799 (let ((orig-point (point))) 1799 (let ((orig-point (point)))
1800 (delete-region min max) 1800 (delete-region min max)
1801 (insert 1801 (insert
@@ -2192,7 +2192,7 @@ See `font-lock-syntax-table'.")
2192 ;; Constants. 2192 ;; Constants.
2193 ("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)" 2193 ("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)"
2194 1 (unless (eq ?\( (char-after)) font-lock-type-face)) 2194 1 (unless (eq ?\( (char-after)) font-lock-type-face))
2195 ("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2195 ("\\(^\\s *\\|[[{(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]"
2196 (2 font-lock-constant-face)) 2196 (2 font-lock-constant-face))
2197 ;; Conversion methods on Kernel. 2197 ;; Conversion methods on Kernel.
2198 (,(concat ruby-font-lock-keyword-beg-re 2198 (,(concat ruby-font-lock-keyword-beg-re
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index a21bc198e3b..e921e84a33e 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -415,7 +415,7 @@ that variable's value is a string."
415 (eval-when-compile 415 (eval-when-compile
416 (list 416 (list
417 ;; Similar to Scheme 417 ;; Similar to Scheme
418 (list "(\\(define\\(-\\w+\\)?\\)\\>[ ]*\\\((?\\)\\(\\sw+\\)\\>" 418 (list "(\\(define\\(-\\w+\\)?\\)\\>[ ]*\\((?\\)\\(\\sw+\\)\\>"
419 '(1 font-lock-keyword-face) 419 '(1 font-lock-keyword-face)
420 '(4 font-lock-function-name-face)) 420 '(4 font-lock-function-name-face))
421 (cons 421 (cons
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 735c8f96888..049c93dfae2 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -347,7 +347,7 @@ naming the shell."
347 . ((nil 347 . ((nil
348 ;; function FOO 348 ;; function FOO
349 ;; function FOO() 349 ;; function FOO()
350 "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?" 350 "^\\s-*function\\s-+\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?"
351 1) 351 1)
352 ;; FOO() 352 ;; FOO()
353 (nil 353 (nil
@@ -374,7 +374,7 @@ For use in `add-log-current-defun-function'."
374 (concat "\\(?:" 374 (concat "\\(?:"
375 ;; function FOO 375 ;; function FOO
376 ;; function FOO() 376 ;; function FOO()
377 "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?" 377 "^\\s-*function\\s-+\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?"
378 "\\)\\|\\(?:" 378 "\\)\\|\\(?:"
379 ;; FOO() 379 ;; FOO()
380 "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()" 380 "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()"
@@ -2319,7 +2319,7 @@ controls whether to query about making the visited file executable.
2319 2319
2320Calls the value of `sh-set-shell-hook' if set." 2320Calls the value of `sh-set-shell-hook' if set."
2321 (interactive (list (completing-read 2321 (interactive (list (completing-read
2322 (format "Shell \(default %s\): " 2322 (format "Shell (default %s): "
2323 sh-shell-file) 2323 sh-shell-file)
2324 ;; This used to use interpreter-mode-alist, but that is 2324 ;; This used to use interpreter-mode-alist, but that is
2325 ;; no longer appropriate now that uses regexps. 2325 ;; no longer appropriate now that uses regexps.
@@ -2810,15 +2810,15 @@ Return new point if successful, nil if an error occurred."
2810 "Return indent-info for this line. 2810 "Return indent-info for this line.
2811This is a list. nil means the line is to be left as is. 2811This is a list. nil means the line is to be left as is.
2812Otherwise it contains one or more of the following sublists: 2812Otherwise it contains one or more of the following sublists:
2813\(t NUMBER\) NUMBER is the base location in the buffer that indentation is 2813\(t NUMBER) NUMBER is the base location in the buffer that indentation is
2814 relative to. If present, this is always the first of the 2814 relative to. If present, this is always the first of the
2815 sublists. The indentation of the line in question is 2815 sublists. The indentation of the line in question is
2816 derived from the indentation of this point, possibly 2816 derived from the indentation of this point, possibly
2817 modified by subsequent sublists. 2817 modified by subsequent sublists.
2818\(+ VAR\) 2818\(+ VAR)
2819\(- VAR\) Get the value of variable VAR and add to or subtract from 2819\(- VAR) Get the value of variable VAR and add to or subtract from
2820 the indentation calculated so far. 2820 the indentation calculated so far.
2821\(= VAR\) Get the value of variable VAR and *replace* the 2821\(= VAR) Get the value of variable VAR and *replace* the
2822 indentation with its value. This only occurs for 2822 indentation with its value. This only occurs for
2823 special variables such as `sh-indent-comment'. 2823 special variables such as `sh-indent-comment'.
2824STRING This is ignored for the purposes of calculating 2824STRING This is ignored for the purposes of calculating
@@ -3086,7 +3086,7 @@ we go to the end of the previous line and do not check for continuations."
3086 (setq prev (point)) 3086 (setq prev (point))
3087 )) 3087 ))
3088 ;; backward-sexp failed 3088 ;; backward-sexp failed
3089 (if (zerop (skip-chars-backward " \t()[\]{};`'")) 3089 (if (zerop (skip-chars-backward " \t()[]{};`'"))
3090 (forward-char -1)) 3090 (forward-char -1))
3091 (if (bolp) 3091 (if (bolp)
3092 (let ((back (sh-prev-line nil))) 3092 (let ((back (sh-prev-line nil)))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 3b77ac088e3..abc99eec909 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -381,9 +381,9 @@ file. Since that is a plaintext file, this could be dangerous."
381 :sqli-options sql-ingres-options 381 :sqli-options sql-ingres-options
382 :sqli-login sql-ingres-login-params 382 :sqli-login sql-ingres-login-params
383 :sqli-comint-func sql-comint-ingres 383 :sqli-comint-func sql-comint-ingres
384 :prompt-regexp "^\* " 384 :prompt-regexp "^\\* "
385 :prompt-length 2 385 :prompt-length 2
386 :prompt-cont-regexp "^\* ") 386 :prompt-cont-regexp "^\\* ")
387 387
388 (interbase 388 (interbase
389 :name "Interbase" 389 :name "Interbase"
@@ -525,7 +525,7 @@ highlighted and will not support `sql-interactive-mode'.
525 525
526Each element in the list is in the following format: 526Each element in the list is in the following format:
527 527
528 \(PRODUCT FEATURE VALUE ...) 528 (PRODUCT FEATURE VALUE ...)
529 529
530where PRODUCT is the appropriate value of `sql-product'. The 530where PRODUCT is the appropriate value of `sql-product'. The
531product name is then followed by FEATURE-VALUE pairs. If a 531product name is then followed by FEATURE-VALUE pairs. If a
@@ -639,7 +639,7 @@ settings.")
639 "An alist of connection parameters for interacting with a SQL product. 639 "An alist of connection parameters for interacting with a SQL product.
640Each element of the alist is as follows: 640Each element of the alist is as follows:
641 641
642 \(CONNECTION \(SQL-VARIABLE VALUE) ...) 642 (CONNECTION \(SQL-VARIABLE VALUE) ...)
643 643
644Where CONNECTION is a case-insensitive string identifying the 644Where CONNECTION is a case-insensitive string identifying the
645connection, SQL-VARIABLE is the symbol name of a SQL mode 645connection, SQL-VARIABLE is the symbol name of a SQL mode
@@ -3897,14 +3897,14 @@ Here is an example for your init file. It keeps the SQLi buffer a
3897certain length. 3897certain length.
3898 3898
3899\(add-hook \\='sql-interactive-mode-hook 3899\(add-hook \\='sql-interactive-mode-hook
3900 \(function (lambda () 3900 (function (lambda ()
3901 \(setq comint-output-filter-functions \\='comint-truncate-buffer)))) 3901 (setq comint-output-filter-functions \\='comint-truncate-buffer))))
3902 3902
3903Here is another example. It will always put point back to the statement 3903Here is another example. It will always put point back to the statement
3904you entered, right above the output it created. 3904you entered, right above the output it created.
3905 3905
3906\(setq comint-output-filter-functions 3906\(setq comint-output-filter-functions
3907 \(function (lambda (STR) (comint-show-output))))" 3907 (function (lambda (STR) (comint-show-output))))"
3908 (delay-mode-hooks (comint-mode)) 3908 (delay-mode-hooks (comint-mode))
3909 3909
3910 ;; Get the `sql-product' for this interactive session. 3910 ;; Get the `sql-product' for this interactive session.
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index 5f1cb53f1dd..bce56a447f0 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -259,7 +259,7 @@ Usage:
259 259
260 INDENTATION: Typing `TAB' at the beginning of a line indents the line. 260 INDENTATION: Typing `TAB' at the beginning of a line indents the line.
261 The amount of indentation is specified by option `vera-basic-offset'. 261 The amount of indentation is specified by option `vera-basic-offset'.
262 Indentation can be done for an entire region \(`M-C-\\') or buffer (menu). 262 Indentation can be done for an entire region (`M-C-\\') or buffer (menu).
263 `TAB' always indents the line if option `vera-intelligent-tab' is nil. 263 `TAB' always indents the line if option `vera-intelligent-tab' is nil.
264 264
265 WORD/COMMAND COMPLETION: Typing `TAB' after a (not completed) word looks 265 WORD/COMMAND COMPLETION: Typing `TAB' after a (not completed) word looks
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index ac9bdd8b254..58ffba3dddb 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -2469,7 +2469,7 @@ find the errors."
2469 "\\(\\<begin\\>\\)\\|" ; 1 2469 "\\(\\<begin\\>\\)\\|" ; 1
2470 "\\(\\<else\\>\\)\\|" ; 2 2470 "\\(\\<else\\>\\)\\|" ; 2
2471 "\\(\\<end\\>\\s-+\\<else\\>\\)\\|" ; 3 2471 "\\(\\<end\\>\\s-+\\<else\\>\\)\\|" ; 3
2472 "\\(\\<always\\(?:_ff\\)?\\>\\(?:\[ \t\]*@\\)\\)\\|" ; 4 (matches always or always_ff w/ @...) 2472 "\\(\\<always\\(?:_ff\\)?\\>\\(?:[ \t]*@\\)\\)\\|" ; 4 (matches always or always_ff w/ @...)
2473 "\\(\\<always\\(?:_comb\\|_latch\\)?\\>\\)\\|" ; 5 (matches always, always_comb, always_latch w/o @...) 2473 "\\(\\<always\\(?:_comb\\|_latch\\)?\\>\\)\\|" ; 5 (matches always, always_comb, always_latch w/o @...)
2474 "\\(\\<fork\\>\\)\\|" ; 7 2474 "\\(\\<fork\\>\\)\\|" ; 7
2475 "\\(\\<if\\>\\)\\|" 2475 "\\(\\<if\\>\\)\\|"
@@ -3194,10 +3194,10 @@ See also `verilog-font-lock-extra-types'.")
3194 'font-lock-preprocessor-face 3194 'font-lock-preprocessor-face
3195 'font-lock-type-face)) 3195 'font-lock-type-face))
3196 ;; Fontify delays/numbers 3196 ;; Fontify delays/numbers
3197 '("\\(@\\)\\|\\([ \t\n\f\r]#\\s-*\\(\\(\[0-9_.\]+\\('s?[hdxbo][0-9a-fA-F_xz]*\\)?\\)\\|\\(([^()]+)\\|\\sw+\\)\\)\\)" 3197 '("\\(@\\)\\|\\([ \t\n\f\r]#\\s-*\\(\\([0-9_.]+\\('s?[hdxbo][0-9a-fA-F_xz]*\\)?\\)\\|\\(([^()]+)\\|\\sw+\\)\\)\\)"
3198 0 font-lock-type-face append) 3198 0 font-lock-type-face append)
3199 ;; Fontify property/sequence cycle delays - these start with '##' 3199 ;; Fontify property/sequence cycle delays - these start with '##'
3200 '("\\(##\\(\\sw+\\|\\[[^\]]+\\]\\)\\)" 3200 '("\\(##\\(\\sw+\\|\\[[^]]+\\]\\)\\)"
3201 0 font-lock-type-face append) 3201 0 font-lock-type-face append)
3202 ;; Fontify instantiation names 3202 ;; Fontify instantiation names
3203 '("\\([A-Za-z][A-Za-z0-9_]*\\)\\s-*(" 1 font-lock-function-name-face) 3203 '("\\([A-Za-z][A-Za-z0-9_]*\\)\\s-*(" 1 font-lock-function-name-face)
@@ -3936,7 +3936,7 @@ With optional ARG, remove existing end of line comments."
3936(defun electric-verilog-semi-with-comment () 3936(defun electric-verilog-semi-with-comment ()
3937 "Insert `;' character, reindent the line and indent for comment." 3937 "Insert `;' character, reindent the line and indent for comment."
3938 (interactive) 3938 (interactive)
3939 (insert "\;") 3939 (insert ";")
3940 (save-excursion 3940 (save-excursion
3941 (beginning-of-line) 3941 (beginning-of-line)
3942 (verilog-indent-line)) 3942 (verilog-indent-line))
@@ -4072,7 +4072,7 @@ if it reaches the end of the buffer."
4072The upper left corner is defined by point. Indices begin with 0 4072The upper left corner is defined by point. Indices begin with 0
4073and extend to the MAX - 1. If no prefix arg is given, the user 4073and extend to the MAX - 1. If no prefix arg is given, the user
4074is prompted for a value. The indices are surrounded by square 4074is prompted for a value. The indices are surrounded by square
4075brackets \[]. For example, the following code with the point 4075brackets []. For example, the following code with the point
4076located after the first 'a' gives: 4076located after the first 'a' gives:
4077 4077
4078 a = b a[ 0] = b 4078 a = b a[ 0] = b
@@ -5072,7 +5072,7 @@ Useful for creating tri's and other expanded fields."
5072 (if (verilog-within-string) 5072 (if (verilog-within-string)
5073 (re-search-forward "\"" nil t) 5073 (re-search-forward "\"" nil t)
5074 (if (verilog-in-star-comment-p) 5074 (if (verilog-in-star-comment-p)
5075 (re-search-forward "\*/" nil t) 5075 (re-search-forward "\\*/" nil t)
5076 (let ((bpt (- (point) 2))) 5076 (let ((bpt (- (point) 2)))
5077 (end-of-line) 5077 (end-of-line)
5078 (delete-region bpt (point)))))) 5078 (delete-region bpt (point))))))
@@ -5184,7 +5184,7 @@ becomes:
5184 (t 5184 (t
5185 ))) 5185 )))
5186 ((verilog-in-star-comment-p) 5186 ((verilog-in-star-comment-p)
5187 (re-search-backward "/\*") 5187 (re-search-backward "/\\*")
5188 (insert (format " // surefire lint_off_line %6s" code ))) 5188 (insert (format " // surefire lint_off_line %6s" code )))
5189 (t 5189 (t
5190 (insert (format " // surefire lint_off_line %6s" code )) 5190 (insert (format " // surefire lint_off_line %6s" code ))
@@ -6054,7 +6054,7 @@ Optional BOUND limits search."
6054 (verilog-re-search-backward "//" nil 'move) 6054 (verilog-re-search-backward "//" nil 'move)
6055 (skip-chars-backward "/")) 6055 (skip-chars-backward "/"))
6056 ((nth 4 state) ; in /* */ comment 6056 ((nth 4 state) ; in /* */ comment
6057 (verilog-re-search-backward "/\*" nil 'move)))) 6057 (verilog-re-search-backward "/\\*" nil 'move))))
6058 (narrow-to-region bound (point)) 6058 (narrow-to-region bound (point))
6059 (while (/= here (point)) 6059 (while (/= here (point))
6060 (setq here (point)) 6060 (setq here (point))
@@ -6092,7 +6092,7 @@ Optional BOUND limits search."
6092 (skip-chars-forward " \t\n\f") 6092 (skip-chars-forward " \t\n\f")
6093 ) 6093 )
6094 ((nth 4 state) ; in /* */ comment 6094 ((nth 4 state) ; in /* */ comment
6095 (verilog-re-search-forward "\*\/\\s-*" nil 'move)))) 6095 (verilog-re-search-forward "\\*/\\s-*" nil 'move))))
6096 (narrow-to-region (point) bound) 6096 (narrow-to-region (point) bound)
6097 (while (/= here (point)) 6097 (while (/= here (point))
6098 (setq here (point) 6098 (setq here (point)
@@ -6673,7 +6673,7 @@ Do not count named blocks or case-statements."
6673 (save-excursion 6673 (save-excursion
6674 (forward-line -1) 6674 (forward-line -1)
6675 (skip-chars-forward " \t") 6675 (skip-chars-forward " \t")
6676 (looking-at "\*"))) 6676 (looking-at "\\*")))
6677 (insert "* "))))) 6677 (insert "* ")))))
6678 6678
6679(defun verilog-comment-indent (&optional _arg) 6679(defun verilog-comment-indent (&optional _arg)
@@ -7078,7 +7078,7 @@ Region is defined by B and EDPOS."
7078 (beginning-of-line) 7078 (beginning-of-line)
7079 (point-marker) 7079 (point-marker)
7080 (end-of-line)))) 7080 (end-of-line))))
7081 (if (re-search-backward " /\\* \[#-\]# \[a-zA-Z\]+ \[0-9\]+ ## \\*/" b t) 7081 (if (re-search-backward " /\\* [#-]# [a-zA-Z]+ [0-9]+ ## \\*/" b t)
7082 (progn 7082 (progn
7083 (replace-match " /* -# ## */") 7083 (replace-match " /* -# ## */")
7084 (end-of-line)) 7084 (end-of-line))
@@ -8196,32 +8196,32 @@ Tieoff value uses `verilog-active-low-regexp' and
8196 (verilog-backward-open-paren) 8196 (verilog-backward-open-paren)
8197 (let (done) 8197 (let (done)
8198 (while (not done) 8198 (while (not done)
8199 (verilog-re-search-backward-quick "\\()\\|\\b[a-zA-Z0-9`_\$]\\|\\]\\)" nil nil) ; ] isn't word boundary 8199 (verilog-re-search-backward-quick "\\()\\|\\b[a-zA-Z0-9`_$]\\|\\]\\)" nil nil) ; ] isn't word boundary
8200 (cond ((looking-at ")") 8200 (cond ((looking-at ")")
8201 (verilog-backward-open-paren)) 8201 (verilog-backward-open-paren))
8202 (t (setq done t))))) 8202 (t (setq done t)))))
8203 (while (looking-at "\\]") 8203 (while (looking-at "\\]")
8204 (verilog-backward-open-bracket) 8204 (verilog-backward-open-bracket)
8205 (verilog-re-search-backward-quick "\\(\\b[a-zA-Z0-9`_\$]\\|\\]\\)" nil nil)) 8205 (verilog-re-search-backward-quick "\\(\\b[a-zA-Z0-9`_$]\\|\\]\\)" nil nil))
8206 (skip-chars-backward "a-zA-Z0-9`_$")) 8206 (skip-chars-backward "a-zA-Z0-9`_$"))
8207 8207
8208(defun verilog-read-inst-module-matcher () 8208(defun verilog-read-inst-module-matcher ()
8209 "Set match data 0 with module_name when point is inside instantiation." 8209 "Set match data 0 with module_name when point is inside instantiation."
8210 (verilog-read-inst-backward-name) 8210 (verilog-read-inst-backward-name)
8211 ;; Skip over instantiation name 8211 ;; Skip over instantiation name
8212 (verilog-re-search-backward-quick "\\(\\b[a-zA-Z0-9`_\$]\\|)\\)" nil nil) ; ) isn't word boundary 8212 (verilog-re-search-backward-quick "\\(\\b[a-zA-Z0-9`_$]\\|)\\)" nil nil) ; ) isn't word boundary
8213 ;; Check for parameterized instantiations 8213 ;; Check for parameterized instantiations
8214 (when (looking-at ")") 8214 (when (looking-at ")")
8215 (verilog-backward-open-paren) 8215 (verilog-backward-open-paren)
8216 (verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_\$]" nil nil)) 8216 (verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_$]" nil nil))
8217 (skip-chars-backward "a-zA-Z0-9'_$") 8217 (skip-chars-backward "a-zA-Z0-9'_$")
8218 ;; #1 is legal syntax for gate primitives 8218 ;; #1 is legal syntax for gate primitives
8219 (when (save-excursion 8219 (when (save-excursion
8220 (verilog-backward-syntactic-ws-quick) 8220 (verilog-backward-syntactic-ws-quick)
8221 (eq ?# (char-before))) 8221 (eq ?# (char-before)))
8222 (verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_\$]" nil nil) 8222 (verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_$]" nil nil)
8223 (skip-chars-backward "a-zA-Z0-9'_$")) 8223 (skip-chars-backward "a-zA-Z0-9'_$"))
8224 (looking-at "[a-zA-Z0-9`_\$]+") 8224 (looking-at "[a-zA-Z0-9`_$]+")
8225 ;; Important: don't use match string, this must work with Emacs 19 font-lock on 8225 ;; Important: don't use match string, this must work with Emacs 19 font-lock on
8226 (buffer-substring-no-properties (match-beginning 0) (match-end 0)) 8226 (buffer-substring-no-properties (match-beginning 0) (match-end 0))
8227 ;; Caller assumes match-beginning/match-end is still set 8227 ;; Caller assumes match-beginning/match-end is still set
@@ -8236,7 +8236,7 @@ Tieoff value uses `verilog-active-low-regexp' and
8236 "Return instance_name when point is inside instantiation." 8236 "Return instance_name when point is inside instantiation."
8237 (save-excursion 8237 (save-excursion
8238 (verilog-read-inst-backward-name) 8238 (verilog-read-inst-backward-name)
8239 (looking-at "[a-zA-Z0-9`_\$]+") 8239 (looking-at "[a-zA-Z0-9`_$]+")
8240 ;; Important: don't use match string, this must work with Emacs 19 font-lock on 8240 ;; Important: don't use match string, this must work with Emacs 19 font-lock on
8241 (buffer-substring-no-properties (match-beginning 0) (match-end 0)))) 8241 (buffer-substring-no-properties (match-beginning 0) (match-end 0))))
8242 8242
@@ -8247,7 +8247,7 @@ Tieoff value uses `verilog-active-low-regexp' and
8247 ;; Due to "module x import y (" we must search for declaration begin 8247 ;; Due to "module x import y (" we must search for declaration begin
8248 (verilog-re-search-backward-quick verilog-defun-re nil nil) 8248 (verilog-re-search-backward-quick verilog-defun-re nil nil)
8249 (goto-char (match-end 0)) 8249 (goto-char (match-end 0))
8250 (verilog-re-search-forward-quick "\\b[a-zA-Z0-9`_\$]+" nil nil) 8250 (verilog-re-search-forward-quick "\\b[a-zA-Z0-9`_$]+" nil nil)
8251 ;; Important: don't use match string, this must work with Emacs 19 font-lock on 8251 ;; Important: don't use match string, this must work with Emacs 19 font-lock on
8252 (verilog-symbol-detick 8252 (verilog-symbol-detick
8253 (buffer-substring-no-properties (match-beginning 0) (match-end 0)) t))) 8253 (buffer-substring-no-properties (match-beginning 0) (match-end 0)) t)))
@@ -8257,7 +8257,7 @@ Tieoff value uses `verilog-active-low-regexp' and
8257 (save-excursion 8257 (save-excursion
8258 (verilog-read-inst-backward-name) 8258 (verilog-read-inst-backward-name)
8259 ;; Skip over instantiation name 8259 ;; Skip over instantiation name
8260 (verilog-re-search-backward-quick "\\(\\b[a-zA-Z0-9`_\$]\\|)\\)" nil nil) ; ) isn't word boundary 8260 (verilog-re-search-backward-quick "\\(\\b[a-zA-Z0-9`_$]\\|)\\)" nil nil) ; ) isn't word boundary
8261 ;; If there are parameterized instantiations 8261 ;; If there are parameterized instantiations
8262 (when (looking-at ")") 8262 (when (looking-at ")")
8263 (let ((end-pt (point)) 8263 (let ((end-pt (point))
@@ -8265,9 +8265,9 @@ Tieoff value uses `verilog-active-low-regexp' and
8265 param-name paren-beg-pt param-value) 8265 param-name paren-beg-pt param-value)
8266 (verilog-backward-open-paren) 8266 (verilog-backward-open-paren)
8267 (while (verilog-re-search-forward-quick "\\." end-pt t) 8267 (while (verilog-re-search-forward-quick "\\." end-pt t)
8268 (verilog-re-search-forward-quick "\\([a-zA-Z0-9`_\$]\\)" nil nil) 8268 (verilog-re-search-forward-quick "\\([a-zA-Z0-9`_$]\\)" nil nil)
8269 (skip-chars-backward "a-zA-Z0-9'_$") 8269 (skip-chars-backward "a-zA-Z0-9'_$")
8270 (looking-at "[a-zA-Z0-9`_\$]+") 8270 (looking-at "[a-zA-Z0-9`_$]+")
8271 (setq param-name (buffer-substring-no-properties 8271 (setq param-name (buffer-substring-no-properties
8272 (match-beginning 0) (match-end 0))) 8272 (match-beginning 0) (match-end 0)))
8273 (verilog-re-search-forward-quick "(" nil nil) 8273 (verilog-re-search-forward-quick "(" nil nil)
@@ -10641,7 +10641,7 @@ Typing \\[verilog-inject-auto] will make this into:
10641 (save-excursion 10641 (save-excursion
10642 (goto-char (point-min)) 10642 (goto-char (point-min))
10643 ;; It's hard to distinguish modules; we'll instead search for pins. 10643 ;; It's hard to distinguish modules; we'll instead search for pins.
10644 (while (verilog-re-search-forward-quick "\\.\\s *[a-zA-Z0-9`_\$]+\\s *(\\s *[a-zA-Z0-9`_\$]+\\s *)" nil t) 10644 (while (verilog-re-search-forward-quick "\\.\\s *[a-zA-Z0-9`_$]+\\s *(\\s *[a-zA-Z0-9`_$]+\\s *)" nil t)
10645 (verilog-backward-open-paren) ; Inst start 10645 (verilog-backward-open-paren) ; Inst start
10646 (cond 10646 (cond
10647 ((= (preceding-char) ?\#) ; #(...) parameter section, not pin. Skip. 10647 ((= (preceding-char) ?\#) ; #(...) parameter section, not pin. Skip.
@@ -10656,7 +10656,7 @@ Typing \\[verilog-inject-auto] will make this into:
10656 (t 10656 (t
10657 ;; Delete identical interconnect 10657 ;; Delete identical interconnect
10658 (let ((case-fold-search nil)) ; So we don't convert upper-to-lower, etc 10658 (let ((case-fold-search nil)) ; So we don't convert upper-to-lower, etc
10659 (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_\$]+\\)*\\s *(\\s *\\1\\s *)\\s *" end-pt t) 10659 (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_$]+\\)*\\s *(\\s *\\1\\s *)\\s *" end-pt t)
10660 (delete-region (match-beginning 0) (match-end 0)) 10660 (delete-region (match-beginning 0) (match-end 0))
10661 (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ; Keep it correct 10661 (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ; Keep it correct
10662 (while (or (looking-at "[ \t\n\f,]+") 10662 (while (or (looking-at "[ \t\n\f,]+")
@@ -11153,7 +11153,7 @@ If PAR-VALUES replace final strings with these parameter values."
11153 (for-star 11153 (for-star
11154 (indent-to (+ (if (< verilog-auto-inst-column 48) 24 16) 11154 (indent-to (+ (if (< verilog-auto-inst-column 48) 24 16)
11155 verilog-auto-inst-column)) 11155 verilog-auto-inst-column))
11156 (verilog-insert " // Implicit .\*\n")) ;For some reason the . or * must be escaped... 11156 (verilog-insert " // Implicit .*\n"))
11157 (t 11157 (t
11158 (insert "\n"))))) 11158 (insert "\n")))))
11159;;(verilog-auto-inst-port (list "foo" "[5:0]") 10 (list (list "foo" "a@\"(% (+ @ 1) 4)\"a")) "3") 11159;;(verilog-auto-inst-port (list "foo" "[5:0]") 10 (list (list "foo" "a@\"(% (+ @ 1) 4)\"a")) "3")
@@ -11397,12 +11397,12 @@ Multiple Module Templates:
11397 instantiation name. 11397 instantiation name.
11398 11398
11399 If a regular expression is provided, the @ character will be replaced 11399 If a regular expression is provided, the @ character will be replaced
11400 with the first \(\) grouping that matches against the cell name. Using a 11400 with the first () grouping that matches against the cell name. Using a
11401 regexp of \"\\([0-9]+\\)\" provides identical values for @ as when no 11401 regexp of `\\([0-9]+\\)' provides identical values for @ as when no
11402 regexp is provided. If you use multiple layers of parenthesis, 11402 regexp is provided. If you use multiple layers of parenthesis,
11403 \"test\\([^0-9]+\\)_\\([0-9]+\\)\" would replace @ with non-number 11403 `test\\([^0-9]+\\)_\\([0-9]+\\)' would replace @ with non-number
11404 characters after test and before _, whereas 11404 characters after test and before _, whereas
11405 \"\\(test\\([a-z]+\\)_\\([0-9]+\\)\\)\" would replace @ with the entire 11405 `\\(test\\([a-z]+\\)_\\([0-9]+\\)\\)' would replace @ with the entire
11406 match. 11406 match.
11407 11407
11408 For example: 11408 For example:
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 6f486cf7582..9ee4ab520e1 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -376,8 +376,8 @@ Compiler:
376 Make command : command used for compilation using a Makefile 376 Make command : command used for compilation using a Makefile
377 Make options : make options (\"\\1\" inserts Makefile name) 377 Make options : make options (\"\\1\" inserts Makefile name)
378 Generate Makefile: use built-in function or command to generate a Makefile 378 Generate Makefile: use built-in function or command to generate a Makefile
379 \(\"\\1\" inserts Makefile name, \"\\2\" inserts library name) 379 (\"\\1\" inserts Makefile name, \"\\2\" inserts library name)
380 Library command : command to create library directory \(\"\\1\" inserts 380 Library command : command to create library directory (\"\\1\" inserts
381 library directory, \"\\2\" inserts library name) 381 library directory, \"\\2\" inserts library name)
382 Compile directory: where compilation is run and the Makefile is placed 382 Compile directory: where compilation is run and the Makefile is placed
383 Library directory: directory of default library 383 Library directory: directory of default library
@@ -519,9 +519,9 @@ with other user Makefiles."
519Allows you to insert user specific parts into a Makefile. 519Allows you to insert user specific parts into a Makefile.
520 520
521Example: 521Example:
522 \(lambda nil 522 (lambda nil
523 \(re-search-backward \"^# Rule for compiling entire design\") 523 (re-search-backward \"^# Rule for compiling entire design\")
524 \(insert \"# My target\\n\\n.MY_TARGET :\\n\\n\\n\"))" 524 (insert \"# My target\\n\\n.MY_TARGET :\\n\\n\\n\"))"
525 :type 'hook 525 :type 'hook
526 :group 'vhdl-compile) 526 :group 'vhdl-compile)
527 527
@@ -573,7 +573,7 @@ Is overwritten by project settings if a project is active."
573 \"\\3\" project-specific options) 573 \"\\3\" project-specific options)
574 - Do not compile: do not compile this file (in Makefile) 574 - Do not compile: do not compile this file (in Makefile)
575 Compile directory: where compilation is run and the Makefile is placed 575 Compile directory: where compilation is run and the Makefile is placed
576 \(\"\\1\" inserts compiler ID string) 576 (\"\\1\" inserts compiler ID string)
577 Library name : name of library (default is \"work\") 577 Library name : name of library (default is \"work\")
578 Library directory: path to library (\"\\1\" inserts compiler ID string) 578 Library directory: path to library (\"\\1\" inserts compiler ID string)
579 Makefile name : name of Makefile 579 Makefile name : name of Makefile
@@ -997,7 +997,7 @@ if the header needs to be version controlled.
997The following keywords for template generation are supported: 997The following keywords for template generation are supported:
998 <filename> : replaced by the name of the buffer 998 <filename> : replaced by the name of the buffer
999 <author> : replaced by the user name and email address 999 <author> : replaced by the user name and email address
1000 \(`user-full-name',`mail-host-address', `user-mail-address') 1000 (`user-full-name',`mail-host-address', `user-mail-address')
1001 <authorfull> : replaced by the user full name (`user-full-name') 1001 <authorfull> : replaced by the user full name (`user-full-name')
1002 <login> : replaced by user login name (`user-login-name') 1002 <login> : replaced by user login name (`user-login-name')
1003 <company> : replaced by contents of option `vhdl-company-name' 1003 <company> : replaced by contents of option `vhdl-company-name'
@@ -4323,7 +4323,7 @@ Usage:
4323 TEMPLATE INSERTION (electrification): 4323 TEMPLATE INSERTION (electrification):
4324 After typing a VHDL keyword and entering `SPC', you are prompted for 4324 After typing a VHDL keyword and entering `SPC', you are prompted for
4325 arguments while a template is generated for that VHDL construct. Typing 4325 arguments while a template is generated for that VHDL construct. Typing
4326 `RET' or `C-g' at the first \(mandatory) prompt aborts the current 4326 `RET' or `C-g' at the first (mandatory) prompt aborts the current
4327 template generation. Optional arguments are indicated by square 4327 template generation. Optional arguments are indicated by square
4328 brackets and removed if the queried string is left empty. Prompts for 4328 brackets and removed if the queried string is left empty. Prompts for
4329 mandatory arguments remain in the code if the queried string is left 4329 mandatory arguments remain in the code if the queried string is left
@@ -4342,7 +4342,7 @@ Usage:
4342 conf, comp, cons, func, inst, pack, sig, var. 4342 conf, comp, cons, func, inst, pack, sig, var.
4343 4343
4344 Template styles can be customized in customization group 4344 Template styles can be customized in customization group
4345 `vhdl-template' \(see OPTIONS). 4345 `vhdl-template' (see OPTIONS).
4346 4346
4347 4347
4348 HEADER INSERTION: 4348 HEADER INSERTION:
@@ -4373,7 +4373,7 @@ Usage:
4373 Typing `TAB' after `(' looks for and inserts complete parenthesized 4373 Typing `TAB' after `(' looks for and inserts complete parenthesized
4374 expressions (e.g. for array index ranges). All keywords as well as 4374 expressions (e.g. for array index ranges). All keywords as well as
4375 standard types and subprograms of VHDL have predefined abbreviations 4375 standard types and subprograms of VHDL have predefined abbreviations
4376 \(e.g. type \"std\" and `TAB' will toggle through all standard types 4376 (e.g., type \"std\" and `TAB' will toggle through all standard types
4377 beginning with \"std\"). 4377 beginning with \"std\").
4378 4378
4379 Typing `TAB' after a non-word character indents the line if at the 4379 Typing `TAB' after a non-word character indents the line if at the
@@ -4417,7 +4417,7 @@ Usage:
4417 the entire region. 4417 the entire region.
4418 4418
4419 Indentation can be done for a group of lines (`C-c C-i C-g'), a region 4419 Indentation can be done for a group of lines (`C-c C-i C-g'), a region
4420 \(`M-C-\\') or the entire buffer (menu). Argument and port lists are 4420 (`M-C-\\') or the entire buffer (menu). Argument and port lists are
4421 indented normally (nil) or relative to the opening parenthesis (non-nil) 4421 indented normally (nil) or relative to the opening parenthesis (non-nil)
4422 according to option `vhdl-argument-list-indent'. 4422 according to option `vhdl-argument-list-indent'.
4423 4423
@@ -4563,7 +4563,7 @@ Usage:
4563 Enables simple structural composition. `C-c C-m C-n' creates a skeleton 4563 Enables simple structural composition. `C-c C-m C-n' creates a skeleton
4564 for a new component. Subcomponents (i.e. component declaration and 4564 for a new component. Subcomponents (i.e. component declaration and
4565 instantiation) can be automatically placed from a previously read port 4565 instantiation) can be automatically placed from a previously read port
4566 \(`C-c C-m C-p') or directly from the hierarchy browser (`P'). Finally, 4566 (`C-c C-m C-p') or directly from the hierarchy browser (`P'). Finally,
4567 all subcomponents can be automatically connected using internal signals 4567 all subcomponents can be automatically connected using internal signals
4568 and ports (`C-c C-m C-w') following these rules: 4568 and ports (`C-c C-m C-w') following these rules:
4569 - subcomponent actual ports with same name are considered to be 4569 - subcomponent actual ports with same name are considered to be
@@ -4763,7 +4763,7 @@ Usage:
4763 Insert them once manually (will be kept afterwards). 4763 Insert them once manually (will be kept afterwards).
4764 - Out parameters of procedures are considered to be read. 4764 - Out parameters of procedures are considered to be read.
4765 Use option `vhdl-entity-file-name' to specify the entity file name 4765 Use option `vhdl-entity-file-name' to specify the entity file name
4766 \(used to obtain the port names). 4766 (used to obtain the port names).
4767 Use option `vhdl-array-index-record-field-in-sensitivity-list' to 4767 Use option `vhdl-array-index-record-field-in-sensitivity-list' to
4768 specify whether to include array indices and record fields in 4768 specify whether to include array indices and record fields in
4769 sensitivity lists. 4769 sensitivity lists.
@@ -4771,12 +4771,12 @@ Usage:
4771 4771
4772 CODE FIXING: 4772 CODE FIXING:
4773 `C-c C-x C-p' fixes the closing parenthesis of a generic/port clause 4773 `C-c C-x C-p' fixes the closing parenthesis of a generic/port clause
4774 \(e.g. if the closing parenthesis is on the wrong line or is missing). 4774 (e.g., if the closing parenthesis is on the wrong line or is missing).
4775 4775
4776 4776
4777 PRINTING: 4777 PRINTING:
4778 PostScript printing with different faces (an optimized set of faces is 4778 PostScript printing with different faces (an optimized set of faces is
4779 used if `vhdl-print-customize-faces' is non-nil) or colors \(if 4779 used if `vhdl-print-customize-faces' is non-nil) or colors (if
4780 `ps-print-color-p' is non-nil) is possible using the standard Emacs 4780 `ps-print-color-p' is non-nil) is possible using the standard Emacs
4781 PostScript printing commands. Option `vhdl-print-two-column' defines 4781 PostScript printing commands. Option `vhdl-print-two-column' defines
4782 appropriate default settings for nice landscape two-column printing. 4782 appropriate default settings for nice landscape two-column printing.
@@ -4808,7 +4808,7 @@ Usage:
4808 automatically recognized as VHDL source files. To add an extension 4808 automatically recognized as VHDL source files. To add an extension
4809 \".xxx\", add the following line to your Emacs start-up file (`.emacs'): 4809 \".xxx\", add the following line to your Emacs start-up file (`.emacs'):
4810 4810
4811 \(push \\='(\"\\\\.xxx\\\\\\='\" . vhdl-mode) auto-mode-alist) 4811 (push \\='(\"\\\\.xxx\\\\\\='\" . vhdl-mode) auto-mode-alist)
4812 4812
4813 4813
4814 HINTS: 4814 HINTS:
@@ -4895,7 +4895,7 @@ Key bindings:
4895 (syntax-propertize-rules 4895 (syntax-propertize-rules
4896 ;; Mark single quotes as having string quote syntax in 4896 ;; Mark single quotes as having string quote syntax in
4897 ;; 'c' instances. 4897 ;; 'c' instances.
4898 ("\\(\'\\).\\(\'\\)" (1 "\"'") (2 "\"'")))) 4898 ("\\('\\).\\('\\)" (1 "\"'") (2 "\"'"))))
4899 (set (make-local-variable 'font-lock-syntactic-keywords) 4899 (set (make-local-variable 'font-lock-syntactic-keywords)
4900 vhdl-font-lock-syntactic-keywords)) 4900 vhdl-font-lock-syntactic-keywords))
4901 (unless vhdl-emacs-21 4901 (unless vhdl-emacs-21
@@ -6707,7 +6707,7 @@ search, and an argument indicating an interactive call."
6707 (re-search-forward vhdl-e-o-s-re)) 6707 (re-search-forward vhdl-e-o-s-re))
6708 6708
6709(defconst vhdl-b-o-s-re 6709(defconst vhdl-b-o-s-re
6710 (concat ";[^_]\\|\([^_]\\|\)[^_]\\|\\bwhen\\b[^_]\\|" 6710 (concat ";[^_]\\|([^_]\\|)[^_]\\|\\bwhen\\b[^_]\\|"
6711 vhdl-begin-bwd-re "\\|" vhdl-statement-bwd-re)) 6711 vhdl-begin-bwd-re "\\|" vhdl-statement-bwd-re))
6712 6712
6713(defun vhdl-beginning-of-statement-1 (&optional lim) 6713(defun vhdl-beginning-of-statement-1 (&optional lim)
@@ -8061,25 +8061,25 @@ end of line, do nothing in comments and strings."
8061 (setq end (point-marker)) 8061 (setq end (point-marker))
8062 ;; have no space before and one space after `,' and ';' 8062 ;; have no space before and one space after `,' and ';'
8063 (goto-char beg) 8063 (goto-char beg)
8064 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\(\\s-*\\([,;]\\)\\)" end t) 8064 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|'.'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\(\\s-*\\([,;]\\)\\)" end t)
8065 (if (match-string 1) 8065 (if (match-string 1)
8066 (goto-char (match-end 1)) 8066 (goto-char (match-end 1))
8067 (replace-match "\\3 " nil nil nil 2))) 8067 (replace-match "\\3 " nil nil nil 2)))
8068 ;; have no space after `(' 8068 ;; have no space after `('
8069 (goto-char beg) 8069 (goto-char beg)
8070 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\((\\)\\s-+" end t) 8070 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|'.'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\((\\)\\s-+" end t)
8071 (if (match-string 1) 8071 (if (match-string 1)
8072 (goto-char (match-end 1)) 8072 (goto-char (match-end 1))
8073 (replace-match "\\2"))) 8073 (replace-match "\\2")))
8074 ;; have no space before `)' 8074 ;; have no space before `)'
8075 (goto-char beg) 8075 (goto-char beg)
8076 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\\|\\\\[^\\\n]*[\\\n]\\|^\\s-+\\)\\|\\s-+\\()\\)" end t) 8076 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|'.'\\|\\\\[^\\\n]*[\\\n]\\|^\\s-+\\)\\|\\s-+\\()\\)" end t)
8077 (if (match-string 1) 8077 (if (match-string 1)
8078 (goto-char (match-end 1)) 8078 (goto-char (match-end 1))
8079 (replace-match "\\2"))) 8079 (replace-match "\\2")))
8080 ;; surround operator symbols by one space 8080 ;; surround operator symbols by one space
8081 (goto-char beg) 8081 (goto-char beg)
8082 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\(\\([^/:<>=\n]\\)\\(:\\|\\??=\\|\\??<<\\|\\??>>\\|\\??<\\|\\??>\\|:=\\|\\??<=\\|\\??>=\\|=>\\|\\??/=\\|\\?\\?\\)\\([^=>\n]\\|$\\)\\)" end t) 8082 (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|'.'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\(\\([^/:<>=\n]\\)\\(:\\|\\??=\\|\\??<<\\|\\??>>\\|\\??<\\|\\??>\\|:=\\|\\??<=\\|\\??>=\\|=>\\|\\??/=\\|\\?\\?\\)\\([^=>\n]\\|$\\)\\)" end t)
8083 (if (or (match-string 1) 8083 (if (or (match-string 1)
8084 (<= (match-beginning 0) ; not if at boi 8084 (<= (match-beginning 0) ; not if at boi
8085 (save-excursion (back-to-indentation) (point)))) 8085 (save-excursion (back-to-indentation) (point))))
@@ -11858,7 +11858,7 @@ reflected in a subsequent paste operation."
11858 (save-excursion 11858 (save-excursion
11859 (re-search-backward 11859 (re-search-backward
11860 (concat "^\\s-*use\\s-+" (car clause) 11860 (concat "^\\s-*use\\s-+" (car clause)
11861 "\." (cdr clause) "\\>") nil t))) 11861 "." (cdr clause) "\\>") nil t)))
11862 (vhdl-template-standard-package (car clause) (cdr clause)) 11862 (vhdl-template-standard-package (car clause) (cdr clause))
11863 (insert "\n")) 11863 (insert "\n"))
11864 (setq clause-list (cdr clause-list))))) 11864 (setq clause-list (cdr clause-list)))))
@@ -12113,7 +12113,7 @@ reflected in a subsequent paste operation."
12113 (insert name)) 12113 (insert name))
12114 ((equal (cdr vhdl-instance-name) "") 12114 ((equal (cdr vhdl-instance-name) "")
12115 (setq name (vhdl-template-field "instance name"))) 12115 (setq name (vhdl-template-field "instance name")))
12116 ((string-match "\%d" (cdr vhdl-instance-name)) 12116 ((string-match "%d" (cdr vhdl-instance-name))
12117 (let ((n 1)) 12117 (let ((n 1))
12118 (while (save-excursion 12118 (while (save-excursion
12119 (setq name (format (vhdl-replace-string 12119 (setq name (format (vhdl-replace-string
@@ -12978,7 +12978,7 @@ File statistics: \"%s\"\n\
12978# empty lines : %5d\n\ 12978# empty lines : %5d\n\
12979# comment lines : %5d\n\ 12979# comment lines : %5d\n\
12980# comments : %5d\n\ 12980# comments : %5d\n\
12981# total lines : %5d\n\ " 12981# total lines : %5d\n"
12982 (buffer-file-name) no-stats no-code-lines no-empty-lines 12982 (buffer-file-name) no-stats no-code-lines no-empty-lines
12983 no-comm-lines no-comments no-lines) 12983 no-comm-lines no-comments no-lines)
12984 (unless vhdl-emacs-21 (vhdl-show-messages)))) 12984 (unless vhdl-emacs-21 (vhdl-show-messages))))
@@ -13121,7 +13121,7 @@ File statistics: \"%s\"\n\
13121 (vhdl-resolve-env-variable 13121 (vhdl-resolve-env-variable
13122 (vhdl-replace-string 13122 (vhdl-replace-string
13123 (cons "\\(.*\\) \\(.*\\)" (car file-name-list)) 13123 (cons "\\(.*\\) \\(.*\\)" (car file-name-list))
13124 (concat "\*" " " (user-login-name))))))) 13124 (concat "* " (user-login-name)))))))
13125 (setq list-length (or list-length (length file-list))) 13125 (setq list-length (or list-length (length file-list)))
13126 (setq file-name-list (cdr file-name-list))) 13126 (setq file-name-list (cdr file-name-list)))
13127 (while file-list 13127 (while file-list
@@ -13306,7 +13306,7 @@ File statistics: \"%s\"\n\
13306;; Syntax definitions 13306;; Syntax definitions
13307 13307
13308(defconst vhdl-font-lock-syntactic-keywords 13308(defconst vhdl-font-lock-syntactic-keywords
13309 '(("\\(\'\\).\\(\'\\)" (1 (7 . ?\')) (2 (7 . ?\')))) 13309 '(("\\('\\).\\('\\)" (1 (7 . ?\')) (2 (7 . ?\'))))
13310 "Mark single quotes as having string quote syntax in 'c' instances.") 13310 "Mark single quotes as having string quote syntax in 'c' instances.")
13311 13311
13312(defvar vhdl-font-lock-keywords nil 13312(defvar vhdl-font-lock-keywords nil
@@ -15461,19 +15461,19 @@ NO-POSITION non-nil means do not re-position cursor."
15461 (let* ((file-entry (vhdl-aget file-alist 15461 (let* ((file-entry (vhdl-aget file-alist
15462 speedbar-last-selected-file))) 15462 speedbar-last-selected-file)))
15463 (vhdl-speedbar-update-units 15463 (vhdl-speedbar-update-units
15464 "\\[.\\] " (nth 0 file-entry) 15464 "\\[.] " (nth 0 file-entry)
15465 speedbar-last-selected-file 'vhdl-speedbar-entity-face) 15465 speedbar-last-selected-file 'vhdl-speedbar-entity-face)
15466 (vhdl-speedbar-update-units 15466 (vhdl-speedbar-update-units
15467 "{.} " (nth 1 file-entry) 15467 "{.} " (nth 1 file-entry)
15468 speedbar-last-selected-file 'vhdl-speedbar-architecture-face) 15468 speedbar-last-selected-file 'vhdl-speedbar-architecture-face)
15469 (vhdl-speedbar-update-units 15469 (vhdl-speedbar-update-units
15470 "\\[.\\] " (nth 3 file-entry) 15470 "\\[.] " (nth 3 file-entry)
15471 speedbar-last-selected-file 'vhdl-speedbar-configuration-face) 15471 speedbar-last-selected-file 'vhdl-speedbar-configuration-face)
15472 (vhdl-speedbar-update-units 15472 (vhdl-speedbar-update-units
15473 "[]>] " (nth 4 file-entry) 15473 "[]>] " (nth 4 file-entry)
15474 speedbar-last-selected-file 'vhdl-speedbar-package-face) 15474 speedbar-last-selected-file 'vhdl-speedbar-package-face)
15475 (vhdl-speedbar-update-units 15475 (vhdl-speedbar-update-units
15476 "\\[.\\].+(" '("body") 15476 "\\[.].+(" '("body")
15477 speedbar-last-selected-file 'vhdl-speedbar-package-face) 15477 speedbar-last-selected-file 'vhdl-speedbar-package-face)
15478 (vhdl-speedbar-update-units 15478 (vhdl-speedbar-update-units
15479 "> " (nth 6 file-entry) 15479 "> " (nth 6 file-entry)
@@ -15482,19 +15482,19 @@ NO-POSITION non-nil means do not re-position cursor."
15482 (let* ((file-entry (vhdl-aget file-alist file-name))) 15482 (let* ((file-entry (vhdl-aget file-alist file-name)))
15483 (setq 15483 (setq
15484 pos (vhdl-speedbar-update-units 15484 pos (vhdl-speedbar-update-units
15485 "\\[.\\] " (nth 0 file-entry) 15485 "\\[.] " (nth 0 file-entry)
15486 file-name 'vhdl-speedbar-entity-selected-face pos) 15486 file-name 'vhdl-speedbar-entity-selected-face pos)
15487 pos (vhdl-speedbar-update-units 15487 pos (vhdl-speedbar-update-units
15488 "{.} " (nth 1 file-entry) 15488 "{.} " (nth 1 file-entry)
15489 file-name 'vhdl-speedbar-architecture-selected-face pos) 15489 file-name 'vhdl-speedbar-architecture-selected-face pos)
15490 pos (vhdl-speedbar-update-units 15490 pos (vhdl-speedbar-update-units
15491 "\\[.\\] " (nth 3 file-entry) 15491 "\\[.] " (nth 3 file-entry)
15492 file-name 'vhdl-speedbar-configuration-selected-face pos) 15492 file-name 'vhdl-speedbar-configuration-selected-face pos)
15493 pos (vhdl-speedbar-update-units 15493 pos (vhdl-speedbar-update-units
15494 "[]>] " (nth 4 file-entry) 15494 "[]>] " (nth 4 file-entry)
15495 file-name 'vhdl-speedbar-package-selected-face pos) 15495 file-name 'vhdl-speedbar-package-selected-face pos)
15496 pos (vhdl-speedbar-update-units 15496 pos (vhdl-speedbar-update-units
15497 "\\[.\\].+(" '("body") 15497 "\\[.].+(" '("body")
15498 file-name 'vhdl-speedbar-package-selected-face pos) 15498 file-name 'vhdl-speedbar-package-selected-face pos)
15499 pos (vhdl-speedbar-update-units 15499 pos (vhdl-speedbar-update-units
15500 "> " (nth 6 file-entry) 15500 "> " (nth 6 file-entry)
@@ -15926,7 +15926,7 @@ is already shown in a buffer."
15926 (if (not (or is-entity (vhdl-speedbar-check-unit 'subprogram))) 15926 (if (not (or is-entity (vhdl-speedbar-check-unit 'subprogram)))
15927 (error "ERROR: No entity/component or subprogram under cursor") 15927 (error "ERROR: No entity/component or subprogram under cursor")
15928 (beginning-of-line) 15928 (beginning-of-line)
15929 (if (looking-at "\\([0-9]\\)+:\\s-*\\(\\[[-+?]\\]\\|>\\) \\(\\(\\w\\|\\s_\\)+\\)") 15929 (if (looking-at "\\([0-9]\\)+:\\s-*\\(\\[[-+?]]\\|>\\) \\(\\(\\w\\|\\s_\\)+\\)")
15930 (condition-case info 15930 (condition-case info
15931 (let ((token (get-text-property 15931 (let ((token (get-text-property
15932 (match-beginning 3) 'speedbar-token))) 15932 (match-beginning 3) 'speedbar-token)))
@@ -17864,17 +17864,17 @@ NOTE: click `mouse-2' on variable names above (not in XEmacs).")
17864For VHDL coding style and naming convention guidelines, see the following 17864For VHDL coding style and naming convention guidelines, see the following
17865references: 17865references:
17866 17866
17867\[1] Ben Cohen. 17867[1] Ben Cohen.
17868 \"VHDL Coding Styles and Methodologies\". 17868 \"VHDL Coding Styles and Methodologies\".
17869 Kluwer Academic Publishers, 1999. 17869 Kluwer Academic Publishers, 1999.
17870 http://members.aol.com/vhdlcohen/vhdl/ 17870 http://members.aol.com/vhdlcohen/vhdl/
17871 17871
17872\[2] Michael Keating and Pierre Bricaud. 17872[2] Michael Keating and Pierre Bricaud.
17873 \"Reuse Methodology Manual, Second Edition\". 17873 \"Reuse Methodology Manual, Second Edition\".
17874 Kluwer Academic Publishers, 1999. 17874 Kluwer Academic Publishers, 1999.
17875 http://www.openmore.com/openmore/rmm2.html 17875 http://www.openmore.com/openmore/rmm2.html
17876 17876
17877\[3] European Space Agency. 17877[3] European Space Agency.
17878 \"VHDL Modelling Guidelines\". 17878 \"VHDL Modelling Guidelines\".
17879 ftp://ftp.estec.esa.nl/pub/vhdl/doc/ModelGuide.{pdf,ps} 17879 ftp://ftp.estec.esa.nl/pub/vhdl/doc/ModelGuide.{pdf,ps}
17880 17880
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index d5243dac769..cf61073b442 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -347,9 +347,9 @@ the command interpreter stack:
347 347
348Some possible command interpreter types and their meanings are: 348Some possible command interpreter types and their meanings are:
349 349
350\[Evaluator] read-eval-print loop for evaluating expressions 350[Evaluator] read-eval-print loop for evaluating expressions
351\[Debugger] single character commands for debugging errors 351[Debugger] single character commands for debugging errors
352\[Where] single character commands for examining environments 352[Where] single character commands for examining environments
353 353
354Starting with release 6.2 of Scheme, the latter two types of command 354Starting with release 6.2 of Scheme, the latter two types of command
355interpreters will change the major mode of the Scheme process buffer 355interpreters will change the major mode of the Scheme process buffer
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 218a02a7f6d..e9294279c23 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1684,7 +1684,7 @@ non-default settings would be \"LPT1\" to \"LPT3\" for parallel printers, or
1684for a shared network printer. You can also set it to a name of a file, in 1684for a shared network printer. You can also set it to a name of a file, in
1685which case the output gets appended to that file. \(Note that `ps-print' 1685which case the output gets appended to that file. \(Note that `ps-print'
1686package already has facilities for printing to a file, so you might as well use 1686package already has facilities for printing to a file, so you might as well use
1687them instead of changing the setting of this variable.\) If you want to 1687them instead of changing the setting of this variable.) If you want to
1688silently discard the printed output, set this to \"NUL\". 1688silently discard the printed output, set this to \"NUL\".
1689 1689
1690Set to t, if the utility given by `ps-lpr-command' needs an empty printer name. 1690Set to t, if the utility given by `ps-lpr-command' needs an empty printer name.
@@ -3172,7 +3172,7 @@ This variable is used only when `ps-print-color-p' is set to `black-white'."
3172 font-lock-variable-name-face 3172 font-lock-variable-name-face
3173 font-lock-keyword-face 3173 font-lock-keyword-face
3174 font-lock-warning-face)) 3174 font-lock-warning-face))
3175 "A list of the \(non-bold\) faces that should be printed in bold font. 3175 "A list of the (non-bold) faces that should be printed in bold font.
3176This applies to generating PostScript." 3176This applies to generating PostScript."
3177 :type '(repeat face) 3177 :type '(repeat face)
3178 :version "20" 3178 :version "20"
@@ -3185,7 +3185,7 @@ This applies to generating PostScript."
3185 font-lock-string-face 3185 font-lock-string-face
3186 font-lock-comment-face 3186 font-lock-comment-face
3187 font-lock-warning-face)) 3187 font-lock-warning-face))
3188 "A list of the \(non-italic\) faces that should be printed in italic font. 3188 "A list of the (non-italic) faces that should be printed in italic font.
3189This applies to generating PostScript." 3189This applies to generating PostScript."
3190 :type '(repeat face) 3190 :type '(repeat face)
3191 :version "20" 3191 :version "20"
@@ -3196,7 +3196,7 @@ This applies to generating PostScript."
3196 '(font-lock-function-name-face 3196 '(font-lock-function-name-face
3197 font-lock-constant-face 3197 font-lock-constant-face
3198 font-lock-warning-face)) 3198 font-lock-warning-face))
3199 "A list of the \(non-underlined\) faces that should be printed underlined. 3199 "A list of the (non-underlined) faces that should be printed underlined.
3200This applies to generating PostScript." 3200This applies to generating PostScript."
3201 :type '(repeat face) 3201 :type '(repeat face)
3202 :version "20" 3202 :version "20"
diff --git a/lisp/sort.el b/lisp/sort.el
index 9b8cec6ac68..9843749f0c8 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -316,7 +316,7 @@ FIELD, BEG and END. BEG and END specify region to sort."
316;; (point) 316;; (point)
317;; (save-excursion 317;; (save-excursion
318;; (re-search-forward 318;; (re-search-forward
319;; "[+-]?[0-9]*\.?[0-9]*\\([eE][+-]?[0-9]+\\)?") 319;; "[+-]?[0-9]*\\.?[0-9]*\\([eE][+-]?[0-9]+\\)?")
320;; (point)))))) 320;; (point))))))
321;; nil)) 321;; nil))
322 322
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 97c977cf1fc..17430587818 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2857,7 +2857,7 @@ indicator, then do not add a space."
2857 (progn 2857 (progn
2858 (goto-char speedbar-ro-to-do-point) 2858 (goto-char speedbar-ro-to-do-point)
2859 (while (and (not (input-pending-p)) 2859 (while (and (not (input-pending-p))
2860 (re-search-forward "^\\([0-9]+\\):\\s-*[[<][+-\?][]>] " 2860 (re-search-forward "^\\([0-9]+\\):\\s-*[[<][+-?][]>] "
2861 nil t)) 2861 nil t))
2862 (setq speedbar-ro-to-do-point (point)) 2862 (setq speedbar-ro-to-do-point (point))
2863 (let ((f (speedbar-line-file))) 2863 (let ((f (speedbar-line-file)))
diff --git a/lisp/startup.el b/lisp/startup.el
index 971841fc0db..33855673170 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -114,7 +114,7 @@ the remaining command-line args are in the variable `command-line-args-left'.")
114 114
115(defvaralias 'argv 'command-line-args-left 115(defvaralias 'argv 'command-line-args-left
116 "List of command-line args not yet processed. 116 "List of command-line args not yet processed.
117This is a convenience alias, so that one can write \(pop argv\) 117This is a convenience alias, so that one can write \(pop argv)
118inside of --eval command line arguments in order to access 118inside of --eval command line arguments in order to access
119following arguments.") 119following arguments.")
120(internal-make-var-non-special 'argv) 120(internal-make-var-non-special 'argv)
@@ -1970,7 +1970,7 @@ To quit a partially entered command, type Control-g.\n")
1970 'action (lambda (_button) (info-emacs-manual)) 1970 'action (lambda (_button) (info-emacs-manual))
1971 'follow-link t) 1971 'follow-link t)
1972 (insert "\tView the Emacs manual using Info\n") 1972 (insert "\tView the Emacs manual using Info\n")
1973 (insert-button "\(Non)Warranty" 1973 (insert-button "(Non)Warranty"
1974 'action (lambda (_button) (describe-no-warranty)) 1974 'action (lambda (_button) (describe-no-warranty))
1975 'follow-link t) 1975 'follow-link t)
1976 (insert "\t\tGNU Emacs comes with ABSOLUTELY NO WARRANTY\n") 1976 (insert "\t\tGNU Emacs comes with ABSOLUTELY NO WARRANTY\n")
diff --git a/lisp/term.el b/lisp/term.el
index 06a44f29058..e5ae5530ce9 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1919,7 +1919,7 @@ A useful command to bind to SPC. See `term-replace-by-expanded-history'."
1919(defun term-within-quotes (beg end) 1919(defun term-within-quotes (beg end)
1920 "Return t if the number of quotes between BEG and END is odd. 1920 "Return t if the number of quotes between BEG and END is odd.
1921Quotes are single and double." 1921Quotes are single and double."
1922 (let ((countsq (term-how-many-region "\\(^\\|[^\\\\]\\)\'" beg end)) 1922 (let ((countsq (term-how-many-region "\\(^\\|[^\\\\]\\)'" beg end))
1923 (countdq (term-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) 1923 (countdq (term-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end)))
1924 (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) 1924 (or (= (mod countsq 2) 1) (= (mod countdq 2) 1))))
1925 1925
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 279f657c0ec..df8066ee2fc 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -433,7 +433,7 @@ is present; but these fields are required otherwise.
433OPTIONAL is a list of optional fields. 433OPTIONAL is a list of optional fields.
434 434
435Each element of these lists is a list of the form 435Each element of these lists is a list of the form
436 \(FIELD COMMENT INIT ALTERNATIVE). 436 (FIELD COMMENT INIT ALTERNATIVE).
437COMMENT, INIT, and ALTERNATIVE are optional. 437COMMENT, INIT, and ALTERNATIVE are optional.
438 438
439FIELD is the name of the field. 439FIELD is the name of the field.
@@ -2620,7 +2620,7 @@ is returned unchanged."
2620 "Get content of BibTeX field FIELD. Return empty string if not found. 2620 "Get content of BibTeX field FIELD. Return empty string if not found.
2621Optional arg CHANGE-LIST is a list of substitution patterns that is 2621Optional arg CHANGE-LIST is a list of substitution patterns that is
2622applied to the content of FIELD. It is an alist with pairs 2622applied to the content of FIELD. It is an alist with pairs
2623\(OLD-REGEXP . NEW-STRING\)." 2623\(OLD-REGEXP . NEW-STRING)."
2624 (let* ((bibtex-expand-strings bibtex-autokey-expand-strings) 2624 (let* ((bibtex-expand-strings bibtex-autokey-expand-strings)
2625 (content (bibtex-text-in-field field bibtex-autokey-use-crossref)) 2625 (content (bibtex-text-in-field field bibtex-autokey-use-crossref))
2626 case-fold-search) 2626 case-fold-search)
@@ -3647,7 +3647,7 @@ If optional arg CONTENT is non-nil extract content of text fields."
3647(defun bibtex-autofill-entry () 3647(defun bibtex-autofill-entry ()
3648 "Try to fill fields of current BibTeX entry based on neighboring entries. 3648 "Try to fill fields of current BibTeX entry based on neighboring entries.
3649The current entry must have a key. Determine the neighboring entry 3649The current entry must have a key. Determine the neighboring entry
3650\(previous or next\) whose key is more similar to the key of the current 3650\(previous or next) whose key is more similar to the key of the current
3651entry. For all empty fields of the current entry insert the corresponding 3651entry. For all empty fields of the current entry insert the corresponding
3652field contents of the neighboring entry. Finally try to update the text 3652field contents of the neighboring entry. Finally try to update the text
3653based on the difference between the keys of the neighboring and the current 3653based on the difference between the keys of the neighboring and the current
@@ -5111,7 +5111,7 @@ entries from minibuffer."
5111 "Browse a URL for the BibTeX entry at point. 5111 "Browse a URL for the BibTeX entry at point.
5112Optional POS is the location of the BibTeX entry. 5112Optional POS is the location of the BibTeX entry.
5113The URL is generated using the schemes defined in `bibtex-generate-url-list' 5113The URL is generated using the schemes defined in `bibtex-generate-url-list'
5114\(see there\). If multiple schemes match for this entry, or the same scheme 5114\(see there). If multiple schemes match for this entry, or the same scheme
5115matches more than once, use the one for which the first step's match is the 5115matches more than once, use the one for which the first step's match is the
5116closest to POS. The URL is passed to `browse-url' unless NO-BROWSE is t. 5116closest to POS. The URL is passed to `browse-url' unless NO-BROWSE is t.
5117Return the URL or nil if none can be generated." 5117Return the URL or nil if none can be generated."
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 267d23f38de..770571a264e 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -434,7 +434,7 @@ For details see `conf-mode'. Example:
434 434
435# Conf mode font-locks this right on Unix and with \\[conf-unix-mode] 435# Conf mode font-locks this right on Unix and with \\[conf-unix-mode]
436 436
437\[Desktop Entry] 437[Desktop Entry]
438 Encoding=UTF-8 438 Encoding=UTF-8
439 Name=The GIMP 439 Name=The GIMP
440 Name[ca]=El GIMP 440 Name[ca]=El GIMP
@@ -449,11 +449,11 @@ For details see `conf-mode'. Example:
449 449
450; Conf mode font-locks this right on Windows and with \\[conf-windows-mode] 450; Conf mode font-locks this right on Windows and with \\[conf-windows-mode]
451 451
452\[ExtShellFolderViews] 452[ExtShellFolderViews]
453Default={5984FFE0-28D4-11CF-AE66-08002B2E1262} 453Default={5984FFE0-28D4-11CF-AE66-08002B2E1262}
454{5984FFE0-28D4-11CF-AE66-08002B2E1262}={5984FFE0-28D4-11CF-AE66-08002B2E1262} 454{5984FFE0-28D4-11CF-AE66-08002B2E1262}={5984FFE0-28D4-11CF-AE66-08002B2E1262}
455 455
456\[{5984FFE0-28D4-11CF-AE66-08002B2E1262}] 456[{5984FFE0-28D4-11CF-AE66-08002B2E1262}]
457PersistMoniker=file://Folder.htt" 457PersistMoniker=file://Folder.htt"
458 (conf-mode-initialize ";")) 458 (conf-mode-initialize ";"))
459 459
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 639456dc77e..aa5469e3465 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -265,7 +265,7 @@
265 "\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids 265 "\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids
266 css-pseudo-element-ids) t) 266 css-pseudo-element-ids) t)
267 "\\|\\::" (regexp-opt css-pseudo-element-ids t) "\\)" 267 "\\|\\::" (regexp-opt css-pseudo-element-ids t) "\\)"
268 "\\(?:([^\)]+)\\)?" 268 "\\(?:([^)]+)\\)?"
269 (if (not sassy) 269 (if (not sassy)
270 "[^:{}\n]*" 270 "[^:{}\n]*"
271 (concat "[^:{}\n#]*\\(?:" scss--hash-re "[^:{}\n#]*\\)*")) 271 (concat "[^:{}\n#]*\\(?:" scss--hash-re "[^:{}\n#]*\\)*"))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 87c2a95da49..fe27f0f158c 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -699,8 +699,8 @@ re-start Emacs."
699 699
700Each element of this list is also a list: 700Each element of this list is also a list:
701 701
702\(DICTIONARY-NAME CASECHARS NOT-CASECHARS OTHERCHARS MANY-OTHERCHARS-P 702 (DICTIONARY-NAME CASECHARS NOT-CASECHARS OTHERCHARS MANY-OTHERCHARS-P
703 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\) 703 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET)
704 704
705DICTIONARY-NAME is a possible string value of variable `ispell-dictionary', 705DICTIONARY-NAME is a possible string value of variable `ispell-dictionary',
706nil means the default dictionary. 706nil means the default dictionary.
@@ -747,7 +747,7 @@ when the language uses non-ASCII characters.
747Note that with \"ispell\" as the speller, the CASECHARS and 747Note that with \"ispell\" as the speller, the CASECHARS and
748OTHERCHARS slots of the alist should contain the same character 748OTHERCHARS slots of the alist should contain the same character
749set as casechars and otherchars in the LANGUAGE.aff file \(e.g., 749set as casechars and otherchars in the LANGUAGE.aff file \(e.g.,
750english.aff\). Aspell and Hunspell don't have this limitation.") 750english.aff). Aspell and Hunspell don't have this limitation.")
751 751
752(defvar ispell-really-aspell nil 752(defvar ispell-really-aspell nil
753 "Non-nil if we can use Aspell extensions.") 753 "Non-nil if we can use Aspell extensions.")
@@ -2024,7 +2024,7 @@ in a window allowing you to choose one.
2024 2024
2025If optional argument FOLLOWING is non-nil or if `ispell-following-word' 2025If optional argument FOLLOWING is non-nil or if `ispell-following-word'
2026is non-nil when called interactively, then the following word 2026is non-nil when called interactively, then the following word
2027\(rather than preceding\) is checked when the cursor is not over a word. 2027\(rather than preceding) is checked when the cursor is not over a word.
2028When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil 2028When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil
2029when called interactively, non-corrective messages are suppressed. 2029when called interactively, non-corrective messages are suppressed.
2030 2030
@@ -2044,7 +2044,7 @@ Return values:
2044nil word is correct or spelling is accepted. 2044nil word is correct or spelling is accepted.
20450 word is inserted into buffer-local definitions. 20450 word is inserted into buffer-local definitions.
2046\"word\" word corrected from word list. 2046\"word\" word corrected from word list.
2047\(\"word\" arg\) word is hand entered. 2047\(\"word\" arg) word is hand entered.
2048quit spell session exited." 2048quit spell session exited."
2049 (interactive (list ispell-following-word ispell-quietly current-prefix-arg t)) 2049 (interactive (list ispell-following-word ispell-quietly current-prefix-arg t))
2050 (cond 2050 (cond
@@ -2162,7 +2162,7 @@ quit spell session exited."
2162 "Return the word for spell-checking according to ispell syntax. 2162 "Return the word for spell-checking according to ispell syntax.
2163If optional argument FOLLOWING is non-nil or if `ispell-following-word' 2163If optional argument FOLLOWING is non-nil or if `ispell-following-word'
2164is non-nil when called interactively, then the following word 2164is non-nil when called interactively, then the following word
2165\(rather than preceding\) is checked when the cursor is not over a word. 2165\(rather than preceding) is checked when the cursor is not over a word.
2166Optional second argument contains otherchars that can be included in word 2166Optional second argument contains otherchars that can be included in word
2167many times (see the doc string of `ispell-dictionary-alist' for details 2167many times (see the doc string of `ispell-dictionary-alist' for details
2168about otherchars). 2168about otherchars).
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index b9b72ea644f..0ca4cbefe93 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -228,7 +228,7 @@ nonsensical results."
228 "Make Info file from current buffer. 228 "Make Info file from current buffer.
229 229
230Use the \\[next-error] command to move to the next error 230Use the \\[next-error] command to move to the next error
231\(if there are errors\)." 231\(if there are errors)."
232 232
233 (interactive) 233 (interactive)
234 (cond ((null buffer-file-name) 234 (cond ((null buffer-file-name)
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 57134e06c19..99962c75897 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -446,7 +446,7 @@ REVERSE (non-nil means reverse order), BEG and END (region to sort)."
446 446
447(defun sort-pages-buffer (&optional reverse) 447(defun sort-pages-buffer (&optional reverse)
448 "Sort pages alphabetically in buffer. Prefix arg means reverse order. 448 "Sort pages alphabetically in buffer. Prefix arg means reverse order.
449\(Non-nil arg if not interactive.\)" 449\(Non-nil arg if not interactive.)"
450 450
451 (interactive "P") 451 (interactive "P")
452 (or reverse (setq reverse nil)) 452 (or reverse (setq reverse nil))
@@ -461,7 +461,7 @@ REVERSE (non-nil means reverse order), BEG and END (region to sort)."
461(defvar pages-directory-previous-regexp nil 461(defvar pages-directory-previous-regexp nil
462 "Value of previous regexp used by `pages-directory'. 462 "Value of previous regexp used by `pages-directory'.
463\(This regular expression may be used to select only those pages that 463\(This regular expression may be used to select only those pages that
464contain matches to the regexp.\)") 464contain matches to the regexp.)")
465 465
466(defvar pages-buffer nil 466(defvar pages-buffer nil
467 "The buffer for which the pages-directory function creates the directory.") 467 "The buffer for which the pages-directory function creates the directory.")
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 8d824ebad35..22dc7dc9165 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -229,7 +229,7 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
229 (sit-for 1) 229 (sit-for 1)
230 (setq files (cdr files)))))) 230 (setq files (cdr files))))))
231 (ding) 231 (ding)
232 (message "Keywords \"%s\" not found in any \.bib file" keywords)) 232 (message "Keywords \"%s\" not found in any .bib file" keywords))
233 (select-window old-window))) 233 (select-window old-window)))
234 234
235(defun refer-find-entry-in-file (keywords-list file &optional old-pos) 235(defun refer-find-entry-in-file (keywords-list file &optional old-pos)
@@ -351,21 +351,21 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
351 (if (progn 351 (if (progn
352 (goto-char (point-min)) 352 (goto-char (point-min))
353 (re-search-forward (concat refer-bib-files-regexp 353 (re-search-forward (concat refer-bib-files-regexp
354 "\\s-*\{") nil t)) 354 "\\s-*{") nil t))
355 (let ((files (list (buffer-substring 355 (let ((files (list (buffer-substring
356 (point) 356 (point)
357 (progn 357 (progn
358 (re-search-forward "[,\}]" 358 (re-search-forward "[,}]"
359 nil t) 359 nil t)
360 (backward-char 1) 360 (backward-char 1)
361 (point)))))) 361 (point))))))
362 (while (not (looking-at "\}")) 362 (while (not (looking-at "}"))
363 (setq files (append files 363 (setq files (append files
364 (list (buffer-substring 364 (list (buffer-substring
365 (progn (forward-char 1) 365 (progn (forward-char 1)
366 (point)) 366 (point))
367 (progn (re-search-forward 367 (progn (re-search-forward
368 "[,\}]" nil t) 368 "[,}]" nil t)
369 (backward-char 1) 369 (backward-char 1)
370 (point))))))) 370 (point)))))))
371 files) 371 files)
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 17e8cfdc83c..173c8a8d11d 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -385,7 +385,7 @@ The environment should be located in FILES."
385 (buffer-substring-no-properties 385 (buffer-substring-no-properties
386 start end) 386 start end)
387 "[ \t\n\r]*\\\\bibitem[ \t]*\ 387 "[ \t\n\r]*\\\\bibitem[ \t]*\
388\\(\\[[^]]*]\\)*\[ \t]*")))))) 388\\(\\[[^]]*]\\)*[ \t]*"))))))
389 (goto-char end)))))) 389 (goto-char end))))))
390 (unless entries 390 (unless entries
391 (error "No bibitems found")) 391 (error "No bibitems found"))
@@ -477,7 +477,7 @@ If RAW is non-nil, keep double quotes/curly braces delimiting fields."
477 (goto-char (point-min)) 477 (goto-char (point-min))
478 478
479 (if (re-search-forward "@\\(\\(?:\\w\\|\\s_\\)+\\)[ \t\n\r]*\ 479 (if (re-search-forward "@\\(\\(?:\\w\\|\\s_\\)+\\)[ \t\n\r]*\
480\[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t) 480[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t)
481 (setq alist 481 (setq alist
482 (list 482 (list
483 (cons "&type" (downcase (reftex-match-string 1))) 483 (cons "&type" (downcase (reftex-match-string 1)))
@@ -1195,7 +1195,7 @@ created files in the variables `reftex-create-bibtex-header' or
1195 (widen) 1195 (widen)
1196 (goto-char (point-min)) 1196 (goto-char (point-min))
1197 (while (re-search-forward "^[ \t]*@\\(?:\\w\\|\\s_\\)+[ \t\n\r]*\ 1197 (while (re-search-forward "^[ \t]*@\\(?:\\w\\|\\s_\\)+[ \t\n\r]*\
1198\[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t) 1198[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t)
1199 (setq key (match-string 1) 1199 (setq key (match-string 1)
1200 beg (match-beginning 0) 1200 beg (match-beginning 0)
1201 end (progn 1201 end (progn
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 7dc91844583..0ff1d72451e 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -2354,7 +2354,7 @@ what in fact did happen.
2354Check if the bug is reproducible with an up-to-date version of 2354Check if the bug is reproducible with an up-to-date version of
2355RefTeX available from http://www.gnu.org/software/auctex/. 2355RefTeX available from http://www.gnu.org/software/auctex/.
2356 2356
2357If the bug is triggered by a specific \(La\)TeX file, you should try 2357If the bug is triggered by a specific \(La)TeX file, you should try
2358to produce a minimal sample file showing the problem and include it 2358to produce a minimal sample file showing the problem and include it
2359in your report. 2359in your report.
2360 2360
@@ -2446,7 +2446,7 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See
2446 2446
2447;;;*** 2447;;;***
2448 2448
2449;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "83811ccf3471820f0ad0dc005ffc88d5") 2449;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "43a3f05c024aee5b7708420f74266933")
2450;;; Generated autoloads from reftex-cite.el 2450;;; Generated autoloads from reftex-cite.el
2451 2451
2452(autoload 'reftex-default-bibliography "reftex-cite" "\ 2452(autoload 'reftex-default-bibliography "reftex-cite" "\
@@ -2774,7 +2774,7 @@ Here are all local bindings.
2774 2774
2775;;;*** 2775;;;***
2776 2776
2777;;;### (autoloads nil "reftex-parse" "reftex-parse.el" "c327a848a6d168412b1a9be9f2e3dce8") 2777;;;### (autoloads nil "reftex-parse" "reftex-parse.el" "7bfdcb2f040dbe9a08d2c38c005c8f21")
2778;;; Generated autoloads from reftex-parse.el 2778;;; Generated autoloads from reftex-parse.el
2779 2779
2780(autoload 'reftex-parse-one "reftex-parse" "\ 2780(autoload 'reftex-parse-one "reftex-parse" "\
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 9625ec2c7cc..e6bfe5f1662 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -442,7 +442,7 @@ in parentheses follows the development revision and the time stamp.")
442 (opt-tag (:shy optsta-tag optnam-tag optarg-tag "?")) ; A complete option. 442 (opt-tag (:shy optsta-tag optnam-tag optarg-tag "?")) ; A complete option.
443 443
444 ;; Footnotes and citations (`fnc') 444 ;; Footnotes and citations (`fnc')
445 (fncnam-prt "[^\]\n]") ; Part of a footnote or citation name. 445 (fncnam-prt "[^]\n]") ; Part of a footnote or citation name.
446 (fncnam-tag fncnam-prt "+") ; A footnote or citation name. 446 (fncnam-tag fncnam-prt "+") ; A footnote or citation name.
447 (fnc-tag "\\[" fncnam-tag "]") ; A complete footnote or citation tag. 447 (fnc-tag "\\[" fncnam-tag "]") ; A complete footnote or citation tag.
448 (fncdef-tag-2 (:grp exm-sta) 448 (fncdef-tag-2 (:grp exm-sta)
@@ -512,7 +512,7 @@ in parentheses follows the development revision and the time stamp.")
512 ; colon tag. 512 ; colon tag.
513 513
514 ;; Comments (`cmt') 514 ;; Comments (`cmt')
515 (cmt-sta-1 (:grp exm-sta) "[^\[|_\n]" 515 (cmt-sta-1 (:grp exm-sta) "[^[|_\n]"
516 (:alt "[^:\n]" (:seq ":" (:alt "[^:\n]" "$"))) 516 (:alt "[^:\n]" (:seq ":" (:alt "[^:\n]" "$")))
517 "*$") ; Start of a comment block; first group is explicit markup 517 "*$") ; Start of a comment block; first group is explicit markup
518 ; start. 518 ; start.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index cb65e5f1073..55a1e6d26db 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -525,7 +525,7 @@ Do \\[describe-key] on the following bindings to discover what they do.
525 ;; This is desirable because SGML discards a newline that appears 525 ;; This is desirable because SGML discards a newline that appears
526 ;; immediately after a start tag or immediately before an end tag. 526 ;; immediately after a start tag or immediately before an end tag.
527 (setq-local paragraph-start (concat "[ \t]*$\\|\ 527 (setq-local paragraph-start (concat "[ \t]*$\\|\
528\[ \t]*</?\\(" sgml-name-re sgml-attrs-re "\\)?>")) 528[ \t]*</?\\(" sgml-name-re sgml-attrs-re "\\)?>"))
529 (setq-local paragraph-separate (concat paragraph-start "$")) 529 (setq-local paragraph-separate (concat paragraph-start "$"))
530 (setq-local adaptive-fill-regexp "[ \t]*") 530 (setq-local adaptive-fill-regexp "[ \t]*")
531 (add-hook 'fill-nobreak-predicate 'sgml-fill-nobreak nil t) 531 (add-hook 'fill-nobreak-predicate 'sgml-fill-nobreak nil t)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 51cda80c5bd..0a4e070d4b5 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -135,8 +135,8 @@ If nil, TeX runs with no options. See the documentation of `tex-command'."
135 "TeX commands to use when starting TeX. 135 "TeX commands to use when starting TeX.
136They are shell-quoted and precede the input file name, with a separating space. 136They are shell-quoted and precede the input file name, with a separating space.
137If nil, no commands are used. See the documentation of `tex-command'." 137If nil, no commands are used. See the documentation of `tex-command'."
138 :type '(radio (const :tag "Interactive \(nil\)" nil) 138 :type '(radio (const :tag "Interactive (nil)" nil)
139 (const :tag "Nonstop \(\"\\nonstopmode\\input\"\)" 139 (const :tag "Nonstop (\"\\nonstopmode\\input\")"
140 "\\nonstopmode\\input") 140 "\\nonstopmode\\input")
141 (string :tag "String at your choice")) 141 (string :tag "String at your choice"))
142 :group 'tex-run 142 :group 'tex-run
@@ -266,8 +266,8 @@ tex shell terminates.")
266 266
267(defvar tex-command "tex" 267(defvar tex-command "tex"
268 "Command to run TeX. 268 "Command to run TeX.
269If this string contains an asterisk \(`*'\), that is replaced by the file name; 269If this string contains an asterisk \(`*'), that is replaced by the file name;
270otherwise the value of `tex-start-options', the \(shell-quoted\) 270otherwise the value of `tex-start-options', the \(shell-quoted)
271value of `tex-start-commands', and the file name are added at the end 271value of `tex-start-commands', and the file name are added at the end
272with blanks as separators. 272with blanks as separators.
273 273
@@ -387,7 +387,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
387 (goto-char (point-min)) 387 (goto-char (point-min))
388 (while (search-forward-regexp 388 (while (search-forward-regexp
389 "\\\\\\(include\\|input\\|verbatiminput\\|bibliography\\)\ 389 "\\\\\\(include\\|input\\|verbatiminput\\|bibliography\\)\
390\[ \t]*{\\([^}\n]+\\)}" 390[ \t]*{\\([^}\n]+\\)}"
391 nil t) 391 nil t)
392 (push (cons (concat "<<" (buffer-substring-no-properties 392 (push (cons (concat "<<" (buffer-substring-no-properties
393 (match-beginning 2) 393 (match-beginning 2)
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 37f10a8e871..500c1e38394 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -1043,7 +1043,7 @@ Leave point after argument."
1043 (setq texinfo-command-end (point))) 1043 (setq texinfo-command-end (point)))
1044 (t 1044 (t
1045 (error 1045 (error
1046 "Invalid `texinfo-optional-braces-discard' format \(need braces?\)"))) 1046 "Invalid `texinfo-optional-braces-discard' format (need braces?)")))
1047 (delete-region texinfo-command-start texinfo-command-end))) 1047 (delete-region texinfo-command-start texinfo-command-end)))
1048 1048
1049(defun texinfo-format-parse-line-args () 1049(defun texinfo-format-parse-line-args ()
@@ -2336,7 +2336,7 @@ Use only the FILENAME arg; for Info, ignore the other arguments to @image."
2336;; Write a `@definfoenclose' command on a line and follow it with three 2336;; Write a `@definfoenclose' command on a line and follow it with three
2337;; arguments separated by commas (commas are used as separators in an 2337;; arguments separated by commas (commas are used as separators in an
2338;; `@node' line in the same way). The first argument to 2338;; `@node' line in the same way). The first argument to
2339;; `@definfoenclose' is the @-command name \(without the `@'\); the 2339;; `@definfoenclose' is the @-command name (without the `@'); the
2340;; second argument is the Info start delimiter string; and the third 2340;; second argument is the Info start delimiter string; and the third
2341;; argument is the Info end delimiter string. The latter two arguments 2341;; argument is the Info end delimiter string. The latter two arguments
2342;; enclose the highlighted text in the Info file. A delimiter string 2342;; enclose the highlighted text in the Info file. A delimiter string
@@ -2491,8 +2491,8 @@ surrounded by in angle brackets."
2491Enclose the verbatim text, including the delimiters, in braces. Print 2491Enclose the verbatim text, including the delimiters, in braces. Print
2492text exactly as written (but not the delimiters) in a fixed-width. 2492text exactly as written (but not the delimiters) in a fixed-width.
2493 2493
2494For example, @verb\{|@|\} results in @ and 2494For example, @verb{|@|} results in @ and
2495@verb\{+@\\='e?\\=`!\\=`+} results in @\\='e?\\=`!\\=`." 2495@verb{+@\\='e?\\=`!\\=`+} results in @\\='e?\\=`!\\=`."
2496 2496
2497 (let ((delimiter (buffer-substring-no-properties 2497 (let ((delimiter (buffer-substring-no-properties
2498 (1+ texinfo-command-end) (+ 2 texinfo-command-end)))) 2498 (1+ texinfo-command-end) (+ 2 texinfo-command-end))))
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 2c6d5b3827c..57218177d7b 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -86,7 +86,7 @@ command to gain use of `next-error'."
86 "Make Info file from current buffer. 86 "Make Info file from current buffer.
87 87
88Use the \\[next-error] command to move to the next error 88Use the \\[next-error] command to move to the next error
89\(if there are errors\)." 89\(if there are errors)."
90 t nil) 90 t nil)
91 91
92(autoload 'kill-compilation 92(autoload 'kill-compilation
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 0508426619f..321967a3721 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -694,8 +694,8 @@ section titles are often too short to explain a node well.
694 694
695MENU-LIST has form: 695MENU-LIST has form:
696 696
697 \(\(\"node-name1\" . \"description\"\) 697 ((\"node-name1\" . \"description\")
698 \(\"node-name2\" . \"description\"\) ... \) 698 (\"node-name2\" . \"description\") ... )
699 699
700However, the description field might be nil. 700However, the description field might be nil.
701 701
@@ -1002,9 +1002,9 @@ following menu and the title of the node preceding that menu.
1002 1002
1003The master menu list has this form: 1003The master menu list has this form:
1004 1004
1005 \(\(\(... \"entry-1-2\" \"entry-1\"\) \"title-1\"\) 1005 (((... \"entry-1-2\" \"entry-1\") \"title-1\")
1006 \(\(... \"entry-2-2\" \"entry-2-1\"\) \"title-2\"\) 1006 ((... \"entry-2-2\" \"entry-2-1\") \"title-2\")
1007 ...\) 1007 ...)
1008 1008
1009However, there does not need to be a title field." 1009However, there does not need to be a title field."
1010 1010
@@ -1018,7 +1018,7 @@ However, there does not need to be a title field."
1018 "Format and insert the master menu in the current buffer." 1018 "Format and insert the master menu in the current buffer."
1019 (goto-char (point-min)) 1019 (goto-char (point-min))
1020 ;; Insert a master menu only after `Top' node and before next node 1020 ;; Insert a master menu only after `Top' node and before next node
1021 ;; \(or include file if there is no next node\). 1021 ;; (or include file if there is no next node).
1022 (unless (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t) 1022 (unless (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t)
1023 (error "This buffer needs a Top node")) 1023 (error "This buffer needs a Top node"))
1024 (let ((first-chapter 1024 (let ((first-chapter
@@ -1407,7 +1407,7 @@ level in the Texinfo file; when looking for the `Previous' pointer,
1407the section found will be at the same or higher hierarchical level in 1407the section found will be at the same or higher hierarchical level in
1408the Texinfo file; when looking for the `Up' pointer, the section found 1408the Texinfo file; when looking for the `Up' pointer, the section found
1409will be at some level higher in the Texinfo file. The fourth argument 1409will be at some level higher in the Texinfo file. The fourth argument
1410\(one of `next', `previous', or `up'\) specifies whether to find the 1410\(one of `next', `previous', or `up') specifies whether to find the
1411`Next', `Previous', or `Up' pointer." 1411`Next', `Previous', or `Up' pointer."
1412 (let ((case-fold-search t)) 1412 (let ((case-fold-search t))
1413 (cond ((eq direction 'next) 1413 (cond ((eq direction 'next)
@@ -1850,8 +1850,8 @@ chapters."
1850 1850
1851;; The menu-list has the form: 1851;; The menu-list has the form:
1852;; 1852;;
1853;; \(\(\"node-name1\" . \"title1\"\) 1853;; ((\"node-name1\" . \"title1\")
1854;; \(\"node-name2\" . \"title2\"\) ... \) 1854;; (\"node-name2\" . \"title2\") ... )
1855;; 1855;;
1856;; However, there does not need to be a title field and this function 1856;; However, there does not need to be a title field and this function
1857;; does not fill it; however a comment tells you how to do so. 1857;; does not fill it; however a comment tells you how to do so.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index a9c539b7b87..654bccd0988 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -219,7 +219,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
219 219
220(defun thing-at-point-bounds-of-list-at-point () 220(defun thing-at-point-bounds-of-list-at-point ()
221 "Return the bounds of the list at point. 221 "Return the bounds of the list at point.
222\[Internal function used by `bounds-of-thing-at-point'.]" 222[Internal function used by `bounds-of-thing-at-point'.]"
223 (save-excursion 223 (save-excursion
224 (let ((opoint (point)) 224 (let ((opoint (point))
225 (beg (ignore-errors 225 (beg (ignore-errors
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 14f127e41a1..a4a422fbc4f 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -63,8 +63,8 @@ with default Emacs bindings information about this is shown.
63 63
64VALUE should have either of these formats: 64VALUE should have either of these formats:
65 65
66 \(cua-mode) 66 (cua-mode)
67 \(current-binding KEY-FUN DEF-FUN KEY WHERE) 67 (current-binding KEY-FUN DEF-FUN KEY WHERE)
68 68
69Where 69Where
70 KEY is a key sequence whose standard binding has been changed 70 KEY is a key sequence whose standard binding has been changed
@@ -402,8 +402,8 @@ where
402 REMARK is a list with info about rebinding. It has either of 402 REMARK is a list with info about rebinding. It has either of
403 these formats: 403 these formats:
404 404
405 \(TEXT cua-mode) 405 (TEXT cua-mode)
406 \(TEXT current-binding KEY-FUN DEF-FUN KEY WHERE) 406 (TEXT current-binding KEY-FUN DEF-FUN KEY WHERE)
407 407
408 Here TEXT is a link text to show to the user. The 408 Here TEXT is a link text to show to the user. The
409 rest of the list is used to show information when 409 rest of the list is used to show information when
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 85037364016..5f56956c52b 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -677,7 +677,7 @@ INTERVAL is the full length of an interval (defaults to TIME)."
677(defun type-break-check () 677(defun type-break-check ()
678 "Ask to take a typing break if appropriate. 678 "Ask to take a typing break if appropriate.
679This may be the case either because the scheduled time has come \(and the 679This may be the case either because the scheduled time has come \(and the
680minimum keystroke threshold has been reached\) or because the maximum 680minimum keystroke threshold has been reached) or because the maximum
681keystroke threshold has been exceeded." 681keystroke threshold has been exceeded."
682 (type-break-file-keystroke-count) 682 (type-break-file-keystroke-count)
683 (let* ((min-threshold (car type-break-keystroke-threshold)) 683 (let* ((min-threshold (car type-break-keystroke-threshold))
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index a7b3d16d46d..df9cf621037 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -264,7 +264,7 @@ telling Microsoft that."
264 (and expires 264 (and expires
265 (string-match 265 (string-match
266 (concat "^[^,]+, +\\(..\\)-\\(...\\)-\\(..\\) +" 266 (concat "^[^,]+, +\\(..\\)-\\(...\\)-\\(..\\) +"
267 "\\(..:..:..\\) +\\[*\\([^\]]+\\)\\]*$") 267 "\\(..:..:..\\) +\\[*\\([^]]+\\)\\]*$")
268 expires) 268 expires)
269 (setq expires (concat (match-string 1 expires) " " 269 (setq expires (concat (match-string 1 expires) " "
270 (match-string 2 expires) " " 270 (match-string 2 expires) " "
@@ -356,7 +356,7 @@ to run the `url-cookie-setup-save-timer' function manually."
356 356
357(defun url-cookie-list () 357(defun url-cookie-list ()
358 "Display a buffer listing the current URL cookies, if there are any. 358 "Display a buffer listing the current URL cookies, if there are any.
359Use \\<url-cookie-mode-map>\\\[url-cookie-delete] to remove cookies." 359Use \\<url-cookie-mode-map>\\[url-cookie-delete] to remove cookies."
360 (interactive) 360 (interactive)
361 (when (and (null url-cookie-secure-storage) 361 (when (and (null url-cookie-secure-storage)
362 (null url-cookie-storage)) 362 (null url-cookie-storage))
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 61ca0885ec5..1cf6b8209f9 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -495,7 +495,7 @@ make sure you are comfortable with it leaking to the outside world.")
495(defun url-dav-lock-resource (url exclusive &optional depth) 495(defun url-dav-lock-resource (url exclusive &optional depth)
496 "Request a lock on URL. If EXCLUSIVE is non-nil, get an exclusive lock. 496 "Request a lock on URL. If EXCLUSIVE is non-nil, get an exclusive lock.
497Optional 3rd argument DEPTH says how deep the lock should go, default is 0 497Optional 3rd argument DEPTH says how deep the lock should go, default is 0
498\(lock only the resource and none of its children\). 498\(lock only the resource and none of its children).
499 499
500Returns a cons-cell of (SUCCESSFUL-RESULTS . FAILURE-RESULTS). 500Returns a cons-cell of (SUCCESSFUL-RESULTS . FAILURE-RESULTS).
501SUCCESSFUL-RESULTS is a list of (URL STATUS locktoken). 501SUCCESSFUL-RESULTS is a list of (URL STATUS locktoken).
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index cc0e4f8f8d6..ab61802a6bb 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -39,7 +39,7 @@
39 :group 'url-gateway) 39 :group 'url-gateway)
40 40
41(defcustom url-gateway-prompt-pattern 41(defcustom url-gateway-prompt-pattern
42 "^[^#$%>;]*[#$%>;] *" ;; "bash\\|\$ *\r?$\\|> *\r?" 42 "^[^#$%>;]*[#$%>;] *" ;; "bash\\|[$>] *\r?$"
43 "A regular expression matching a shell prompt." 43 "A regular expression matching a shell prompt."
44 :type 'regexp 44 :type 'regexp
45 :group 'url-gateway) 45 :group 'url-gateway)
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 001a7831ad5..845195e7d4c 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -117,9 +117,9 @@ When URL Handler mode is enabled, this regular expression is
117added to `file-name-handler-alist'. 117added to `file-name-handler-alist'.
118 118
119Some valid URL protocols just do not make sense to visit 119Some valid URL protocols just do not make sense to visit
120interactively \(about, data, info, irc, mailto, etc\). This 120interactively \(about, data, info, irc, mailto, etc.). This
121regular expression avoids conflicts with local files that look 121regular expression avoids conflicts with local files that look
122like URLs \(Gnus is particularly bad at this\)." 122like URLs \(Gnus is particularly bad at this)."
123 :group 'url 123 :group 'url
124 :type 'regexp 124 :type 'regexp
125 :version "25.1" 125 :version "25.1"
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 37ed4a53b44..464e3754eb9 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1427,8 +1427,8 @@ modified lines of the diff."
1427 (diff-hunk-style))))) 1427 (diff-hunk-style)))))
1428 (set (make-local-variable 'whitespace-trailing-regexp) 1428 (set (make-local-variable 'whitespace-trailing-regexp)
1429 (if (eq style 'context) 1429 (if (eq style 'context)
1430 "^[-\+!] .*?\\([\t ]+\\)$" 1430 "^[-+!] .*?\\([\t ]+\\)$"
1431 "^[-\+!<>].*?\\([\t ]+\\)$")))) 1431 "^[-+!<>].*?\\([\t ]+\\)$"))))
1432 1432
1433(defun diff-delete-if-empty () 1433(defun diff-delete-if-empty ()
1434 ;; An empty diff file means there's no more diffs to integrate, so we 1434 ;; An empty diff file means there's no more diffs to integrate, so we
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 352892c945a..7647544d65d 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -168,7 +168,7 @@ This variable can be set either in .emacs or toggled interactively.
168Use `setq-default' if setting it in .emacs") 168Use `setq-default' if setting it in .emacs")
169 169
170(ediff-defvar-local ediff-auto-refine-limit 14000 170(ediff-defvar-local ediff-auto-refine-limit 14000
171 "Auto-refine only the regions of this size \(in bytes\) or less.") 171 "Auto-refine only the regions of this size (in bytes) or less.")
172 172
173;;; General 173;;; General
174 174
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 8c935bfab19..bf211599b9f 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -776,7 +776,7 @@ TYPE-OF-EMACS is either 'xemacs or 'emacs."
776 776
777;; A var local to each control panel buffer. Indicates highlighting style 777;; A var local to each control panel buffer. Indicates highlighting style
778;; in effect for this buffer: `face', `ascii', 778;; in effect for this buffer: `face', `ascii',
779;; `off' -- turned off \(on a dumb terminal only\). 779;; `off' -- turned off (on a dumb terminal only).
780(ediff-defvar-local ediff-highlighting-style 780(ediff-defvar-local ediff-highlighting-style
781 (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii) 781 (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii)
782 "") 782 "")
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index b5835cb2d6e..a3b8bf0a28a 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -90,14 +90,14 @@ See also `ediff-backup-specs'."
90 ;; traditional `patch' 90 ;; traditional `patch'
91 (format "-b %s" ediff-backup-extension)))) 91 (format "-b %s" ediff-backup-extension))))
92 "Backup directives to pass to the patch program. 92 "Backup directives to pass to the patch program.
93Ediff requires that the old version of the file \(before applying the patch\) 93Ediff requires that the old version of the file \(before applying the patch)
94be saved in a file named `the-patch-file.extension'. Usually `extension' is 94be saved in a file named `the-patch-file.extension'. Usually `extension' is
95`.orig', but this can be changed by the user and may depend on the system. 95`.orig', but this can be changed by the user and may depend on the system.
96Therefore, Ediff needs to know the backup extension used by the patch program. 96Therefore, Ediff needs to know the backup extension used by the patch program.
97 97
98Some versions of the patch program let you specify `-b backup-extension'. 98Some versions of the patch program let you specify `-b backup-extension'.
99Other versions only permit `-b', which assumes the extension `.orig' 99Other versions only permit `-b', which assumes the extension `.orig'
100\(in which case ediff-backup-extension MUST be also `.orig'\). The latest 100\(in which case ediff-backup-extension MUST be also `.orig'). The latest
101versions of GNU patch require `-b -z backup-extension'. 101versions of GNU patch require `-b -z backup-extension'.
102 102
103Note that both `ediff-backup-extension' and `ediff-backup-specs' 103Note that both `ediff-backup-extension' and `ediff-backup-specs'
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index bf5bb5cd5da..e664f9fdac3 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1500,7 +1500,7 @@ Used in ediff-windows/regions only."
1500 (select-window wind))) 1500 (select-window wind)))
1501 1501
1502(defun ediff-scroll-vertically (&optional arg) 1502(defun ediff-scroll-vertically (&optional arg)
1503 "Vertically scroll buffers A, B \(and C if appropriate\). 1503 "Vertically scroll buffers A, B (and C if appropriate).
1504With optional argument ARG, scroll ARG lines; otherwise scroll by nearly 1504With optional argument ARG, scroll ARG lines; otherwise scroll by nearly
1505the one half of the height of window-A." 1505the one half of the height of window-A."
1506 (interactive "P") 1506 (interactive "P")
@@ -1544,7 +1544,7 @@ the one half of the height of window-A."
1544 1544
1545 1545
1546(defun ediff-scroll-horizontally (&optional arg) 1546(defun ediff-scroll-horizontally (&optional arg)
1547 "Horizontally scroll buffers A, B \(and C if appropriate\). 1547 "Horizontally scroll buffers A, B (and C if appropriate).
1548If an argument is given, that is how many columns are scrolled, else nearly 1548If an argument is given, that is how many columns are scrolled, else nearly
1549the width of the A/B/C windows." 1549the width of the A/B/C windows."
1550 (interactive "P") 1550 (interactive "P")
@@ -1822,7 +1822,7 @@ If the prefix is negative, count differences from the end."
1822 1822
1823(defun ediff-jump-to-difference-at-point (arg) 1823(defun ediff-jump-to-difference-at-point (arg)
1824 "Go to difference closest to the point in buffer A, B, or C. 1824 "Go to difference closest to the point in buffer A, B, or C.
1825The buffer depends on last command character \(a, b, or c\) that invoked this 1825The buffer depends on last command character \(a, b, or c) that invoked this
1826command. For instance, if the command was `ga' then the point value in buffer 1826command. For instance, if the command was `ga' then the point value in buffer
1827A is used. 1827A is used.
1828With a prefix argument, synchronize all files around the current point position 1828With a prefix argument, synchronize all files around the current point position
@@ -1921,7 +1921,7 @@ in the specified buffer."
1921;;; Copying diffs. 1921;;; Copying diffs.
1922 1922
1923(defun ediff-diff-to-diff (arg &optional keys) 1923(defun ediff-diff-to-diff (arg &optional keys)
1924 "Copy buffer-X'th difference region to buffer Y \(X,Y are A, B, or C\). 1924 "Copy buffer-X'th difference region to buffer Y (X,Y are A, B, or C).
1925If numerical prefix argument, copy the difference specified in the arg. 1925If numerical prefix argument, copy the difference specified in the arg.
1926Otherwise, copy the difference given by `ediff-current-difference'. 1926Otherwise, copy the difference given by `ediff-current-difference'.
1927This command assumes it is bound to a 2-character key sequence, `ab', `ba', 1927This command assumes it is bound to a 2-character key sequence, `ab', `ba',
@@ -1986,7 +1986,7 @@ ARG is a prefix argument. If nil, copy the current difference region."
1986 1986
1987 1987
1988 1988
1989;; Copy diff N from FROM-BUF-TYPE \(given as A, B or C\) to TO-BUF-TYPE. 1989;; Copy diff N from FROM-BUF-TYPE (given as A, B or C) to TO-BUF-TYPE.
1990;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the 1990;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the
1991;; target diff. This is used in merging, when constructing the merged 1991;; target diff. This is used in merging, when constructing the merged
1992;; version. 1992;; version.
@@ -2065,7 +2065,7 @@ ARG is a prefix argument. If nil, copy the current difference region."
2065 (message "%s" messg)) 2065 (message "%s" messg))
2066 )) 2066 ))
2067 2067
2068;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\). 2068;; Save Nth diff of buffer BUF-TYPE (A, B, or C).
2069;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG 2069;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG
2070;; is the region to save. It is redundant here, but is passed anyway, for 2070;; is the region to save. It is redundant here, but is passed anyway, for
2071;; convenience. 2071;; convenience.
@@ -2385,10 +2385,10 @@ the number seen by the user."
2385 "Finish an Ediff session and exit Ediff. 2385 "Finish an Ediff session and exit Ediff.
2386Unselects the selected difference, if any, restores the read-only and modified 2386Unselects the selected difference, if any, restores the read-only and modified
2387flags of the compared file buffers, kills Ediff buffers for this session 2387flags of the compared file buffers, kills Ediff buffers for this session
2388\(but not buffers A, B, C\). 2388\(but not buffers A, B, C).
2389 2389
2390If `ediff-keep-variants' is nil, the user will be asked whether the buffers 2390If `ediff-keep-variants' is nil, the user will be asked whether the buffers
2391containing the variants should be removed \(if they haven't been modified\). 2391containing the variants should be removed \(if they haven't been modified).
2392If it is t, they will be preserved unconditionally. A prefix argument, 2392If it is t, they will be preserved unconditionally. A prefix argument,
2393temporarily reverses the meaning of this variable." 2393temporarily reverses the meaning of this variable."
2394 (interactive "P") 2394 (interactive "P")
@@ -3312,7 +3312,7 @@ and `wd' saves the diff output.
3312 3312
3313With prefix argument, `wd' saves plain diff output. 3313With prefix argument, `wd' saves plain diff output.
3314Without an argument, it saves customized diff argument, if available 3314Without an argument, it saves customized diff argument, if available
3315\(and plain output, if customized output was not generated\)." 3315\(and plain output, if customized output was not generated)."
3316 (interactive "P") 3316 (interactive "P")
3317 (ediff-barf-if-not-control-buffer) 3317 (ediff-barf-if-not-control-buffer)
3318 (ediff-compute-custom-diffs-maybe) 3318 (ediff-compute-custom-diffs-maybe)
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index c31df824996..e0887f03b62 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -211,7 +211,7 @@ responsibility."
211 "Function to call to determine the desired location for the control panel. 211 "Function to call to determine the desired location for the control panel.
212Expects three parameters: the control buffer, the desired width and height 212Expects three parameters: the control buffer, the desired width and height
213of the control frame. It returns an association list 213of the control frame. It returns an association list
214of the form \(\(top . <position>\) \(left . <position>\)\)" 214of the form \((top . <position>) \(left . <position>))"
215 :type 'function 215 :type 'function
216 :group 'ediff-window) 216 :group 'ediff-window)
217 217
@@ -432,7 +432,7 @@ into icons, regardless of the window manager."
432 three-way-comparison ediff-3way-comparison-job)) 432 three-way-comparison ediff-3way-comparison-job))
433 ;; if in minibuffer go somewhere else 433 ;; if in minibuffer go somewhere else
434 (if (save-match-data 434 (if (save-match-data
435 (string-match "\*Minibuf-" (buffer-name (window-buffer)))) 435 (string-match "\\*Minibuf-" (buffer-name (window-buffer))))
436 (select-window (next-window nil 'ignore-minibuf))) 436 (select-window (next-window nil 'ignore-minibuf)))
437 (delete-other-windows) 437 (delete-other-windows)
438 (set-window-dedicated-p (selected-window) nil) 438 (set-window-dedicated-p (selected-window) nil)
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 65ca0bd4408..3a2d1e48aac 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -963,7 +963,7 @@ If WIND-B is nil, use window next to WIND-A."
963;;;###autoload 963;;;###autoload
964(defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks) 964(defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
965 "Run Ediff on a pair of regions in specified buffers. 965 "Run Ediff on a pair of regions in specified buffers.
966Regions \(i.e., point and mark\) can be set in advance or marked interactively. 966Regions (i.e., point and mark) can be set in advance or marked interactively.
967This function is effective only for relatively small regions, up to 200 967This function is effective only for relatively small regions, up to 200
968lines. For large regions, use `ediff-regions-linewise'." 968lines. For large regions, use `ediff-regions-linewise'."
969 (interactive 969 (interactive
@@ -1003,7 +1003,7 @@ lines. For large regions, use `ediff-regions-linewise'."
1003;;;###autoload 1003;;;###autoload
1004(defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks) 1004(defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks)
1005 "Run Ediff on a pair of regions in specified buffers. 1005 "Run Ediff on a pair of regions in specified buffers.
1006Regions \(i.e., point and mark\) can be set in advance or marked interactively. 1006Regions (i.e., point and mark) can be set in advance or marked interactively.
1007Each region is enlarged to contain full lines. 1007Each region is enlarged to contain full lines.
1008This function is effective for large regions, over 100-200 1008This function is effective for large regions, over 100-200
1009lines. For small regions, use `ediff-regions-wordwise'." 1009lines. For small regions, use `ediff-regions-wordwise'."
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index acbd9c0cd9f..9857116e2d4 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -905,7 +905,7 @@ Return non-nil if it is."
905The return value looks like this: 905The return value looks like this:
906 (LOGBUFFER (ENTRYSTART ENTRYEND) ...) 906 (LOGBUFFER (ENTRYSTART ENTRYEND) ...)
907where LOGBUFFER is the name of the ChangeLog buffer, and each 907where LOGBUFFER is the name of the ChangeLog buffer, and each
908\(ENTRYSTART . ENTRYEND\) pair is a buffer region." 908\(ENTRYSTART . ENTRYEND) pair is a buffer region."
909 (let ((changelog-file-name 909 (let ((changelog-file-name
910 (let ((default-directory 910 (let ((default-directory
911 (file-name-directory (expand-file-name file))) 911 (file-name-directory (expand-file-name file)))
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 3a50c9b6a2d..ab3161e11e6 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -269,7 +269,7 @@ cover the range from the oldest annotation to the newest."
269 (/ (- (if full newest current) oldest) 269 (/ (- (if full newest current) oldest)
270 (vc-annotate-oldest-in-map vc-annotate-color-map)) 270 (vc-annotate-oldest-in-map vc-annotate-color-map))
271 (if full newest)) 271 (if full newest))
272 (message "Redisplaying annotation...done \(%s\)" 272 (message "Redisplaying annotation...done (%s)"
273 (if full 273 (if full
274 (format "Spanned from %.1f to %.1f days old" 274 (format "Spanned from %.1f to %.1f days old"
275 (- current oldest) 275 (- current oldest)
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 0aa9c5a1e22..73ef42ac7d6 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -107,7 +107,7 @@ switches."
107 :version "25.1" 107 :version "25.1"
108 :group 'vc-cvs) 108 :group 'vc-cvs)
109 109
110(defcustom vc-cvs-header '("\$Id\$") 110(defcustom vc-cvs-header '("$Id\ $")
111 "Header keywords to be inserted by `vc-insert-headers'." 111 "Header keywords to be inserted by `vc-insert-headers'."
112 :version "24.1" ; no longer consult the obsolete vc-header-alist 112 :version "24.1" ; no longer consult the obsolete vc-header-alist
113 :type '(repeat string) 113 :type '(repeat string)
@@ -932,7 +932,7 @@ state."
932 (when (and full 932 (when (and full
933 (re-search-forward 933 (re-search-forward
934 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\ 934 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
935\[\t ]+\\([0-9.]+\\)" 935[\t ]+\\([0-9.]+\\)"
936 nil t)) 936 nil t))
937 (vc-file-setprop file 'vc-latest-revision (match-string 2))) 937 (vc-file-setprop file 'vc-latest-revision (match-string 2)))
938 (vc-file-setprop 938 (vc-file-setprop
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 71ffa55a6e9..995bd059f2d 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -76,7 +76,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
76 :version "21.1" 76 :version "21.1"
77 :group 'vc-rcs) 77 :group 'vc-rcs)
78 78
79(defcustom vc-rcs-header '("\$Id\$") 79(defcustom vc-rcs-header '("$Id\ $")
80 "Header keywords to be inserted by `vc-insert-headers'." 80 "Header keywords to be inserted by `vc-insert-headers'."
81 :type '(repeat string) 81 :type '(repeat string)
82 :version "24.1" ; no longer consult the obsolete vc-header-alist 82 :version "24.1" ; no longer consult the obsolete vc-header-alist
@@ -1118,12 +1118,12 @@ Returns: nil if no headers were found
1118(defun vc-release-greater-or-equal (r1 r2) 1118(defun vc-release-greater-or-equal (r1 r2)
1119 "Compare release numbers, represented as strings. 1119 "Compare release numbers, represented as strings.
1120Release components are assumed cardinal numbers, not decimal fractions 1120Release components are assumed cardinal numbers, not decimal fractions
1121\(5.10 is a higher release than 5.9\). Omitted fields are considered 1121\(5.10 is a higher release than 5.9). Omitted fields are considered
1122lower \(5.6.7 is earlier than 5.6.7.1\). Comparison runs till the end 1122lower \(5.6.7 is earlier than 5.6.7.1). Comparison runs till the end
1123of the string is found, or a non-numeric component shows up \(5.6.7 is 1123of the string is found, or a non-numeric component shows up \(5.6.7 is
1124earlier than \"5.6.7 beta\", which is probably not what you want in 1124earlier than \"5.6.7 beta\", which is probably not what you want in
1125some cases\). This code is suitable for existing RCS release numbers. 1125some cases). This code is suitable for existing RCS release numbers.
1126CVS releases are handled reasonably, too \(1.3 < 1.4* < 1.5\)." 1126CVS releases are handled reasonably, too \(1.3 < 1.4* < 1.5)."
1127 (let (v1 v2 i1 i2) 1127 (let (v1 v2 i1 i2)
1128 (catch 'done 1128 (catch 'done
1129 (or (and (string-match "^\\.?\\([0-9]+\\)" r1) 1129 (or (and (string-match "^\\.?\\([0-9]+\\)" r1)
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 755dbc1ca3b..4ef63a23db5 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -106,7 +106,7 @@ switches."
106 :version "25.1" 106 :version "25.1"
107 :group 'vc-svn) 107 :group 'vc-svn)
108 108
109(defcustom vc-svn-header '("\$Id\$") 109(defcustom vc-svn-header '("$Id\ $")
110 "Header keywords to be inserted by `vc-insert-headers'." 110 "Header keywords to be inserted by `vc-insert-headers'."
111 :version "24.1" ; no longer consult the obsolete vc-header-alist 111 :version "24.1" ; no longer consult the obsolete vc-header-alist
112 :type '(repeat string) 112 :type '(repeat string)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3b9e788b7ab..90d450a5ab9 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -850,9 +850,9 @@ See `run-hooks'."
850 850
851(defcustom vc-static-header-alist 851(defcustom vc-static-header-alist
852 '(("\\.c\\'" . 852 '(("\\.c\\'" .
853 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) 853 "\n#ifndef lint\nstatic char vcid[] = \"%s\";\n#endif /* lint */\n"))
854 "Associate static header string templates with file types. 854 "Associate static header string templates with file types.
855A \%s in the template is replaced with the first string associated with 855A %s in the template is replaced with the first string associated with
856the file's version control type in `vc-BACKEND-header'." 856the file's version control type in `vc-BACKEND-header'."
857 :type '(repeat (cons :format "%v" 857 :type '(repeat (cons :format "%v"
858 (regexp :tag "File Type") 858 (regexp :tag "File Type")
@@ -2093,7 +2093,7 @@ changes from the current branch."
2093(defun vc-tag-precondition (dir) 2093(defun vc-tag-precondition (dir)
2094 "Scan the tree below DIR, looking for files not up-to-date. 2094 "Scan the tree below DIR, looking for files not up-to-date.
2095If any file is not up-to-date, return the name of the first such file. 2095If any file is not up-to-date, return the name of the first such file.
2096\(This means, neither tag creation nor retrieval is allowed.\) 2096\(This means, neither tag creation nor retrieval is allowed.)
2097If one or more of the files are currently visited, return `visited'. 2097If one or more of the files are currently visited, return `visited'.
2098Otherwise, return nil." 2098Otherwise, return nil."
2099 (let ((status nil)) 2099 (let ((status nil))
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 440a2786551..7e503269a8a 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -573,11 +573,11 @@ With optional NOT-THIS non-nil never return the current window.
573 573
574With NEW-WIN non-nil, display the virtual cursor buffer in another 574With NEW-WIN non-nil, display the virtual cursor buffer in another
575window if the virtual cursor is not currently visible \(note, however, 575window if the virtual cursor is not currently visible \(note, however,
576that this function never changes `window-point'\). 576that this function never changes `window-point').
577 577
578With THIS-FRAME non-nil, don't search other frames for a new window 578With THIS-FRAME non-nil, don't search other frames for a new window
579\(though if the vcursor is already off-frame then its current window is 579\(though if the vcursor is already off-frame then its current window is
580always considered, and the value of `pop-up-frames' is always respected\). 580always considered, and the value of `pop-up-frames' is always respected).
581 581
582Returns nil if the virtual cursor is not visible anywhere suitable. 582Returns nil if the virtual cursor is not visible anywhere suitable.
583Set `vcursor-window' to the returned value as a side effect." 583Set `vcursor-window' to the returned value as a side effect."
diff --git a/lisp/woman.el b/lisp/woman.el
index b4f4669de92..8fe1bfa0446 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3549,7 +3549,7 @@ The expression may be an argument in quotes."
3549 (if (> (woman-parse-numeric-value) 0) 1 0)) 3549 (if (> (woman-parse-numeric-value) 0) 1 0))
3550 ))) 3550 )))
3551 )) 3551 ))
3552; (if (looking-at "[ \t\nRC\)\"]") ; R, C are tab types 3552; (if (looking-at "[ \t\nRC)\"]") ; R, C are tab types
3553; () 3553; ()
3554; (WoMan-warn "Unimplemented numerical operator `%c' in %s" 3554; (WoMan-warn "Unimplemented numerical operator `%c' in %s"
3555; (following-char) 3555; (following-char)
@@ -3583,7 +3583,7 @@ expression in parentheses. Leaves point after the value."
3583 ;; string-to-number returns 0 if number not parsed. 3583 ;; string-to-number returns 0 if number not parsed.
3584 (string-to-number (match-string 0))) 3584 (string-to-number (match-string 0)))
3585 ((looking-at "\\\\n\\([-+]\\)?\\(?:\ 3585 ((looking-at "\\\\n\\([-+]\\)?\\(?:\
3586\\[\\([^]]+\\)\\]\\|\(\\(..\\)\\|\\(.\\)\\)") 3586\\[\\([^]]+\\)\\]\\|(\\(..\\)\\|\\(.\\)\\)")
3587 ;; interpolate number register, maybe auto-incremented 3587 ;; interpolate number register, maybe auto-incremented
3588 (let* ((pm (match-string-no-properties 1)) 3588 (let* ((pm (match-string-no-properties 1))
3589 (name (or (match-string-no-properties 2) 3589 (name (or (match-string-no-properties 2)
@@ -3761,7 +3761,7 @@ Round to whole lines, default 1 line. Format paragraphs upto TO.
3761 3761
3762(defun woman2-TH (to) 3762(defun woman2-TH (to)
3763 ".TH n c x v m -- Begin a man page. Format paragraphs upto TO. 3763 ".TH n c x v m -- Begin a man page. Format paragraphs upto TO.
3764n is the name of the page in chapter c\; x is extra commentary\; 3764n is the name of the page in chapter c; x is extra commentary;
3765v alters page foot left; m alters page head center. 3765v alters page foot left; m alters page head center.
3766\(Should set prevailing indent and tabs to 5.)" 3766\(Should set prevailing indent and tabs to 5.)"
3767 (woman-forward-arg 'unquote 'concat) 3767 (woman-forward-arg 'unquote 'concat)
@@ -4349,7 +4349,7 @@ Format paragraphs upto TO."
4349 4349
4350(defun woman2-ta (to) 4350(defun woman2-ta (to)
4351 ".ta Nt ... -- Set tabs, left type, unless t=R(right), C(centered). 4351 ".ta Nt ... -- Set tabs, left type, unless t=R(right), C(centered).
4352\(Breaks, but should not.) The tab stops are separated by spaces\; 4352\(Breaks, but should not.) The tab stops are separated by spaces;
4353a value preceded by + represents an increment to the previous stop value. 4353a value preceded by + represents an increment to the previous stop value.
4354Format paragraphs upto TO." 4354Format paragraphs upto TO."
4355 (setq tab-stop-list nil) 4355 (setq tab-stop-list nil)
diff --git a/test/automated/ert-x-tests.el b/test/automated/ert-x-tests.el
index 11b7ed4da7f..660a1cb218e 100644
--- a/test/automated/ert-x-tests.el
+++ b/test/automated/ert-x-tests.el
@@ -224,8 +224,8 @@
224 "This test attempts to demonstrate that there is no way to 224 "This test attempts to demonstrate that there is no way to
225force immediate truncation of the *Messages* buffer from Lisp 225force immediate truncation of the *Messages* buffer from Lisp
226\(and hence justifies the existence of 226\(and hence justifies the existence of
227`ert--force-message-log-buffer-truncation'\): The only way that 227`ert--force-message-log-buffer-truncation'): The only way that
228came to my mind was \(message \"\"\), which doesn't have the 228came to my mind was \(message \"\"), which doesn't have the
229desired effect." 229desired effect."
230 :tags '(:causes-redisplay) 230 :tags '(:causes-redisplay)
231 (ert-with-buffer-renamed ("*Messages*") 231 (ert-with-buffer-renamed ("*Messages*")
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index c83044c719e..7e05d49883e 100644
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -213,7 +213,7 @@ END:VTIMEZONE
213 (should (string= "STD-02:00DST-03:00,M3.5.0/03:00:00,M10.5.0/04:00:00" 213 (should (string= "STD-02:00DST-03:00,M3.5.0/03:00:00,M10.5.0/04:00:00"
214 (cdr result))) 214 (cdr result)))
215 (setq vtimezone (icalendar-tests--get-ical-event "BEGIN:VTIMEZONE 215 (setq vtimezone (icalendar-tests--get-ical-event "BEGIN:VTIMEZONE
216TZID:anothername\, with a comma 216TZID:anothername, with a comma
217BEGIN:STANDARD 217BEGIN:STANDARD
218DTSTART:16010101T040000 218DTSTART:16010101T040000
219TZOFFSETFROM:+0300 219TZOFFSETFROM:+0300
@@ -235,7 +235,7 @@ END:VTIMEZONE
235 (cdr result))) 235 (cdr result)))
236 ;; offsetfrom = offsetto 236 ;; offsetfrom = offsetto
237 (setq vtimezone (icalendar-tests--get-ical-event "BEGIN:VTIMEZONE 237 (setq vtimezone (icalendar-tests--get-ical-event "BEGIN:VTIMEZONE
238TZID:Kolkata\, Chennai\, Mumbai\, New Delhi 238TZID:Kolkata, Chennai, Mumbai, New Delhi
239X-MICROSOFT-CDO-TZID:23 239X-MICROSOFT-CDO-TZID:23
240BEGIN:STANDARD 240BEGIN:STANDARD
241DTSTART:16010101T000000 241DTSTART:16010101T000000
@@ -1327,7 +1327,7 @@ DTEND;VALUE=DATE-TIME:20030919T113000"
1327 (icalendar-tests--test-import 1327 (icalendar-tests--test-import
1328 "BEGIN:VCALENDAR 1328 "BEGIN:VCALENDAR
1329BEGIN:VTIMEZONE 1329BEGIN:VTIMEZONE
1330TZID:fictional\, nonexistent\, arbitrary 1330TZID:fictional, nonexistent, arbitrary
1331BEGIN:STANDARD 1331BEGIN:STANDARD
1332DTSTART:20100101T000000 1332DTSTART:20100101T000000
1333TZOFFSETFROM:+0200 1333TZOFFSETFROM:+0200
@@ -1463,7 +1463,7 @@ METHOD:REQUEST
1463PRODID:Microsoft CDO for Microsoft Exchange 1463PRODID:Microsoft CDO for Microsoft Exchange
1464VERSION:2.0 1464VERSION:2.0
1465BEGIN:VTIMEZONE 1465BEGIN:VTIMEZONE
1466TZID:Kolkata\, Chennai\, Mumbai\, New Delhi 1466TZID:Kolkata, Chennai, Mumbai, New Delhi
1467X-MICROSOFT-CDO-TZID:23 1467X-MICROSOFT-CDO-TZID:23
1468BEGIN:STANDARD 1468BEGIN:STANDARD
1469DTSTART:16010101T000000 1469DTSTART:16010101T000000
@@ -2174,7 +2174,7 @@ METHOD:REQUEST
2174PRODID:Microsoft Exchange Server 2007 2174PRODID:Microsoft Exchange Server 2007
2175VERSION:2.0 2175VERSION:2.0
2176BEGIN:VTIMEZONE 2176BEGIN:VTIMEZONE
2177TZID:(UTC+01:00) Amsterdam\, Berlin\, Bern\, Rome\, Stockholm\, Vienna 2177TZID:(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
2178BEGIN:STANDARD 2178BEGIN:STANDARD
2179DTSTART:16010101T030000 2179DTSTART:16010101T030000
2180TZOFFSETFROM:+0200 2180TZOFFSETFROM:+0200
diff --git a/test/etags/el-src/emacs/lisp/progmodes/etags.el b/test/etags/el-src/emacs/lisp/progmodes/etags.el
index 6acafdbaba0..4e079200ee0 100644
--- a/test/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/etags/el-src/emacs/lisp/progmodes/etags.el
@@ -1766,7 +1766,7 @@ if the file was newly read in, the value is the filename."
1766 "No \\[tags-search] or \\[tags-query-replace] in progress")) 1766 "No \\[tags-search] or \\[tags-query-replace] in progress"))
1767 "Form for `tags-loop-continue' to eval to scan one file. 1767 "Form for `tags-loop-continue' to eval to scan one file.
1768If it returns non-nil, this file needs processing by evalling 1768If it returns non-nil, this file needs processing by evalling
1769\`tags-loop-operate'. Otherwise, move on to the next file.") 1769`tags-loop-operate'. Otherwise, move on to the next file.")
1770 1770
1771(defun tags-loop-eval (form) 1771(defun tags-loop-eval (form)
1772 "Evaluate FORM and return its result. 1772 "Evaluate FORM and return its result.