aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorPaul Eggert2015-08-24 23:39:33 -0700
committerPaul Eggert2015-08-24 23:57:25 -0700
commit875a5d0ead827d3da32ecbd30e739a29f07bbc87 (patch)
treeedb42bf8ed4e7d975c6dcbdbe1f4ab0d44f86925 /lisp/progmodes
parent68280c5ee9b87d874ffa7c111b3cac7e634cee22 (diff)
downloademacs-875a5d0ead827d3da32ecbd30e739a29f07bbc87.tar.gz
emacs-875a5d0ead827d3da32ecbd30e739a29f07bbc87.zip
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics. In docstrings, escape apostrophes that would otherwise be translated to curved quotes using the newer, simpler rules. * admin/unidata/unidata-gen.el (unidata-gen-table): * lisp/align.el (align-region): * lisp/allout.el (allout-mode, allout-solicit-alternate-bullet): * lisp/bookmark.el (bookmark-default-annotation-text): * lisp/calc/calc-aent.el (math-read-if, math-read-factor): * lisp/calc/calc-lang.el (math-read-giac-subscr) (math-read-math-subscr): * lisp/calc/calc-misc.el (report-calc-bug): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-read-parse-table-part): * lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules): * lisp/cedet/semantic/complete.el (semantic-displayor-show-request): * lisp/dabbrev.el (dabbrev-expand): * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * lisp/emacs-lisp/elint.el (elint-get-top-forms): * lisp/emacs-lisp/lisp-mnt.el (lm-verify): * lisp/emulation/viper-cmd.el (viper-toggle-search-style): * lisp/erc/erc-button.el (erc-nick-popup): * lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login): * lisp/eshell/em-dirs.el (eshell/cd): * lisp/eshell/em-glob.el (eshell-glob-regexp): * lisp/eshell/em-pred.el (eshell-parse-modifiers): * lisp/eshell/esh-arg.el (eshell-parse-arguments): * lisp/eshell/esh-opt.el (eshell-show-usage): * lisp/files-x.el (modify-file-local-variable): * lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer) (filesets-update-pre010505): * lisp/find-cmd.el (find-generic, find-to-string): * lisp/gnus/auth-source.el (auth-source-netrc-parse-entries): * lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer) (gnus-agent-fetch-headers): * lisp/gnus/gnus-int.el (gnus-start-news-server): * lisp/gnus/gnus-registry.el: (gnus-registry--split-fancy-with-parent-internal): * lisp/gnus/gnus-score.el (gnus-summary-increase-score): * lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): * lisp/gnus/gnus-topic.el (gnus-topic-rename): * lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days): * lisp/gnus/nnmairix.el (nnmairix-widget-create-query): * lisp/gnus/spam.el (spam-check-blackholes): * lisp/mail/feedmail.el (feedmail-run-the-queue): * lisp/mpc.el (mpc-playlist-rename): * lisp/net/ange-ftp.el (ange-ftp-shell-command): * lisp/net/mairix.el (mairix-widget-create-query): * lisp/net/tramp-cache.el: * lisp/obsolete/otodo-mode.el (todo-more-important-p): * lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region): * lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region): * lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region): * lisp/org/ob-core.el (org-babel-goto-named-src-block) (org-babel-goto-named-result): * lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/org/ob-ref.el (org-babel-ref-resolve): * lisp/org/org-agenda.el (org-agenda-prepare): * lisp/org/org-bibtex.el (org-bibtex-fields): * lisp/org/org-clock.el (org-clock-notify-once-if-expired) (org-clock-resolve): * lisp/org/org-feed.el (org-feed-parse-atom-entry): * lisp/org/org-habit.el (org-habit-parse-todo): * lisp/org/org-mouse.el (org-mouse-popup-global-menu) (org-mouse-context-menu): * lisp/org/org-table.el (org-table-edit-formulas): * lisp/org/ox.el (org-export-async-start): * lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question) (dun-rooms, dun-endgame-questions): * lisp/progmodes/ada-mode.el (ada-goto-matching-start): * lisp/progmodes/ada-xref.el (ada-find-executable): * lisp/progmodes/antlr-mode.el (antlr-options-alists): * lisp/progmodes/flymake.el (flymake-parse-err-lines) (flymake-start-syntax-check-process): * lisp/progmodes/python.el (python-define-auxiliary-skeleton): * lisp/progmodes/sql.el (sql-comint): * lisp/progmodes/verilog-mode.el (verilog-load-file-at-point): * lisp/server.el (server-get-auth-key): * lisp/subr.el (version-to-list): * lisp/textmodes/reftex-ref.el (reftex-label): * lisp/textmodes/reftex-toc.el (reftex-toc-rename-label): * lisp/vc/ediff-diff.el (ediff-same-contents): * lisp/vc/vc-cvs.el (vc-cvs-mode-line-string): * test/automated/tramp-tests.el (tramp-test33-asynchronous-requests): Use directed rather than neutral quotes in diagnostics.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/ada-mode.el36
-rw-r--r--lisp/progmodes/ada-prj.el6
-rw-r--r--lisp/progmodes/ada-xref.el6
-rw-r--r--lisp/progmodes/antlr-mode.el2
-rw-r--r--lisp/progmodes/bug-reference.el2
-rw-r--r--lisp/progmodes/cc-align.el6
-rw-r--r--lisp/progmodes/cc-defs.el32
-rw-r--r--lisp/progmodes/cc-engine.el4
-rw-r--r--lisp/progmodes/cc-langs.el12
-rw-r--r--lisp/progmodes/cfengine.el2
-rw-r--r--lisp/progmodes/compile.el4
-rw-r--r--lisp/progmodes/cperl-mode.el10
-rw-r--r--lisp/progmodes/dcl-mode.el2
-rw-r--r--lisp/progmodes/flymake.el8
-rw-r--r--lisp/progmodes/gdb-mi.el4
-rw-r--r--lisp/progmodes/idlw-shell.el18
-rw-r--r--lisp/progmodes/prog-mode.el4
-rw-r--r--lisp/progmodes/python.el4
-rw-r--r--lisp/progmodes/sql.el8
-rw-r--r--lisp/progmodes/verilog-mode.el60
20 files changed, 116 insertions, 114 deletions
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index c1bc79c599c..70af389519c 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -286,11 +286,11 @@ type A is
286 :type 'boolean :group 'ada) 286 :type 'boolean :group 'ada)
287 287
288(defcustom ada-indent-is-separate t 288(defcustom ada-indent-is-separate t
289 "Non-nil means indent 'is separate' or 'is abstract' if on a single line." 289 "Non-nil means indent is separate or is abstract if on a single line."
290 :type 'boolean :group 'ada) 290 :type 'boolean :group 'ada)
291 291
292(defcustom ada-indent-record-rel-type 3 292(defcustom ada-indent-record-rel-type 3
293 "Indentation for 'record' relative to 'type' or 'use'. 293 "Indentation for record relative to type or use.
294 294
295An example is: 295An example is:
296 type A is 296 type A is
@@ -309,7 +309,7 @@ An example is:
309 :type 'integer :group 'ada) 309 :type 'integer :group 'ada)
310 310
311(defcustom ada-indent-return 0 311(defcustom ada-indent-return 0
312 "Indentation for 'return' relative to the matching 'function' statement. 312 "Indentation for `return' relative to the matching `function' statement.
313If `ada-indent-return' is null or negative, the indentation is done relative to 313If `ada-indent-return' is null or negative, the indentation is done relative to
314the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used). 314the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used).
315 315
@@ -349,7 +349,7 @@ This is also used for <<..>> labels"
349 :type '(choice (const ada83) (const ada95) (const ada2005)) :group 'ada) 349 :type '(choice (const ada83) (const ada95) (const ada2005)) :group 'ada)
350 350
351(defcustom ada-move-to-declaration nil 351(defcustom ada-move-to-declaration nil
352 "Non-nil means `ada-move-to-start' moves to the subprogram declaration, not to 'begin'." 352 "Non-nil means `ada-move-to-start' moves to the subprogram declaration, not to `begin'."
353 :type 'boolean :group 'ada) 353 :type 'boolean :group 'ada)
354 354
355(defcustom ada-popup-key '[down-mouse-3] 355(defcustom ada-popup-key '[down-mouse-3]
@@ -397,7 +397,7 @@ Must be one of :
397 :group 'ada) 397 :group 'ada)
398 398
399(defcustom ada-use-indent ada-broken-indent 399(defcustom ada-use-indent ada-broken-indent
400 "Indentation for the lines in a 'use' statement. 400 "Indentation for the lines in a use statement.
401 401
402An example is: 402An example is:
403 use Ada.Text_IO, 403 use Ada.Text_IO,
@@ -405,7 +405,7 @@ An example is:
405 :type 'integer :group 'ada) 405 :type 'integer :group 'ada)
406 406
407(defcustom ada-when-indent 3 407(defcustom ada-when-indent 3
408 "Indentation for 'when' relative to 'exception' or 'case'. 408 "Indentation for when relative to exception or case.
409 409
410An example is: 410An example is:
411 case A is 411 case A is
@@ -413,7 +413,7 @@ An example is:
413 :type 'integer :group 'ada) 413 :type 'integer :group 'ada)
414 414
415(defcustom ada-with-indent ada-broken-indent 415(defcustom ada-with-indent ada-broken-indent
416 "Indentation for the lines in a 'with' statement. 416 "Indentation for the lines in a with statement.
417 417
418An example is: 418An example is:
419 with Ada.Text_IO, 419 with Ada.Text_IO,
@@ -493,7 +493,7 @@ Used to define `ada-*-keywords.'"))
493 "Alist of substrings (entities) that have special casing. 493 "Alist of substrings (entities) that have special casing.
494The substrings are detected for word constituent when the word 494The substrings are detected for word constituent when the word
495is not itself in `ada-case-exception', and only for substrings that 495is not itself in `ada-case-exception', and only for substrings that
496either are at the beginning or end of the word, or start after '_'.") 496either are at the beginning or end of the word, or start after `_'.")
497 497
498(defvar ada-lfd-binding nil 498(defvar ada-lfd-binding nil
499 "Variable to save key binding of LFD when casing is activated.") 499 "Variable to save key binding of LFD when casing is activated.")
@@ -1689,7 +1689,7 @@ See also `ada-auto-case' to disable auto casing altogether."
1689 nil) 1689 nil)
1690 1690
1691(defun ada-capitalize-word (&optional _arg) 1691(defun ada-capitalize-word (&optional _arg)
1692 "Upcase first letter and letters following '_', lower case other letters. 1692 "Upcase first letter and letters following `_', lower case other letters.
1693ARG is ignored, and is there for compatibility with `capitalize-word' only." 1693ARG is ignored, and is there for compatibility with `capitalize-word' only."
1694 (interactive) 1694 (interactive)
1695 (let ((end (save-excursion (skip-syntax-forward "w") (point))) 1695 (let ((end (save-excursion (skip-syntax-forward "w") (point)))
@@ -2834,7 +2834,7 @@ ORGPOINT is the limit position used in the calculation."
2834 (save-excursion 2834 (save-excursion
2835 (goto-char (car match-cons)) 2835 (goto-char (car match-cons))
2836 (unless (ada-search-ignore-string-comment "when" t opos) 2836 (unless (ada-search-ignore-string-comment "when" t opos)
2837 (error "Missing 'when' between 'case' and '=>'")) 2837 (error "Missing when between case and =>"))
2838 (list (save-excursion (back-to-indentation) (point)) 'ada-indent))) 2838 (list (save-excursion (back-to-indentation) (point)) 'ada-indent)))
2839 ;; 2839 ;;
2840 ;; case..is..when 2840 ;; case..is..when
@@ -3003,7 +3003,7 @@ ORGPOINT is the limit position used in the calculation."
3003 (list cur-indent 'ada-broken-indent))))) 3003 (list cur-indent 'ada-broken-indent)))))
3004 3004
3005(defun ada-get-indent-noindent (orgpoint) 3005(defun ada-get-indent-noindent (orgpoint)
3006 "Calculate the indentation when point is just before a 'noindent stmt'. 3006 "Calculate the indentation when point is just before a noindent stmt.
3007ORGPOINT is the limit position used in the calculation." 3007ORGPOINT is the limit position used in the calculation."
3008 (let ((label 0)) 3008 (let ((label 0))
3009 (save-excursion 3009 (save-excursion
@@ -3429,7 +3429,7 @@ Return the new position of point or nil if not found."
3429Moves point to the matching block start." 3429Moves point to the matching block start."
3430 (ada-goto-matching-start 0) 3430 (ada-goto-matching-start 0)
3431 (unless (looking-at (concat "\\<" keyword "\\>")) 3431 (unless (looking-at (concat "\\<" keyword "\\>"))
3432 (error "Matching start is not '%s'" keyword))) 3432 (error "Matching start is not %s" keyword)))
3433 3433
3434 3434
3435(defun ada-check-defun-name (defun-name) 3435(defun ada-check-defun-name (defun-name)
@@ -3667,7 +3667,7 @@ otherwise throw error."
3667 "Move point to the beginning of a block-start. 3667 "Move point to the beginning of a block-start.
3668Which block depends on the value of NEST-LEVEL, which defaults to zero. 3668Which block depends on the value of NEST-LEVEL, which defaults to zero.
3669If NOERROR is non-nil, it only returns nil if no matching start was found. 3669If NOERROR is non-nil, it only returns nil if no matching start was found.
3670If GOTOTHEN is non-nil, point moves to the 'then' following 'if'." 3670If GOTOTHEN is non-nil, point moves to the then following if."
3671 (let ((nest-count (if nest-level nest-level 0)) 3671 (let ((nest-count (if nest-level nest-level 0))
3672 (found nil) 3672 (found nil)
3673 3673
@@ -3734,7 +3734,7 @@ If GOTOTHEN is non-nil, point moves to the 'then' following 'if'."
3734 (if pos 3734 (if pos
3735 (goto-char (car pos)) 3735 (goto-char (car pos))
3736 (error (concat 3736 (error (concat
3737 "No matching 'is' or 'renames' for 'package' at" 3737 "No matching is or renames for package at"
3738 " line " 3738 " line "
3739 (number-to-string (count-lines 1 (1+ current))))))) 3739 (number-to-string (count-lines 1 (1+ current)))))))
3740 (unless (looking-at "renames") 3740 (unless (looking-at "renames")
@@ -3862,7 +3862,7 @@ If GOTOTHEN is non-nil, point moves to the 'then' following 'if'."
3862 ((looking-at "do") 3862 ((looking-at "do")
3863 (unless (ada-search-ignore-string-comment 3863 (unless (ada-search-ignore-string-comment
3864 "\\<accept\\|return\\>" t) 3864 "\\<accept\\|return\\>" t)
3865 (error "Missing 'accept' or 'return' in front of 'do'")))) 3865 (error "Missing accept or return in front of do"))))
3866 (point)) 3866 (point))
3867 3867
3868 (if noerror 3868 (if noerror
@@ -4073,7 +4073,7 @@ Assumes point to be at the end of a statement."
4073 4073
4074 4074
4075(defun ada-looking-at-semi-or () 4075(defun ada-looking-at-semi-or ()
4076 "Return t if looking at an 'or' following a semicolon." 4076 "Return t if looking at an or following a semicolon."
4077 (save-excursion 4077 (save-excursion
4078 (and (looking-at "\\<or\\>") 4078 (and (looking-at "\\<or\\>")
4079 (progn 4079 (progn
@@ -4146,7 +4146,7 @@ Return nil if the private is part of the package name, as in
4146 "type\\)\\>")))))) 4146 "type\\)\\>"))))))
4147 4147
4148(defun ada-search-ignore-complex-boolean (regexp backwardp) 4148(defun ada-search-ignore-complex-boolean (regexp backwardp)
4149 "Search for REGEXP, ignoring comments, strings, 'and then', 'or else'. 4149 "Search for REGEXP, ignoring comments, strings, and then, or else.
4150If BACKWARDP is non-nil, search backward; search forward otherwise." 4150If BACKWARDP is non-nil, search backward; search forward otherwise."
4151 (let (result) 4151 (let (result)
4152 (while (and (setq result (ada-search-ignore-string-comment regexp backwardp)) 4152 (while (and (setq result (ada-search-ignore-string-comment regexp backwardp))
@@ -4366,7 +4366,7 @@ of the region. Otherwise, operate only on the current line."
4366 4366
4367(defun ada-move-to-end () 4367(defun ada-move-to-end ()
4368 "Move point to the end of the block around point. 4368 "Move point to the end of the block around point.
4369Moves to 'begin' if in a declarative part." 4369Moves to begin if in a declarative part."
4370 (interactive) 4370 (interactive)
4371 (let ((pos (point)) 4371 (let ((pos (point))
4372 decl-start) 4372 decl-start)
diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index 4b1c1c26088..7e354bc2b0f 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -309,13 +309,13 @@ where the compilation is done.")
309"If you want to remotely compile, debug and 309"If you want to remotely compile, debug and
310run your application, specify the name of a 310run your application, specify the name of a
311remote machine here. This capability requires 311remote machine here. This capability requires
312the 'rsh' protocol on the remote machine.") 312the rsh protocol on the remote machine.")
313 (ada-prj-field 'cross_prefix "Prefix used in for the cross tool chain" 313 (ada-prj-field 'cross_prefix "Prefix used in for the cross tool chain"
314"When working on multiple cross targets, it is 314"When working on multiple cross targets, it is
315most convenient to specify the prefix of the 315most convenient to specify the prefix of the
316tool chain here. For instance, on PowerPc 316tool chain here. For instance, on PowerPc
317vxworks, you would enter 'powerpc-wrs-vxworks-'. 317vxworks, you would enter powerpc-wrs-vxworks-.
318To use JGNAT, enter 'j'.") 318To use JGNAT, enter j.")
319 ) 319 )
320 320
321 321
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 771dc2a3da1..6f2f78f7f19 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -236,7 +236,7 @@ we need to use `/d' or the drive is never changed.")
236 "Associative list of project files with properties. 236 "Associative list of project files with properties.
237It has the format: (project project ...) 237It has the format: (project project ...)
238A project has the format: (project-file . project-plist) 238A project has the format: (project-file . project-plist)
239\(See 'apropos plist' for operations on property lists). 239\(See `apropos plist' for operations on property lists).
240See `ada-default-prj-properties' for the list of valid properties. 240See `ada-default-prj-properties' for the list of valid properties.
241The current project is retrieved with `ada-xref-current-project'. 241The current project is retrieved with `ada-xref-current-project'.
242Properties are retrieved with `ada-xref-get-project-field', set with 242Properties are retrieved with `ada-xref-get-project-field', set with
@@ -286,7 +286,7 @@ On Windows systems, this will properly handle .exe extension as well."
286 (ada-find-file-in-dir (concat exec-name ".exe") exec-path)))) 286 (ada-find-file-in-dir (concat exec-name ".exe") exec-path))))
287 (if result 287 (if result
288 result 288 result
289 (error "'%s' not found in path" exec-name)))) 289 (error "%s not found in path" exec-name))))
290 290
291(defun ada-initialize-runtime-library (cross-prefix) 291(defun ada-initialize-runtime-library (cross-prefix)
292 "Initialize the variables for the runtime library location. 292 "Initialize the variables for the runtime library location.
@@ -667,7 +667,7 @@ the same base name as the Ada file, but extension given by
667`ada-prj-file-extension' (default .adp). If not found, search for *.adp 667`ada-prj-file-extension' (default .adp). If not found, search for *.adp
668in the current directory; if several are found, and NO-USER-QUESTION 668in the current directory; if several are found, and NO-USER-QUESTION
669is non-nil, prompt the user to select one. If none are found, return 669is non-nil, prompt the user to select one. If none are found, return
670'default.adp'." 670\"default.adp\"."
671 671
672 (let (selected) 672 (let (selected)
673 673
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 28049e9190a..d59948e6447 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -448,7 +448,7 @@ The standard value is (\"file\" \"grammar\" \"rule\" \"subrule\"). See
448 "Generate default exception handler for each rule? ")) 448 "Generate default exception handler for each rule? "))
449 ("codeGenMakeSwitchThreshold" nil 449 ("codeGenMakeSwitchThreshold" nil
450 (20600 antlr-read-value 450 (20600 antlr-read-value
451 "Min number of alternatives for 'switch': ")) 451 "Min number of alternatives for `switch': "))
452 ("codeGenBitsetTestThreshold" nil 452 ("codeGenBitsetTestThreshold" nil
453 (20600 antlr-read-value 453 (20600 antlr-read-value
454 "Min size of lookahead set for bitset test: ")) 454 "Min size of lookahead set for bitset test: "))
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 53d295868c4..a78c57c2053 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -58,7 +58,7 @@ It can use `match-string' to get parts matched against
58There is no default setting for this, it must be set per file. 58There is no default setting for this, it must be set per file.
59If you set it to a symbol in the file Local Variables section, 59If you set it to a symbol in the file Local Variables section,
60you need to add a `bug-reference-url-format' property to it: 60you need to add a `bug-reference-url-format' property to it:
61\(put 'my-bug-reference-url-format 'bug-reference-url-format t) 61\(put \\='my-bug-reference-url-format \\='bug-reference-url-format t)
62so that it is considered safe, see `enable-local-variables'.") 62so that it is considered safe, see `enable-local-variables'.")
63 63
64;;;###autoload 64;;;###autoload
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index 0b96b4a7297..b0c4a6425bf 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -325,10 +325,10 @@ operator you typically want to use it together with some other line-up
325settings, e.g. as follows \(the arglist-close setting is just a 325settings, e.g. as follows \(the arglist-close setting is just a
326suggestion to get a consistent style): 326suggestion to get a consistent style):
327 327
328\(c-set-offset 'arglist-cont '(c-lineup-arglist-operators 0)) 328\(c-set-offset \\='arglist-cont \\='(c-lineup-arglist-operators 0))
329\(c-set-offset 'arglist-cont-nonempty '(c-lineup-arglist-operators 329\(c-set-offset \\='arglist-cont-nonempty \\='(c-lineup-arglist-operators
330 c-lineup-arglist)) 330 c-lineup-arglist))
331\(c-set-offset 'arglist-close '(c-lineup-arglist-close-under-paren)) 331\(c-set-offset \\='arglist-close \\='(c-lineup-arglist-close-under-paren))
332 332
333Works with: arglist-cont, arglist-cont-nonempty." 333Works with: arglist-cont, arglist-cont-nonempty."
334 (save-excursion 334 (save-excursion
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 9826035ec15..0422ca0b028 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1642,11 +1642,11 @@ surrounds the matched alternative, and the regexp will also not match
1642a prefix of any identifier. Adorned regexps cannot be appended. The 1642a prefix of any identifier. Adorned regexps cannot be appended. The
1643language variable `c-nonsymbol-key' is used to make the adornment. 1643language variable `c-nonsymbol-key' is used to make the adornment.
1644 1644
1645A value 'appendable for ADORN is like above, but all alternatives in 1645A value `appendable' for ADORN is like above, but all alternatives in
1646the list that end with a word constituent char will have \\> appended 1646the list that end with a word constituent char will have \\> appended
1647instead, so that the regexp remains appendable. Note that this 1647instead, so that the regexp remains appendable. Note that this
1648variant doesn't always guarantee that an identifier prefix isn't 1648variant doesn't always guarantee that an identifier prefix isn't
1649matched since the symbol constituent '_' is normally considered a 1649matched since the symbol constituent `_' is normally considered a
1650nonword token by \\>. 1650nonword token by \\>.
1651 1651
1652The optional MODE specifies the language to get `c-nonsymbol-key' from 1652The optional MODE specifies the language to get `c-nonsymbol-key' from
@@ -1920,30 +1920,30 @@ There are many flavors of Emacs out there, each with different
1920features supporting those needed by CC Mode. The following values 1920features supporting those needed by CC Mode. The following values
1921might be present: 1921might be present:
1922 1922
1923'8-bit 8 bit syntax entry flags (XEmacs style). 1923`8-bit' 8 bit syntax entry flags (XEmacs style).
1924'1-bit 1 bit syntax entry flags (Emacs style). 1924`1-bit' 1 bit syntax entry flags (Emacs style).
1925'argumentative-bod-function beginning-of-defun and end-of-defun pass 1925`argumentative-bod-function' beginning-of-defun and end-of-defun pass
1926 ARG through to beginning/end-of-defun-function. 1926 ARG through to beginning/end-of-defun-function.
1927'syntax-properties It works to override the syntax for specific characters 1927`syntax-properties' It works to override the syntax for specific characters
1928 in the buffer with the 'syntax-table property. It's 1928 in the buffer with the `syntax-table' property. It's
1929 always set - CC Mode no longer works in emacsen without 1929 always set - CC Mode no longer works in emacsen without
1930 this feature. 1930 this feature.
1931'category-properties Syntax routines can add a level of indirection to text 1931`category-properties' Syntax routines can add a level of indirection to text
1932 properties using the 'category property. 1932 properties using the `category' property.
1933'gen-comment-delim Generic comment delimiters work 1933`gen-comment-delim' Generic comment delimiters work
1934 (i.e. the syntax class `!'). 1934 (i.e. the syntax class `!').
1935'gen-string-delim Generic string delimiters work 1935`gen-string-delim' Generic string delimiters work
1936 (i.e. the syntax class `|'). 1936 (i.e. the syntax class `|').
1937'pps-extended-state `parse-partial-sexp' returns a list with at least 10 1937`pps-extended-state' `parse-partial-sexp' returns a list with at least 10
1938 elements, i.e. it contains the position of the start of 1938 elements, i.e. it contains the position of the start of
1939 the last comment or string. It's always set - CC Mode 1939 the last comment or string. It's always set - CC Mode
1940 no longer works in emacsen without this feature. 1940 no longer works in emacsen without this feature.
1941'posix-char-classes The regexp engine understands POSIX character classes. 1941`posix-char-classes' The regexp engine understands POSIX character classes.
1942'col-0-paren It's possible to turn off the ad-hoc rule that a paren 1942`col-0-paren' It's possible to turn off the ad-hoc rule that a paren
1943 in column zero is the start of a defun. 1943 in column zero is the start of a defun.
1944'infodock This is Infodock (based on XEmacs). 1944`infodock' This is Infodock (based on XEmacs).
1945 1945
1946'8-bit and '1-bit are mutually exclusive.") 1946`8-bit' and `1-bit' are mutually exclusive.")
1947 1947
1948 1948
1949;;; Some helper constants. 1949;;; Some helper constants.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 6c6a4549e61..1223db3b33e 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -671,8 +671,8 @@ position if that is less ('same is returned in this case).
671 671
672NOERROR turns off error logging to `c-parsing-error'. 672NOERROR turns off error logging to `c-parsing-error'.
673 673
674Normally only ';' and virtual semicolons are considered to delimit 674Normally only `;' and virtual semicolons are considered to delimit
675statements, but if COMMA-DELIM is non-nil then ',' is treated 675statements, but if COMMA-DELIM is non-nil then `,' is treated
676as a delimiter too. 676as a delimiter too.
677 677
678Note that this function might do hidden buffer changes. See the 678Note that this function might do hidden buffer changes. See the
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 46da7f994d5..235ef21d066 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -457,7 +457,7 @@ the new syntax, as accepted by `modify-syntax-entry'."
457 (modify-syntax-entry (car mod) (cdr mod) table)) 457 (modify-syntax-entry (car mod) (cdr mod) table))
458 table) 458 table)
459 "Syntax table built on the mode syntax table but additionally 459 "Syntax table built on the mode syntax table but additionally
460classifies symbol constituents like '_' and '$' as word constituents, 460classifies symbol constituents like `_' and `$' as word constituents,
461so that all identifiers are recognized as words.") 461so that all identifiers are recognized as words.")
462 462
463(c-lang-defconst c-get-state-before-change-functions 463(c-lang-defconst c-get-state-before-change-functions
@@ -578,8 +578,8 @@ EOL terminated statements."
578(c-lang-defvar c-has-bitfields (c-lang-const c-has-bitfields)) 578(c-lang-defvar c-has-bitfields (c-lang-const c-has-bitfields))
579 579
580(c-lang-defconst c-modified-constant 580(c-lang-defconst c-modified-constant
581 "Regexp that matches a \"modified\" constant literal such as \"L'a'\", 581 "Regexp that matches a modified constant literal such as \"L\\='a\\='\",
582a \"long character\". In particular, this recognizes forms of constant 582a long character. In particular, this recognizes forms of constant
583which `c-backward-sexp' needs to be called twice to move backwards over." 583which `c-backward-sexp' needs to be called twice to move backwards over."
584 t nil 584 t nil
585 (c c++ objc) "L'\\([^\\'\t\f\n\r]\\|\\\\.\\)'") 585 (c c++ objc) "L'\\([^\\'\t\f\n\r]\\|\\\\.\\)'")
@@ -2101,7 +2101,7 @@ one of `c-type-list-kwds', `c-ref-list-kwds',
2101 "Keywords introducing declarations that can contain a block which 2101 "Keywords introducing declarations that can contain a block which
2102might be followed by variable declarations, e.g. like \"foo\" in 2102might be followed by variable declarations, e.g. like \"foo\" in
2103\"class Foo { ... } foo;\". So if there is a block in a declaration 2103\"class Foo { ... } foo;\". So if there is a block in a declaration
2104like that, it ends with the following ';' and not right away. 2104like that, it ends with the following `;' and not right away.
2105 2105
2106The keywords on list are assumed to also be present on one of the 2106The keywords on list are assumed to also be present on one of the
2107`*-decl-kwds' lists." 2107`*-decl-kwds' lists."
@@ -2344,7 +2344,7 @@ Keywords here should also be in `c-block-stmt-1-kwds'."
2344 2344
2345(c-lang-defconst c-paren-stmt-kwds 2345(c-lang-defconst c-paren-stmt-kwds
2346 "Statement keywords followed by a parenthesis expression that 2346 "Statement keywords followed by a parenthesis expression that
2347nevertheless contains a list separated with ';' and not ','." 2347nevertheless contains a list separated with `;' and not `,'."
2348 t '("for") 2348 t '("for")
2349 idl nil) 2349 idl nil)
2350 2350
@@ -2806,7 +2806,7 @@ the \"class Foo: public Bar\" part of:
2806If parens can occur, the chars inside those aren't filtered with this 2806If parens can occur, the chars inside those aren't filtered with this
2807list. 2807list.
2808 2808
2809'<' and '>' should be disallowed even if angle bracket arglists can 2809`<' and `>' should be disallowed even if angle bracket arglists can
2810occur. That since the search function needs to stop at them anyway to 2810occur. That since the search function needs to stop at them anyway to
2811ensure they are given paren syntax. 2811ensure they are given paren syntax.
2812 2812
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 108ccb654c4..96bb8d3a112 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -157,7 +157,7 @@ bundle agent rcfiles
157 "Whether `cfengine-mode' should print debugging info.") 157 "Whether `cfengine-mode' should print debugging info.")
158 158
159(defvar cfengine-mode-syntax-cache nil 159(defvar cfengine-mode-syntax-cache nil
160 "Cache for `cfengine-mode' syntax trees obtained from 'cf-promises -s json'.") 160 "Cache for `cfengine-mode' syntax trees obtained from `cf-promises -s json'.")
161 161
162(defconst cfengine3-fallback-syntax 162(defconst cfengine3-fallback-syntax
163 '((functions 163 '((functions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 9d1d14880e9..a6e9ed8889a 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -650,11 +650,11 @@ The value nil as an element means to try the default directory."
650Sometimes it is useful for files to supply local values for this variable. 650Sometimes it is useful for files to supply local values for this variable.
651You might also use mode hooks to specify it in certain modes, like this: 651You might also use mode hooks to specify it in certain modes, like this:
652 652
653 (add-hook 'c-mode-hook 653 (add-hook \\='c-mode-hook
654 (lambda () 654 (lambda ()
655 (unless (or (file-exists-p \"makefile\") 655 (unless (or (file-exists-p \"makefile\")
656 (file-exists-p \"Makefile\")) 656 (file-exists-p \"Makefile\"))
657 (set (make-local-variable 'compile-command) 657 (set (make-local-variable \\='compile-command)
658 (concat \"make -k \" 658 (concat \"make -k \"
659 (if buffer-file-name 659 (if buffer-file-name
660 (shell-quote-argument 660 (shell-quote-argument
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 826b3ee73a8..322024ea448 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -7607,7 +7607,7 @@ than a line. Your contribution to update/shorten it is appreciated."
7607 7607
7608(defvar cperl-short-docs 'please-ignore-this-line 7608(defvar cperl-short-docs 'please-ignore-this-line
7609 ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl) 7609 ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl)
7610 "# based on '@(#)@ perl-descr.el 1.9 - describe-perl-symbol' [Perl 5] 7610 "# based on \\='@(#)@ perl-descr.el 1.9 - describe-perl-symbol\\=' [Perl 5]
7611... Range (list context); flip/flop [no flop when flip] (scalar context). 7611... Range (list context); flip/flop [no flop when flip] (scalar context).
7612! ... Logical negation. 7612! ... Logical negation.
7613... != ... Numeric inequality. 7613... != ... Numeric inequality.
@@ -7630,7 +7630,7 @@ $7 Match of the 7th set of parentheses in the last match (auto-local).
7630$8 Match of the 8th set of parentheses in the last match (auto-local). 7630$8 Match of the 8th set of parentheses in the last match (auto-local).
7631$9 Match of the 9th set of parentheses in the last match (auto-local). 7631$9 Match of the 9th set of parentheses in the last match (auto-local).
7632$& The string matched by the last pattern match (auto-local). 7632$& The string matched by the last pattern match (auto-local).
7633$' The string after what was matched by the last match (auto-local). 7633$\\=' The string after what was matched by the last match (auto-local).
7634$\\=` The string before what was matched by the last match (auto-local). 7634$\\=` The string before what was matched by the last match (auto-local).
7635 7635
7636$( The real gid of this process. 7636$( The real gid of this process.
@@ -7886,7 +7886,7 @@ pop(ARRAY)
7886print [FILEHANDLE] [(LIST)] 7886print [FILEHANDLE] [(LIST)]
7887printf [FILEHANDLE] (FORMAT,LIST) 7887printf [FILEHANDLE] (FORMAT,LIST)
7888push(ARRAY,LIST) 7888push(ARRAY,LIST)
7889q/STRING/ Synonym for 'STRING' 7889q/STRING/ Synonym for \\='STRING\\='
7890qq/STRING/ Synonym for \"STRING\" 7890qq/STRING/ Synonym for \"STRING\"
7891qx/STRING/ Synonym for \\=`STRING\\=` 7891qx/STRING/ Synonym for \\=`STRING\\=`
7892rand[(EXPR)] 7892rand[(EXPR)]
@@ -7988,7 +7988,7 @@ DESTROY Shorthand for `sub DESTROY {...}'.
7988abs [ EXPR ] absolute value 7988abs [ EXPR ] absolute value
7989... and ... Low-precedence synonym for &&. 7989... and ... Low-precedence synonym for &&.
7990bless REFERENCE [, PACKAGE] Makes reference into an object of a package. 7990bless REFERENCE [, PACKAGE] Makes reference into an object of a package.
7991chomp [LIST] Strips $/ off LIST/$_. Returns count. Special if $/ eq ''! 7991chomp [LIST] Strips $/ off LIST/$_. Returns count. Special if $/ eq \\='\\='!
7992chr Converts a number to char with the same ordinal. 7992chr Converts a number to char with the same ordinal.
7993else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. 7993else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}.
7994elsif Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. 7994elsif Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}.
@@ -8005,7 +8005,7 @@ not ... Low-precedence synonym for ! - negation.
8005... or ... Low-precedence synonym for ||. 8005... or ... Low-precedence synonym for ||.
8006pos STRING Set/Get end-position of the last match over this string, see \\G. 8006pos STRING Set/Get end-position of the last match over this string, see \\G.
8007quotemeta [ EXPR ] Quote regexp metacharacters. 8007quotemeta [ EXPR ] Quote regexp metacharacters.
8008qw/WORD1 .../ Synonym of split('', 'WORD1 ...') 8008qw/WORD1 .../ Synonym of split(\\='\\=', \\='WORD1 ...\\=')
8009readline FH Synonym of <FH>. 8009readline FH Synonym of <FH>.
8010readpipe CMD Synonym of \\=`CMD\\=`. 8010readpipe CMD Synonym of \\=`CMD\\=`.
8011ref [ EXPR ] Type of EXPR when dereferenced. 8011ref [ EXPR ] Type of EXPR when dereferenced.
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index eab4ae854d5..4c997bdd4d0 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -173,7 +173,7 @@ It can have the following values:
173 first-line indentation for the first line in a buffer or SUBROUTINE. 173 first-line indentation for the first line in a buffer or SUBROUTINE.
174CUR-INDENT is the indentation of the preceding command line. 174CUR-INDENT is the indentation of the preceding command line.
175EXTRA-INDENT is the default change in indentation for this line 175EXTRA-INDENT is the default change in indentation for this line
176\(a negative number for 'outdent). 176\(a negative number for outdent).
177LAST-POINT is the buffer position of the first significant word on the 177LAST-POINT is the buffer position of the first significant word on the
178previous line or nil if the current line is the first line. 178previous line or nil if the current line is the first line.
179THIS-POINT is the buffer position of the first significant word on the 179THIS-POINT is the buffer position of the first significant word on the
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 1942271e561..f220633fefa 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -785,7 +785,7 @@ Perhaps use text from LINE-ERR-INFO-LIST to enhance highlighting."
785 (when (flymake-same-files real-file-name source-file-name) 785 (when (flymake-same-files real-file-name source-file-name)
786 (setq line-err-info (flymake-ler-set-file line-err-info nil)) 786 (setq line-err-info (flymake-ler-set-file line-err-info nil))
787 (setq err-info-list (flymake-add-err-info err-info-list line-err-info)))) 787 (setq err-info-list (flymake-add-err-info err-info-list line-err-info))))
788 (flymake-log 3 "parsed '%s', %s line-err-info" (nth idx lines) (if line-err-info "got" "no")) 788 (flymake-log 3 "parsed %s, %s line-err-info" (nth idx lines) (if line-err-info "got" "no"))
789 (setq idx (1+ idx))) 789 (setq idx (1+ idx)))
790 err-info-list)) 790 err-info-list))
791 791
@@ -1084,8 +1084,10 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
1084 default-directory) 1084 default-directory)
1085 process) 1085 process)
1086 (error 1086 (error
1087 (let* ((err-str (format "Failed to launch syntax check process '%s' with args %s: %s" 1087 (let* ((err-str
1088 cmd args (error-message-string err))) 1088 (format-message
1089 "Failed to launch syntax check process ‘%s’ with args %s: %s"
1090 cmd args (error-message-string err)))
1089 (source-file-name buffer-file-name) 1091 (source-file-name buffer-file-name)
1090 (cleanup-f (flymake-get-cleanup-function source-file-name))) 1092 (cleanup-f (flymake-get-cleanup-function source-file-name)))
1091 (flymake-log 0 err-str) 1093 (flymake-log 0 err-str)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 4af8ac6971e..9942e17397a 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2195,10 +2195,10 @@ value when the message is complete.
2195 2195
2196Implement the following GDB/MI output grammar rule: 2196Implement the following GDB/MI output grammar rule:
2197 result-class ==> 2197 result-class ==>
2198 'done' | 'running' | 'connected' | 'error' | 'exit' 2198 `done' | `running' | `connected' | `error' | `exit'
2199 2199
2200 async-class ==> 2200 async-class ==>
2201 'stopped' | others (where others will be added depending on the needs 2201 `stopped' | others (where others will be added depending on the needs
2202 --this is still in development).") 2202 --this is still in development).")
2203 2203
2204(defun gdbmi-bnf-result-and-async-record-impl () 2204(defun gdbmi-bnf-result-and-async-record-impl ()
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 23f9d4af8c9..b5e799848de 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -379,15 +379,15 @@ This mechanism is useful for correct interaction with the IDL function
379GET_KBRD, because in normal operation IDLWAVE only sends \\n terminated 379GET_KBRD, because in normal operation IDLWAVE only sends \\n terminated
380strings. Here is some example code which makes use of the default spells. 380strings. Here is some example code which makes use of the default spells.
381 381
382 print,'<chars>' ; Make IDLWAVE switch to character mode 382 print,\\='<chars>\\=' ; Make IDLWAVE switch to character mode
383 REPEAT BEGIN 383 REPEAT BEGIN
384 A = GET_KBRD(1) 384 A = GET_KBRD(1)
385 PRINT, BYTE(A) 385 PRINT, BYTE(A)
386 ENDREP UNTIL A EQ 'q' 386 ENDREP UNTIL A EQ \\='q\\='
387 print,'</chars>' ; Make IDLWAVE switch back to line mode 387 print,\\='</chars>\\=' ; Make IDLWAVE switch back to line mode
388 388
389 print,'Quit the program, y or n?' 389 print,\\='Quit the program, y or n?\\='
390 print,'<onechar>' ; Ask IDLWAVE to send one character 390 print,\\='<onechar>\\=' ; Ask IDLWAVE to send one character
391 answer = GET_KBRD(1) 391 answer = GET_KBRD(1)
392 392
393Since the IDLWAVE shell defines the system variable `!IDLWAVE_VERSION', 393Since the IDLWAVE shell defines the system variable `!IDLWAVE_VERSION',
@@ -403,11 +403,11 @@ idlwave_char_input,/off ; End the loop to send characters
403 403
404pro idlwave_char_input,on=on,off=off 404pro idlwave_char_input,on=on,off=off
405 ;; Test if we are running under Emacs 405 ;; Test if we are running under Emacs
406 defsysv,'!idlwave_version',exists=running_emacs 406 defsysv,\\='!idlwave_version\\=',exists=running_emacs
407 if running_emacs then begin 407 if running_emacs then begin
408 if keyword_set(on) then print,'<chars>' $ 408 if keyword_set(on) then print,\\='<chars>\\=' $
409 else if keyword_set(off) then print,'</chars>' $ 409 else if keyword_set(off) then print,\\='</chars>\\=' $
410 else print,'<onechar>' 410 else print,\\='<onechar>\\='
411 endif 411 endif
412end" 412end"
413 :group 'idlwave-shell-command-setup 413 :group 'idlwave-shell-command-setup
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index b8cd9d93912..8f50887113e 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -192,9 +192,9 @@ in `prettify-symbols-alist' (which see), which are locally defined
192by major modes supporting prettifying. To add further customizations 192by major modes supporting prettifying. To add further customizations
193for a given major mode, you can modify `prettify-symbols-alist' thus: 193for a given major mode, you can modify `prettify-symbols-alist' thus:
194 194
195 (add-hook 'emacs-lisp-mode-hook 195 (add-hook \\='emacs-lisp-mode-hook
196 (lambda () 196 (lambda ()
197 (push '(\"<=\" . ?≤) prettify-symbols-alist))) 197 (push \\='(\"<=\" . ?≤) prettify-symbols-alist)))
198 198
199You can enable this mode locally in desired buffers, or use 199You can enable this mode locally in desired buffers, or use
200`global-prettify-symbols-mode' to enable it for all modes that 200`global-prettify-symbols-mode' to enable it for all modes that
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index abae8aff47b..35f10e54fc7 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4005,8 +4005,8 @@ The skeleton will be bound to python-skeleton-NAME."
4005 (declare (indent 2)) 4005 (declare (indent 2))
4006 (let* ((name (symbol-name name)) 4006 (let* ((name (symbol-name name))
4007 (function-name (intern (concat "python-skeleton--" name))) 4007 (function-name (intern (concat "python-skeleton--" name)))
4008 (msg (format 4008 (msg (format-message
4009 "Add '%s' clause? " name))) 4009 "Add %s clause? " name)))
4010 (when (not skel) 4010 (when (not skel)
4011 (setq skel 4011 (setq skel
4012 `(< ,(format "%s:" name) \n \n 4012 `(< ,(format "%s:" name) \n \n
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 3800cfb6b15..18f445ca5cf 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -3799,7 +3799,7 @@ Note that SQL doesn't have an escape character unless you specify
3799one. If you specify backslash as escape character in SQL, you 3799one. If you specify backslash as escape character in SQL, you
3800must tell Emacs. Here's how to do that in your init file: 3800must tell Emacs. Here's how to do that in your init file:
3801 3801
3802\(add-hook 'sql-mode-hook 3802\(add-hook \\='sql-mode-hook
3803 (lambda () 3803 (lambda ()
3804 (modify-syntax-entry ?\\\\ \".\" sql-mode-syntax-table)))" 3804 (modify-syntax-entry ?\\\\ \".\" sql-mode-syntax-table)))"
3805 :group 'SQL 3805 :group 'SQL
@@ -3896,9 +3896,9 @@ If you want to make SQL buffers limited in length, add the function
3896Here is an example for your init file. It keeps the SQLi buffer a 3896Here 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.
@@ -4276,7 +4276,7 @@ passed as command line arguments."
4276 ;; work for remote hosts; we suppress the check there. 4276 ;; work for remote hosts; we suppress the check there.
4277 (unless (or (file-remote-p default-directory) 4277 (unless (or (file-remote-p default-directory)
4278 (executable-find program)) 4278 (executable-find program))
4279 (error "Unable to locate SQL program \'%s\'" program)) 4279 (error "Unable to locate SQL program %s" program))
4280 ;; Make sure buffer name is unique. 4280 ;; Make sure buffer name is unique.
4281 (when (sql-buffer-live-p (format "*%s*" buf-name)) 4281 (when (sql-buffer-live-p (format "*%s*" buf-name))
4282 (setq buf-name (format "SQL-%s" product)) 4282 (setq buf-name (format "SQL-%s" product))
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 32448055308..107dee5803d 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -4477,7 +4477,7 @@ More specifically, after a generate and before an endgenerate."
4477 (= nest 0) )) ; return nest 4477 (= nest 0) )) ; return nest
4478 4478
4479(defun verilog-in-deferred-immediate-final-p () 4479(defun verilog-in-deferred-immediate-final-p ()
4480 "Return true if inside an 'assert/assume/cover final' statement." 4480 "Return true if inside an assert/assume/cover final statement."
4481 (interactive) 4481 (interactive)
4482 (and (looking-at "final") 4482 (and (looking-at "final")
4483 (verilog-looking-back "\\<\\(?:assert\\|assume\\|cover\\)\\>\\s-+" nil)) 4483 (verilog-looking-back "\\<\\(?:assert\\|assume\\|cover\\)\\>\\s-+" nil))
@@ -7221,7 +7221,7 @@ will be completed at runtime and should not be added to this list.")
7221 7221
7222(defun verilog-func-completion (type) 7222(defun verilog-func-completion (type)
7223 "Build regular expression for module/task/function names. 7223 "Build regular expression for module/task/function names.
7224TYPE is 'module, 'tf for task or function, or t if unknown." 7224TYPE is module, tf for task or function, or t if unknown."
7225 (if (string= verilog-str "") 7225 (if (string= verilog-str "")
7226 (setq verilog-str "[a-zA-Z_]")) 7226 (setq verilog-str "[a-zA-Z_]"))
7227 (let ((verilog-str (concat (cond 7227 (let ((verilog-str (concat (cond
@@ -7294,7 +7294,7 @@ must be a function to be called for every match to check if this should
7294really be a match. If VERILOG-FLAG is t, the function returns a list of 7294really be a match. If VERILOG-FLAG is t, the function returns a list of
7295all possible completions. If VERILOG-FLAG is nil it returns a string, 7295all possible completions. If VERILOG-FLAG is nil it returns a string,
7296the longest possible completion, or t if VERILOG-STR is an exact match. 7296the longest possible completion, or t if VERILOG-STR is an exact match.
7297If VERILOG-FLAG is 'lambda, the function returns t if VERILOG-STR is an 7297If VERILOG-FLAG is lambda, the function returns t if VERILOG-STR is an
7298exact match, nil otherwise." 7298exact match, nil otherwise."
7299 (save-excursion 7299 (save-excursion
7300 (let ((verilog-all nil)) 7300 (let ((verilog-all nil))
@@ -7489,7 +7489,7 @@ VERILOG-PRED is non-nil, it must be a function to be called for every match
7489to check if this should really be a match. If VERILOG-FLAG is t, the 7489to check if this should really be a match. If VERILOG-FLAG is t, the
7490function returns a list of all possible completions. If it is nil it 7490function returns a list of all possible completions. If it is nil it
7491returns a string, the longest possible completion, or t if VERILOG-STR is 7491returns a string, the longest possible completion, or t if VERILOG-STR is
7492an exact match. If VERILOG-FLAG is 'lambda, the function returns t if 7492an exact match. If VERILOG-FLAG is lambda, the function returns t if
7493VERILOG-STR is an exact match, nil otherwise." 7493VERILOG-STR is an exact match, nil otherwise."
7494 (save-excursion 7494 (save-excursion
7495 (let ((verilog-all nil) 7495 (let ((verilog-all nil)
@@ -8666,7 +8666,7 @@ Return an array of [outputs inouts inputs wire reg assign const]."
8666 8666
8667(defun verilog-read-sub-decls-expr (submoddecls comment port expr) 8667(defun verilog-read-sub-decls-expr (submoddecls comment port expr)
8668 "For `verilog-read-sub-decls-line', parse a subexpression and add signals." 8668 "For `verilog-read-sub-decls-line', parse a subexpression and add signals."
8669 ;;(message "vrsde: '%s'" expr) 8669 ;;(message "vrsde: %s" expr)
8670 ;; Replace special /*[....]*/ comments inserted by verilog-auto-inst-port 8670 ;; Replace special /*[....]*/ comments inserted by verilog-auto-inst-port
8671 (setq expr (verilog-string-replace-matches "/\\*\\(\\[[^*]+\\]\\)\\*/" "\\1" nil nil expr)) 8671 (setq expr (verilog-string-replace-matches "/\\*\\(\\[[^*]+\\]\\)\\*/" "\\1" nil nil expr))
8672 ;; Remove front operators 8672 ;; Remove front operators
@@ -8685,25 +8685,25 @@ Return an array of [outputs inouts inputs wire reg assign const]."
8685 (let (sig vec multidim) 8685 (let (sig vec multidim)
8686 ;; Remove leading reduction operators, etc 8686 ;; Remove leading reduction operators, etc
8687 (setq expr (verilog-string-replace-matches "^\\s-*[---+~!|&]+\\s-*" "" nil nil expr)) 8687 (setq expr (verilog-string-replace-matches "^\\s-*[---+~!|&]+\\s-*" "" nil nil expr))
8688 ;;(message "vrsde-ptop: '%s'" expr) 8688 ;;(message "vrsde-ptop: %s" expr)
8689 (cond ; Find \signal. Final space is part of escaped signal name 8689 (cond ; Find \signal. Final space is part of escaped signal name
8690 ((string-match "^\\s-*\\(\\\\[^ \t\n\f]+\\s-\\)" expr) 8690 ((string-match "^\\s-*\\(\\\\[^ \t\n\f]+\\s-\\)" expr)
8691 ;;(message "vrsde-s: '%s'" (match-string 1 expr)) 8691 ;;(message "vrsde-s: %s" (match-string 1 expr))
8692 (setq sig (match-string 1 expr) 8692 (setq sig (match-string 1 expr)
8693 expr (substring expr (match-end 0)))) 8693 expr (substring expr (match-end 0))))
8694 ;; Find signal 8694 ;; Find signal
8695 ((string-match "^\\s-*\\([a-zA-Z_][a-zA-Z_0-9]*\\)" expr) 8695 ((string-match "^\\s-*\\([a-zA-Z_][a-zA-Z_0-9]*\\)" expr)
8696 ;;(message "vrsde-s: '%s'" (match-string 1 expr)) 8696 ;;(message "vrsde-s: %s" (match-string 1 expr))
8697 (setq sig (verilog-string-remove-spaces (match-string 1 expr)) 8697 (setq sig (verilog-string-remove-spaces (match-string 1 expr))
8698 expr (substring expr (match-end 0))))) 8698 expr (substring expr (match-end 0)))))
8699 ;; Find [vector] or [multi][multi][multi][vector] 8699 ;; Find [vector] or [multi][multi][multi][vector]
8700 (while (string-match "^\\s-*\\(\\[[^]]+\\]\\)" expr) 8700 (while (string-match "^\\s-*\\(\\[[^]]+\\]\\)" expr)
8701 ;;(message "vrsde-v: '%s'" (match-string 1 expr)) 8701 ;;(message "vrsde-v: %s" (match-string 1 expr))
8702 (when vec (setq multidim (cons vec multidim))) 8702 (when vec (setq multidim (cons vec multidim)))
8703 (setq vec (match-string 1 expr) 8703 (setq vec (match-string 1 expr)
8704 expr (substring expr (match-end 0)))) 8704 expr (substring expr (match-end 0))))
8705 ;; If found signal, and nothing unrecognized, add the signal 8705 ;; If found signal, and nothing unrecognized, add the signal
8706 ;;(message "vrsde-rem: '%s'" expr) 8706 ;;(message "vrsde-rem: %s" expr)
8707 (when (and sig (string-match "^\\s-*$" expr)) 8707 (when (and sig (string-match "^\\s-*$" expr))
8708 (verilog-read-sub-decls-sig submoddecls comment port sig vec multidim)))))) 8708 (verilog-read-sub-decls-sig submoddecls comment port sig vec multidim))))))
8709 8709
@@ -9285,8 +9285,8 @@ Parameters must be simple assignments to constants, or have their own
9285\"parameter\" label rather than a list of parameters. Thus: 9285\"parameter\" label rather than a list of parameters. Thus:
9286 9286
9287 parameter X = 5, Y = 10; // Ok 9287 parameter X = 5, Y = 10; // Ok
9288 parameter X = {1'b1, 2'h2}; // Ok 9288 parameter X = {1\\='b1, 2\\='h2}; // Ok
9289 parameter X = {1'b1, 2'h2}, Y = 10; // Bad, make into 2 parameter lines 9289 parameter X = {1\\='b1, 2\\='h2}, Y = 10; // Bad, make into 2 parameter lines
9290 9290
9291Defines must be simple text substitutions, one on a line, starting 9291Defines must be simple text substitutions, one on a line, starting
9292at the beginning of the line. Any ifdefs or multiline comments around the 9292at the beginning of the line. Any ifdefs or multiline comments around the
@@ -10099,7 +10099,7 @@ if non-nil."
10099 10099
10100;; Combined 10100;; Combined
10101(defun verilog-decls-get-signals (decls) 10101(defun verilog-decls-get-signals (decls)
10102 "Return all declared signals in DECLS, excluding 'assign' statements." 10102 "Return all declared signals in DECLS, excluding assign statements."
10103 (append 10103 (append
10104 (verilog-decls-get-outputs decls) 10104 (verilog-decls-get-outputs decls)
10105 (verilog-decls-get-inouts decls) 10105 (verilog-decls-get-inouts decls)
@@ -11484,14 +11484,14 @@ Lisp Templates:
11484 Lisp functions: 11484 Lisp functions:
11485 11485
11486 vl-name Name portion of the input/output port. 11486 vl-name Name portion of the input/output port.
11487 vl-bits Bus bits portion of the input/output port ('[2:0]'). 11487 vl-bits Bus bits portion of the input/output port ([2:0]).
11488 vl-mbits Multidimensional array bits for port ('[2:0][3:0]'). 11488 vl-mbits Multidimensional array bits for port ([2:0][3:0]).
11489 vl-width Width of the input/output port ('3' for [2:0]). 11489 vl-width Width of the input/output port (3 for [2:0]).
11490 May be a (...) expression if bits isn't a constant. 11490 May be a (...) expression if bits isn't a constant.
11491 vl-dir Direction of the pin input/output/inout/interface. 11491 vl-dir Direction of the pin input/output/inout/interface.
11492 vl-modport The modport, if an interface with a modport. 11492 vl-modport The modport, if an interface with a modport.
11493 vl-cell-type Module name/type of the cell ('InstModule'). 11493 vl-cell-type Module name/type of the cell (InstModule).
11494 vl-cell-name Instance name of the cell ('instName'). 11494 vl-cell-name Instance name of the cell (instName).
11495 11495
11496 Normal Lisp variables may be used in expressions. See 11496 Normal Lisp variables may be used in expressions. See
11497 `verilog-read-defines' which can set vh-{definename} variables for use 11497 `verilog-read-defines' which can set vh-{definename} variables for use
@@ -13017,9 +13017,9 @@ An example of making a stub for another module:
13017 /*AUTOINOUTMODULE(\"Foo\")*/ 13017 /*AUTOINOUTMODULE(\"Foo\")*/
13018 /*AUTOTIEOFF*/ 13018 /*AUTOTIEOFF*/
13019 // verilator lint_off UNUSED 13019 // verilator lint_off UNUSED
13020 wire _unused_ok = &{1'b0, 13020 wire _unused_ok = &{1\\='b0,
13021 /*AUTOUNUSED*/ 13021 /*AUTOUNUSED*/
13022 1'b0}; 13022 1\\='b0};
13023 // verilator lint_on UNUSED 13023 // verilator lint_on UNUSED
13024 endmodule 13024 endmodule
13025 13025
@@ -13034,7 +13034,7 @@ Typing \\[verilog-auto] will make this into:
13034 13034
13035 /*AUTOTIEOFF*/ 13035 /*AUTOTIEOFF*/
13036 // Beginning of autotieoff 13036 // Beginning of autotieoff
13037 wire [2:0] foo = 3'b0; 13037 wire [2:0] foo = 3\\='b0;
13038 // End of automatics 13038 // End of automatics
13039 ... 13039 ...
13040 endmodule" 13040 endmodule"
@@ -13159,7 +13159,7 @@ with \"unused\" in the signal name.
13159 13159
13160To reduce simulation time, the _unused_ok signal should be forced to a 13160To reduce simulation time, the _unused_ok signal should be forced to a
13161constant to prevent wiggling. The easiest thing to do is use a 13161constant to prevent wiggling. The easiest thing to do is use a
13162reduction-and with 1'b0 as shown. 13162reduction-and with 1\\='b0 as shown.
13163 13163
13164This way all unused signals are in one place, making it convenient to add 13164This way all unused signals are in one place, making it convenient to add
13165your tool's specific pragmas around the assignment to disable any unused 13165your tool's specific pragmas around the assignment to disable any unused
@@ -13175,9 +13175,9 @@ An example of making a stub for another module:
13175 /*AUTOINOUTMODULE(\"Examp\")*/ 13175 /*AUTOINOUTMODULE(\"Examp\")*/
13176 /*AUTOTIEOFF*/ 13176 /*AUTOTIEOFF*/
13177 // verilator lint_off UNUSED 13177 // verilator lint_off UNUSED
13178 wire _unused_ok = &{1'b0, 13178 wire _unused_ok = &{1\\='b0,
13179 /*AUTOUNUSED*/ 13179 /*AUTOUNUSED*/
13180 1'b0}; 13180 1\\='b0};
13181 // verilator lint_on UNUSED 13181 // verilator lint_on UNUSED
13182 endmodule 13182 endmodule
13183 13183
@@ -13185,14 +13185,14 @@ Typing \\[verilog-auto] will make this into:
13185 13185
13186 ... 13186 ...
13187 // verilator lint_off UNUSED 13187 // verilator lint_off UNUSED
13188 wire _unused_ok = &{1'b0, 13188 wire _unused_ok = &{1\\='b0,
13189 /*AUTOUNUSED*/ 13189 /*AUTOUNUSED*/
13190 // Beginning of automatics 13190 // Beginning of automatics
13191 unused_input_a, 13191 unused_input_a,
13192 unused_input_b, 13192 unused_input_b,
13193 unused_input_c, 13193 unused_input_c,
13194 // End of automatics 13194 // End of automatics
13195 1'b0}; 13195 1\\='b0};
13196 // verilator lint_on UNUSED 13196 // verilator lint_on UNUSED
13197 endmodule" 13197 endmodule"
13198 (interactive) 13198 (interactive)
@@ -13267,9 +13267,9 @@ An example:
13267 13267
13268 //== State enumeration 13268 //== State enumeration
13269 parameter [2:0] // synopsys enum state_info 13269 parameter [2:0] // synopsys enum state_info
13270 SM_IDLE = 3'b000, 13270 SM_IDLE = 3\\='b000,
13271 SM_SEND = 3'b001, 13271 SM_SEND = 3\\='b001,
13272 SM_WAIT1 = 3'b010; 13272 SM_WAIT1 = 3\\='b010;
13273 //== State variables 13273 //== State variables
13274 reg [2:0] /* synopsys enum state_info */ 13274 reg [2:0] /* synopsys enum state_info */
13275 state_r; /* synopsys state_vector state_r */ 13275 state_r; /* synopsys state_vector state_r */
@@ -14177,7 +14177,7 @@ Files are checked based on `verilog-library-flags'."
14177 (match-string 1) (buffer-file-name)))) 14177 (match-string 1) (buffer-file-name))))
14178 (when warn 14178 (when warn
14179 (message 14179 (message
14180 "File '%s' isn't readable, use shift-mouse2 to paste in this field" 14180 "File %s isn't readable, use shift-mouse2 to paste in this field"
14181 (match-string 1)))))))) 14181 (match-string 1))))))))
14182 14182
14183 14183