aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-04-09 21:05:48 +0800
committerChong Yidong2012-04-09 21:05:48 +0800
commitfb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5 (patch)
treeeba43d1fa2427a77f1f6b1468838426b33ea5973
parenta18ecafa99e7e7c3caa35ed68dd8a7b9b5d2b8e3 (diff)
downloademacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.tar.gz
emacs-fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5.zip
Remove * characters from the front of variable docstrings.
-rw-r--r--lisp/allout-widgets.el18
-rw-r--r--lisp/allout.el22
-rw-r--r--lisp/calc/calc-units.el2
-rw-r--r--lisp/calc/calc.el2
-rw-r--r--lisp/cedet/data-debug.el2
-rw-r--r--lisp/cedet/pulse.el4
-rw-r--r--lisp/cedet/semantic.el4
-rw-r--r--lisp/completion.el8
-rw-r--r--lisp/dframe.el8
-rw-r--r--lisp/dos-w32.el4
-rw-r--r--lisp/emacs-lisp/chart.el2
-rw-r--r--lisp/emacs-lisp/edebug.el2
-rw-r--r--lisp/emacs-lisp/eieio.el6
-rw-r--r--lisp/emacs-lisp/ert.el2
-rw-r--r--lisp/emacs-lisp/timer.el2
-rw-r--r--lisp/emulation/viper-cmd.el2
-rw-r--r--lisp/emulation/viper-ex.el4
-rw-r--r--lisp/emulation/viper-init.el58
-rw-r--r--lisp/emulation/viper-keym.el8
-rw-r--r--lisp/emulation/viper-mous.el8
-rw-r--r--lisp/emulation/viper-util.el2
-rw-r--r--lisp/emulation/viper.el4
-rw-r--r--lisp/epa.el6
-rw-r--r--lisp/erc/erc-autoaway.el12
-rw-r--r--lisp/erc/erc-backend.el12
-rw-r--r--lisp/erc/erc-button.el12
-rw-r--r--lisp/erc/erc-dcc.el20
-rw-r--r--lisp/erc/erc-goodies.el4
-rw-r--r--lisp/erc/erc-log.el16
-rw-r--r--lisp/erc/erc-match.el10
-rw-r--r--lisp/erc/erc-notify.el8
-rw-r--r--lisp/erc/erc-pcomplete.el2
-rw-r--r--lisp/erc/erc-sound.el2
-rw-r--r--lisp/erc/erc-stamp.el26
-rw-r--r--lisp/erc/erc-track.el12
-rw-r--r--lisp/erc/erc-truncate.el2
-rw-r--r--lisp/erc/erc-xdcc.el8
-rw-r--r--lisp/erc/erc.el48
-rw-r--r--lisp/facemenu.el2
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/ffap.el2
-rw-r--r--lisp/find-file.el2
-rw-r--r--lisp/follow.el4
-rw-r--r--lisp/font-lock.el8
-rw-r--r--lisp/forms.el2
-rw-r--r--lisp/ido.el4
-rw-r--r--lisp/iswitchb.el2
-rw-r--r--lisp/kmacro.el4
-rw-r--r--lisp/language/ethio-util.el16
-rw-r--r--lisp/language/korea-util.el2
-rw-r--r--lisp/language/tibet-util.el2
-rw-r--r--lisp/mail/binhex.el6
-rw-r--r--lisp/mail/feedmail.el8
-rw-r--r--lisp/mail/footnote.el2
-rw-r--r--lisp/mail/hashcash.el16
-rw-r--r--lisp/mail/mail-extr.el12
-rw-r--r--lisp/mail/mail-hist.el6
-rw-r--r--lisp/mail/mailabbrev.el4
-rw-r--r--lisp/mail/metamail.el8
-rw-r--r--lisp/mail/mspools.el10
-rw-r--r--lisp/mail/rmail.el6
-rw-r--r--lisp/mail/sendmail.el2
-rw-r--r--lisp/mail/undigest.el2
-rw-r--r--lisp/mail/uudecode.el6
-rw-r--r--lisp/minibuf-eldef.el2
-rw-r--r--lisp/mouse-drag.el2
-rw-r--r--lisp/msb.el6
-rw-r--r--lisp/net/ange-ftp.el10
-rw-r--r--lisp/net/goto-addr.el6
-rw-r--r--lisp/net/imap.el4
-rw-r--r--lisp/net/quickurl.el18
-rw-r--r--lisp/net/rcirc.el20
-rw-r--r--lisp/net/snmp-mode.el4
-rw-r--r--lisp/net/socks.el6
-rw-r--r--lisp/net/tramp-ftp.el2
-rw-r--r--lisp/net/tramp-gvfs.el4
-rw-r--r--lisp/net/tramp-gw.el8
-rw-r--r--lisp/net/tramp-sh.el12
-rw-r--r--lisp/net/tramp-smb.el8
-rw-r--r--lisp/net/tramp.el102
-rw-r--r--lisp/net/webjump.el2
-rw-r--r--lisp/newcomment.el6
-rw-r--r--lisp/nxml/nxml-glyph.el2
-rw-r--r--lisp/nxml/rng-nxml.el2
-rw-r--r--lisp/obsolete/erc-hecomplete.el4
-rw-r--r--lisp/obsolete/fast-lock.el10
-rw-r--r--lisp/obsolete/iso-acc.el6
-rw-r--r--lisp/obsolete/resume.el2
-rw-r--r--lisp/obsolete/scribe.el6
-rw-r--r--lisp/org/org-ctags.el2
-rw-r--r--lisp/org/org-protocol.el2
-rw-r--r--lisp/outline.el6
-rw-r--r--lisp/paren.el2
-rw-r--r--lisp/play/animate.el2
-rw-r--r--lisp/play/gomoku.el10
-rw-r--r--lisp/play/landmark.el12
-rw-r--r--lisp/play/zone.el4
-rw-r--r--lisp/progmodes/ada-mode.el66
-rw-r--r--lisp/progmodes/ada-xref.el28
-rw-r--r--lisp/progmodes/antlr-mode.el26
-rw-r--r--lisp/progmodes/asm-mode.el2
-rw-r--r--lisp/progmodes/cfengine.el2
-rw-r--r--lisp/progmodes/cmacexp.el6
-rw-r--r--lisp/progmodes/compile.el8
-rw-r--r--lisp/progmodes/cpp.el12
-rw-r--r--lisp/progmodes/cwarn.el2
-rw-r--r--lisp/progmodes/dcl-mode.el42
-rw-r--r--lisp/progmodes/delphi.el22
-rw-r--r--lisp/progmodes/ebnf2ps.el128
-rw-r--r--lisp/progmodes/ebrowse.el44
-rw-r--r--lisp/progmodes/etags.el22
-rw-r--r--lisp/progmodes/executable.el14
-rw-r--r--lisp/progmodes/f90.el2
-rw-r--r--lisp/progmodes/glasses.el2
-rw-r--r--lisp/progmodes/grep.el12
-rw-r--r--lisp/progmodes/gud.el6
-rw-r--r--lisp/progmodes/hideshow.el18
-rw-r--r--lisp/progmodes/icon.el14
-rw-r--r--lisp/progmodes/idlw-help.el10
-rw-r--r--lisp/progmodes/idlw-shell.el66
-rw-r--r--lisp/progmodes/idlwave.el118
-rw-r--r--lisp/progmodes/inf-lisp.el10
-rw-r--r--lisp/progmodes/m4-mode.el2
-rw-r--r--lisp/progmodes/make-mode.el40
-rw-r--r--lisp/progmodes/modula2.el4
-rw-r--r--lisp/progmodes/octave-inf.el2
-rw-r--r--lisp/progmodes/pascal.el22
-rw-r--r--lisp/progmodes/perl-mode.el18
-rw-r--r--lisp/progmodes/prolog.el4
-rw-r--r--lisp/progmodes/ps-mode.el22
-rw-r--r--lisp/progmodes/python.el6
-rw-r--r--lisp/progmodes/scheme.el4
-rw-r--r--lisp/progmodes/sh-script.el6
-rw-r--r--lisp/progmodes/simula.el22
-rw-r--r--lisp/progmodes/tcl.el24
-rw-r--r--lisp/progmodes/vera-mode.el6
-rw-r--r--lisp/progmodes/verilog-mode.el164
-rw-r--r--lisp/progmodes/vhdl-mode.el242
-rw-r--r--lisp/progmodes/xscheme.el6
-rw-r--r--lisp/simple.el4
-rw-r--r--lisp/skeleton.el10
-rw-r--r--lisp/subr.el2
-rw-r--r--lisp/textmodes/artist.el6
-rw-r--r--lisp/textmodes/bib-mode.el2
-rw-r--r--lisp/textmodes/bibtex.el6
-rw-r--r--lisp/textmodes/flyspell.el2
-rw-r--r--lisp/textmodes/ispell.el54
-rw-r--r--lisp/textmodes/refbib.el8
-rw-r--r--lisp/textmodes/reftex-dcr.el2
-rw-r--r--lisp/textmodes/reftex-vars.el114
-rw-r--r--lisp/textmodes/sgml-mode.el8
-rw-r--r--lisp/textmodes/table.el2
-rw-r--r--lisp/textmodes/tex-mode.el2
-rw-r--r--lisp/textmodes/texinfmt.el8
-rw-r--r--lisp/textmodes/texnfo-upd.el8
-rw-r--r--lisp/timezone.el2
-rw-r--r--lisp/type-break.el2
-rw-r--r--lisp/url/url-dav.el2
-rw-r--r--lisp/url/url-handlers.el2
-rw-r--r--lisp/url/url-ldap.el4
-rw-r--r--lisp/url/url-nfs.el2
-rw-r--r--lisp/url/url-vars.el8
-rw-r--r--lisp/vc/add-log.el6
-rw-r--r--lisp/vc/cvs-status.el2
-rw-r--r--lisp/vc/ediff-diff.el18
-rw-r--r--lisp/vc/ediff-init.el2
-rw-r--r--lisp/vc/emerge.el4
-rw-r--r--lisp/vc/log-edit.el2
-rw-r--r--lisp/vc/pcvs-defs.el10
-rw-r--r--src/alloc.c4
-rw-r--r--src/buffer.c48
-rw-r--r--src/callint.c2
-rw-r--r--src/callproc.c6
-rw-r--r--src/charset.c2
-rw-r--r--src/dosfns.c8
-rw-r--r--src/eval.c12
-rw-r--r--src/fileio.c4
-rw-r--r--src/fns.c4
-rw-r--r--src/fontset.c2
-rw-r--r--src/fringe.c2
-rw-r--r--src/indent.c2
-rw-r--r--src/lread.c2
-rw-r--r--src/msdos.c2
-rw-r--r--src/print.c4
-rw-r--r--src/process.c2
-rw-r--r--src/syntax.c2
-rw-r--r--src/w32term.c4
-rw-r--r--src/xdisp.c46
-rw-r--r--src/xfaces.c4
-rw-r--r--src/xfns.c10
-rw-r--r--src/xsettings.c2
-rw-r--r--src/xterm.c4
192 files changed, 1283 insertions, 1283 deletions
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 86d567bcdde..16420d8af27 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -153,7 +153,7 @@ See `allout-widgets-mode' for allout widgets mode features."
153 ) 153 )
154;; ;;;_ = allout-widgets-allow-unruly-edits 154;; ;;;_ = allout-widgets-allow-unruly-edits
155;; (defcustom allout-widgets-allow-unruly-edits nil 155;; (defcustom allout-widgets-allow-unruly-edits nil
156;; "*Control whether manual edits are restricted to maintain outline integrity. 156;; "Control whether manual edits are restricted to maintain outline integrity.
157 157
158;; When nil, manual edits must either be within an item's body or encompass 158;; When nil, manual edits must either be within an item's body or encompass
159;; one or more items completely - eg, killing topics as entities, rather than 159;; one or more items completely - eg, killing topics as entities, rather than
@@ -203,21 +203,21 @@ See `allout-widgets-mode' for allout widgets mode features."
203;;;_ = allout-widgets-item-image-properties-emacs 203;;;_ = allout-widgets-item-image-properties-emacs
204(defcustom allout-widgets-item-image-properties-emacs 204(defcustom allout-widgets-item-image-properties-emacs
205 '(:ascent center :mask (heuristic t)) 205 '(:ascent center :mask (heuristic t))
206 "*Default properties item widget images in mainline Emacs." 206 "Default properties item widget images in mainline Emacs."
207 :version "24.1" 207 :version "24.1"
208 :type 'plist 208 :type 'plist
209 :group 'allout-widgets) 209 :group 'allout-widgets)
210;;;_ = allout-widgets-item-image-properties-xemacs 210;;;_ = allout-widgets-item-image-properties-xemacs
211(defcustom allout-widgets-item-image-properties-xemacs 211(defcustom allout-widgets-item-image-properties-xemacs
212 nil 212 nil
213 "*Default properties item widget images in XEmacs." 213 "Default properties item widget images in XEmacs."
214 :version "24.1" 214 :version "24.1"
215 :type 'plist 215 :type 'plist
216 :group 'allout-widgets) 216 :group 'allout-widgets)
217;;;_ . Developer 217;;;_ . Developer
218;;;_ = allout-widgets-run-unit-tests-on-load 218;;;_ = allout-widgets-run-unit-tests-on-load
219(defcustom allout-widgets-run-unit-tests-on-load nil 219(defcustom allout-widgets-run-unit-tests-on-load nil
220 "*When non-nil, unit tests will be run at end of loading allout-widgets. 220 "When non-nil, unit tests will be run at end of loading allout-widgets.
221 221
222Generally, allout widgets code developers are the only ones who'll want to 222Generally, allout widgets code developers are the only ones who'll want to
223set this. 223set this.
@@ -232,7 +232,7 @@ See `allout-widgets-run-unit-tests' to see what's run."
232 :group 'allout-widgets-developer) 232 :group 'allout-widgets-developer)
233;;;_ = allout-widgets-time-decoration-activity 233;;;_ = allout-widgets-time-decoration-activity
234(defcustom allout-widgets-time-decoration-activity nil 234(defcustom allout-widgets-time-decoration-activity nil
235 "*Retain timing info of the last cooperative redecoration. 235 "Retain timing info of the last cooperative redecoration.
236 236
237The details are retained as the value of 237The details are retained as the value of
238`allout-widgets-last-decoration-timing'. 238`allout-widgets-last-decoration-timing'.
@@ -244,7 +244,7 @@ set this."
244 :group 'allout-widgets-developer) 244 :group 'allout-widgets-developer)
245;;;_ = allout-widgets-hook-error-post-time 0 245;;;_ = allout-widgets-hook-error-post-time 0
246(defcustom allout-widgets-hook-error-post-time 0 246(defcustom allout-widgets-hook-error-post-time 0
247 "*Amount of time to sit showing hook error messages. 247 "Amount of time to sit showing hook error messages.
248 248
2490 is minimal, or nil to not post to the message area. 2490 is minimal, or nil to not post to the message area.
250 250
@@ -254,7 +254,7 @@ This is for debugging purposes."
254 :group 'allout-widgets-developer) 254 :group 'allout-widgets-developer)
255;;;_ = allout-widgets-maintain-tally nil 255;;;_ = allout-widgets-maintain-tally nil
256(defcustom allout-widgets-maintain-tally nil 256(defcustom allout-widgets-maintain-tally nil
257 "*If non-nil, maintain a collection of widgets, `allout-widgets-tally'. 257 "If non-nil, maintain a collection of widgets, `allout-widgets-tally'.
258 258
259This is for debugging purposes. 259This is for debugging purposes.
260 260
@@ -290,7 +290,7 @@ The number varies according to the evanescence of objects on a
290 (format ":%s" (hash-table-count allout-widgets-tally)))) 290 (format ":%s" (hash-table-count allout-widgets-tally))))
291;;;_ = allout-widgets-track-decoration nil 291;;;_ = allout-widgets-track-decoration nil
292(defcustom allout-widgets-track-decoration nil 292(defcustom allout-widgets-track-decoration nil
293 "*If non-nil, show cursor position of each item decoration. 293 "If non-nil, show cursor position of each item decoration.
294 294
295This is for debugging purposes, and generally set at need in a 295This is for debugging purposes, and generally set at need in a
296buffer rather than as a prevailing configuration \(but it's handy 296buffer rather than as a prevailing configuration \(but it's handy
@@ -416,7 +416,7 @@ onto the front.")
416;;;_ , Widget-specific outline text format 416;;;_ , Widget-specific outline text format
417;;;_ = allout-escaped-prefix-regexp 417;;;_ = allout-escaped-prefix-regexp
418(defvar allout-escaped-prefix-regexp "" 418(defvar allout-escaped-prefix-regexp ""
419 "*Regular expression for body text that would look like an item prefix if 419 "Regular expression for body text that would look like an item prefix if
420not altered with an escape sequence.") 420not altered with an escape sequence.")
421(make-variable-buffer-local 'allout-escaped-prefix-regexp) 421(make-variable-buffer-local 'allout-escaped-prefix-regexp)
422;;;_ , Widget element formatting 422;;;_ , Widget element formatting
diff --git a/lisp/allout.el b/lisp/allout.el
index 3eed3c7d23e..4883e4244a8 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -945,7 +945,7 @@ case the value of `allout-default-layout' is used.")
945;;;_ : Topic header format 945;;;_ : Topic header format
946;;;_ = allout-regexp 946;;;_ = allout-regexp
947(defvar allout-regexp "" 947(defvar allout-regexp ""
948 "*Regular expression to match the beginning of a heading line. 948 "Regular expression to match the beginning of a heading line.
949 949
950Any line whose beginning matches this regexp is considered a 950Any line whose beginning matches this regexp is considered a
951heading. This var is set according to the user configuration vars 951heading. This var is set according to the user configuration vars
@@ -965,7 +965,7 @@ and `allout-distinctive-bullets-string'.")
965(make-variable-buffer-local 'allout-bullets-string-len) 965(make-variable-buffer-local 'allout-bullets-string-len)
966;;;_ = allout-depth-specific-regexp 966;;;_ = allout-depth-specific-regexp
967(defvar allout-depth-specific-regexp "" 967(defvar allout-depth-specific-regexp ""
968 "*Regular expression to match a heading line prefix for a particular depth. 968 "Regular expression to match a heading line prefix for a particular depth.
969 969
970This expression is used to search for depth-specific topic 970This expression is used to search for depth-specific topic
971headers at depth 2 and greater. Use `allout-depth-one-regexp' 971headers at depth 2 and greater. Use `allout-depth-one-regexp'
@@ -978,7 +978,7 @@ topic prefix to be matched.")
978(make-variable-buffer-local 'allout-depth-specific-regexp) 978(make-variable-buffer-local 'allout-depth-specific-regexp)
979;;;_ = allout-depth-one-regexp 979;;;_ = allout-depth-one-regexp
980(defvar allout-depth-one-regexp "" 980(defvar allout-depth-one-regexp ""
981 "*Regular expression to match a heading line prefix for depth one. 981 "Regular expression to match a heading line prefix for depth one.
982 982
983This var is set according to the user configuration vars by 983This var is set according to the user configuration vars by
984`set-allout-regexp'. It is prepared with format strings for two 984`set-allout-regexp'. It is prepared with format strings for two
@@ -1403,10 +1403,10 @@ their settings before allout-mode was started."
1403 ,expr)) 1403 ,expr))
1404;;;_ = allout-mode-hook 1404;;;_ = allout-mode-hook
1405(defvar allout-mode-hook nil 1405(defvar allout-mode-hook nil
1406 "*Hook that's run when allout mode starts.") 1406 "Hook that's run when allout mode starts.")
1407;;;_ = allout-mode-deactivate-hook 1407;;;_ = allout-mode-deactivate-hook
1408(defvar allout-mode-deactivate-hook nil 1408(defvar allout-mode-deactivate-hook nil
1409 "*Hook that's run when allout mode ends.") 1409 "Hook that's run when allout mode ends.")
1410(define-obsolete-variable-alias 'allout-mode-deactivate-hook 1410(define-obsolete-variable-alias 'allout-mode-deactivate-hook
1411 'allout-mode-off-hook "24.1") 1411 'allout-mode-off-hook "24.1")
1412;;;_ = allout-exposure-category 1412;;;_ = allout-exposure-category
@@ -1414,7 +1414,7 @@ their settings before allout-mode was started."
1414 "Symbol for use as allout invisible-text overlay category.") 1414 "Symbol for use as allout invisible-text overlay category.")
1415;;;_ = allout-exposure-change-hook 1415;;;_ = allout-exposure-change-hook
1416(defvar allout-exposure-change-hook nil 1416(defvar allout-exposure-change-hook nil
1417 "*Hook that's run after allout outline subtree exposure changes. 1417 "Hook that's run after allout outline subtree exposure changes.
1418 1418
1419It is run at the conclusion of `allout-flag-region'. 1419It is run at the conclusion of `allout-flag-region'.
1420 1420
@@ -1427,7 +1427,7 @@ Functions on the hook must take three arguments:
1427This hook might be invoked multiple times by a single command.") 1427This hook might be invoked multiple times by a single command.")
1428;;;_ = allout-structure-added-hook 1428;;;_ = allout-structure-added-hook
1429(defvar allout-structure-added-hook nil 1429(defvar allout-structure-added-hook nil
1430 "*Hook that's run after addition of items to the outline. 1430 "Hook that's run after addition of items to the outline.
1431 1431
1432Functions on the hook should take two arguments: 1432Functions on the hook should take two arguments:
1433 1433
@@ -1437,7 +1437,7 @@ Functions on the hook should take two arguments:
1437This hook might be invoked multiple times by a single command.") 1437This hook might be invoked multiple times by a single command.")
1438;;;_ = allout-structure-deleted-hook 1438;;;_ = allout-structure-deleted-hook
1439(defvar allout-structure-deleted-hook nil 1439(defvar allout-structure-deleted-hook nil
1440 "*Hook that's run after disciplined deletion of subtrees from the outline. 1440 "Hook that's run after disciplined deletion of subtrees from the outline.
1441 1441
1442Functions on the hook must take two arguments: 1442Functions on the hook must take two arguments:
1443 1443
@@ -1450,7 +1450,7 @@ specifically edits that native allout routines do not control.
1450This hook might be invoked multiple times by a single command.") 1450This hook might be invoked multiple times by a single command.")
1451;;;_ = allout-structure-shifted-hook 1451;;;_ = allout-structure-shifted-hook
1452(defvar allout-structure-shifted-hook nil 1452(defvar allout-structure-shifted-hook nil
1453 "*Hook that's run after shifting of items in the outline. 1453 "Hook that's run after shifting of items in the outline.
1454 1454
1455Functions on the hook should take two arguments: 1455Functions on the hook should take two arguments:
1456 1456
@@ -1463,12 +1463,12 @@ that native allout routines do not control.
1463This hook might be invoked multiple times by a single command.") 1463This hook might be invoked multiple times by a single command.")
1464;;;_ = allout-after-copy-or-kill-hook 1464;;;_ = allout-after-copy-or-kill-hook
1465(defvar allout-after-copy-or-kill-hook nil 1465(defvar allout-after-copy-or-kill-hook nil
1466 "*Hook that's run after copying outline text. 1466 "Hook that's run after copying outline text.
1467 1467
1468Functions on the hook should not require any arguments.") 1468Functions on the hook should not require any arguments.")
1469;;;_ = allout-post-undo-hook 1469;;;_ = allout-post-undo-hook
1470(defvar allout-post-undo-hook nil 1470(defvar allout-post-undo-hook nil
1471 "*Hook that's run after undo activity. 1471 "Hook that's run after undo activity.
1472 1472
1473The item that's current when the hook is run *may* be the one 1473The item that's current when the hook is run *may* be the one
1474that was affected by the undo. 1474that was affected by the undo.
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index dcbf845c371..9d2583085a2 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -302,7 +302,7 @@
302 302
303 303
304(defvar math-additional-units nil 304(defvar math-additional-units nil
305 "*Additional units table for user-defined units. 305 "Additional units table for user-defined units.
306Must be formatted like `math-standard-units'. 306Must be formatted like `math-standard-units'.
307If you change this, be sure to set `math-units-table' to nil to ensure 307If you change this, be sure to set `math-units-table' to nil to ensure
308that the combined units table will be rebuilt.") 308that the combined units table will be rebuilt.")
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 41cdb491cfa..5224d1aa4f8 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -817,7 +817,7 @@ If nil, selections displayed but ignored.")
817Used by `calc-user-invocation'.") 817Used by `calc-user-invocation'.")
818 818
819(defcalcmodevar calc-show-banner t 819(defcalcmodevar calc-show-banner t
820 "*If non-nil, show a friendly greeting above the stack.") 820 "If non-nil, show a friendly greeting above the stack.")
821 821
822(defconst calc-local-var-list '(calc-stack 822(defconst calc-local-var-list '(calc-stack
823 calc-stack-top 823 calc-stack-top
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index d930a20fba5..03dca6ceccc 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -872,7 +872,7 @@ If PARENT is non-nil, it is somehow related as a parent to thing."
872 "Keymap used in data-debug.") 872 "Keymap used in data-debug.")
873 873
874(defcustom data-debug-mode-hook nil 874(defcustom data-debug-mode-hook nil
875 "*Hook run when data-debug starts." 875 "Hook run when data-debug starts."
876 :group 'data-debug 876 :group 'data-debug
877 :type 'hook) 877 :type 'hook)
878 878
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 746ee0b89af..8f367d918dc 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -77,7 +77,7 @@ this flag is ignored."
77 (:background "#AAAA33")) 77 (:background "#AAAA33"))
78 (((class color) (background light)) 78 (((class color) (background light))
79 (:background "#FFFFAA"))) 79 (:background "#FFFFAA")))
80 "*Face used at beginning of a highlight." 80 "Face used at beginning of a highlight."
81 :group 'pulse) 81 :group 'pulse)
82 82
83(defface pulse-highlight-face 83(defface pulse-highlight-face
@@ -85,7 +85,7 @@ this flag is ignored."
85 (:background "#AAAA33")) 85 (:background "#AAAA33"))
86 (((class color) (background light)) 86 (((class color) (background light))
87 (:background "#FFFFAA"))) 87 (:background "#FFFFAA")))
88 "*Face used during a pulse for display. *DO NOT CUSTOMIZE* 88 "Face used during a pulse for display. *DO NOT CUSTOMIZE*
89Face used for temporary highlighting of tags for effect." 89Face used for temporary highlighting of tags for effect."
90 :group 'pulse) 90 :group 'pulse)
91 91
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 0ed031019be..aeb5241b2d0 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -550,14 +550,14 @@ is requested."
550 ) 550 )
551 551
552(defvar semantic-working-type 'percent 552(defvar semantic-working-type 'percent
553 "*The type of working message to use when parsing. 553 "The type of working message to use when parsing.
554'percent means we are doing a linear parse through the buffer. 554'percent means we are doing a linear parse through the buffer.
555'dynamic means we are reparsing specific tags.") 555'dynamic means we are reparsing specific tags.")
556(semantic-varalias-obsolete 'semantic-bovination-working-type 556(semantic-varalias-obsolete 'semantic-bovination-working-type
557 'semantic-working-type "23.2") 557 'semantic-working-type "23.2")
558 558
559(defvar semantic-minimum-working-buffer-size (* 1024 5) 559(defvar semantic-minimum-working-buffer-size (* 1024 5)
560 "*The minimum size of a buffer before working messages are displayed. 560 "The minimum size of a buffer before working messages are displayed.
561Buffers smaller than this will parse silently. 561Buffers smaller than this will parse silently.
562Buffers larger than this will display the working progress bar.") 562Buffers larger than this will display the working progress bar.")
563 563
diff --git a/lisp/completion.el b/lisp/completion.el
index ceb272fad6d..9c6cd60c96c 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -344,18 +344,18 @@ are automatically added to the completion database."
344 :group 'completion) 344 :group 'completion)
345 345
346;;(defvar *record-cmpl-statistics-p* nil 346;;(defvar *record-cmpl-statistics-p* nil
347;; "*If non-nil, record completion statistics.") 347;; "If non-nil, record completion statistics.")
348 348
349;;(defvar *completion-auto-save-period* 1800 349;;(defvar *completion-auto-save-period* 1800
350;; "*The period in seconds to wait for emacs to be idle before autosaving 350;; "The period in seconds to wait for emacs to be idle before autosaving
351;;the completions. Default is a 1/2 hour.") 351;;the completions. Default is a 1/2 hour.")
352 352
353(defvar completion-min-length 6 353(defvar completion-min-length 6
354 "*The minimum length of a stored completion. 354 "The minimum length of a stored completion.
355DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.") 355DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.")
356 356
357(defvar completion-max-length 200 357(defvar completion-max-length 200
358 "*The maximum length of a stored completion. 358 "The maximum length of a stored completion.
359DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.") 359DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.")
360 360
361(defvar completion-prefix-min-length 3 361(defvar completion-prefix-min-length 3
diff --git a/lisp/dframe.el b/lisp/dframe.el
index d3356197a2b..2cdf4784eb0 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -157,22 +157,22 @@ selected frame and the focus will change to that frame."
157 :type 'hook) 157 :type 'hook)
158 158
159(defvar dframe-track-mouse-function nil 159(defvar dframe-track-mouse-function nil
160 "*A function to call when the mouse is moved in the given frame. 160 "A function to call when the mouse is moved in the given frame.
161Typically used to display info about the line under the mouse.") 161Typically used to display info about the line under the mouse.")
162(make-variable-buffer-local 'dframe-track-mouse-function) 162(make-variable-buffer-local 'dframe-track-mouse-function)
163 163
164(defvar dframe-help-echo-function nil 164(defvar dframe-help-echo-function nil
165 "*A function to call when help-echo is used in newer versions of Emacs. 165 "A function to call when help-echo is used in newer versions of Emacs.
166Typically used to display info about the line under the mouse.") 166Typically used to display info about the line under the mouse.")
167(make-variable-buffer-local 'dframe-help-echo-function) 167(make-variable-buffer-local 'dframe-help-echo-function)
168 168
169(defvar dframe-mouse-click-function nil 169(defvar dframe-mouse-click-function nil
170 "*A function to call when the mouse is clicked. 170 "A function to call when the mouse is clicked.
171Valid clicks are mouse 2, our double mouse 1.") 171Valid clicks are mouse 2, our double mouse 1.")
172(make-variable-buffer-local 'dframe-mouse-click-function) 172(make-variable-buffer-local 'dframe-mouse-click-function)
173 173
174(defvar dframe-mouse-position-function nil 174(defvar dframe-mouse-position-function nil
175 "*A function to call to position the cursor for a mouse click.") 175 "A function to call to position the cursor for a mouse click.")
176(make-variable-buffer-local 'dframe-mouse-position-function) 176(make-variable-buffer-local 'dframe-mouse-position-function)
177 177
178(defvar dframe-power-click nil 178(defvar dframe-power-click nil
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index d84e3737c91..071c7b71263 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -55,7 +55,7 @@
55 ("\\.tp[ulpw]$" . t) ; borland Pascal stuff 55 ("\\.tp[ulpw]$" . t) ; borland Pascal stuff
56 ("[:/]tags$" . nil) ; emacs TAGS file 56 ("[:/]tags$" . nil) ; emacs TAGS file
57 ) 57 )
58 "*Alist for distinguishing text files from binary files. 58 "Alist for distinguishing text files from binary files.
59Each element has the form (REGEXP . TYPE), where REGEXP is matched 59Each element has the form (REGEXP . TYPE), where REGEXP is matched
60against the file name, and TYPE is nil for text, t for binary.") 60against the file name, and TYPE is nil for text, t for binary.")
61 61
@@ -283,7 +283,7 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"."
283;;; Support for printing under DOS/Windows, see lpr.el and ps-print.el. 283;;; Support for printing under DOS/Windows, see lpr.el and ps-print.el.
284 284
285(defvar direct-print-region-use-command-dot-com t 285(defvar direct-print-region-use-command-dot-com t
286 "*Control whether command.com is used to print on Windows 9x.") 286 "Control whether command.com is used to print on Windows 9x.")
287 287
288;; Function to actually send data to the printer port. 288;; Function to actually send data to the printer port.
289;; Supports writing directly, and using various programs. 289;; Supports writing directly, and using various programs.
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 19766feac5a..2e3abb2e9d3 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -82,7 +82,7 @@ Colors will be the background color.")
82Useful if new Emacs is used on B&W display.") 82Useful if new Emacs is used on B&W display.")
83 83
84(defcustom chart-face-use-pixmaps nil 84(defcustom chart-face-use-pixmaps nil
85 "*Non-nil to use fancy pixmaps in the background of chart face colors." 85 "Non-nil to use fancy pixmaps in the background of chart face colors."
86 :group 'eieio 86 :group 'eieio
87 :type 'boolean) 87 :type 'boolean)
88 88
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 67ffd6d5d31..f47feebe5d2 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3744,7 +3744,7 @@ This prints the value into current buffer."
3744 3744
3745;; FIXME eh? 3745;; FIXME eh?
3746(defvar gud-inhibit-global-bindings 3746(defvar gud-inhibit-global-bindings
3747 "*Non-nil means don't do global rebindings of C-x C-a subcommands.") 3747 "Non-nil means don't do global rebindings of C-x C-a subcommands.")
3748 3748
3749;; Global GUD bindings for all emacs-lisp-mode buffers. 3749;; Global GUD bindings for all emacs-lisp-mode buffers.
3750(unless gud-inhibit-global-bindings 3750(unless gud-inhibit-global-bindings
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index cdf7237b766..f1c1bf8965c 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -79,7 +79,7 @@
79;; 79;;
80 80
81(defvar eieio-hook nil 81(defvar eieio-hook nil
82 "*This hook is executed, then cleared each time `defclass' is called.") 82 "This hook is executed, then cleared each time `defclass' is called.")
83 83
84(defvar eieio-error-unsupported-class-tags nil 84(defvar eieio-error-unsupported-class-tags nil
85 "Non-nil to throw an error if an encountered tag is unsupported. 85 "Non-nil to throw an error if an encountered tag is unsupported.
@@ -87,7 +87,7 @@ This may prevent classes from CLOS applications from being used with EIEIO
87since EIEIO does not support all CLOS tags.") 87since EIEIO does not support all CLOS tags.")
88 88
89(defvar eieio-skip-typecheck nil 89(defvar eieio-skip-typecheck nil
90 "*If non-nil, skip all slot typechecking. 90 "If non-nil, skip all slot typechecking.
91Set this to t permanently if a program is functioning well to get a 91Set this to t permanently if a program is functioning well to get a
92small speed increase. This variable is also used internally to handle 92small speed increase. This variable is also used internally to handle
93default setting for optimization purposes.") 93default setting for optimization purposes.")
@@ -2044,7 +2044,7 @@ During executions, the list is first generated, then as each next method
2044is called, the next method is popped off the stack.") 2044is called, the next method is popped off the stack.")
2045 2045
2046(defvar eieio-pre-method-execution-hooks nil 2046(defvar eieio-pre-method-execution-hooks nil
2047 "*Hooks run just before a method is executed. 2047 "Hooks run just before a method is executed.
2048The hook function must accept one argument, the list of forms 2048The hook function must accept one argument, the list of forms
2049about to be executed.") 2049about to be executed.")
2050 2050
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 9cbe29bf322..ad5e20cb8a4 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1405,7 +1405,7 @@ RESULT must be an `ert-test-result-with-condition'."
1405;;; Running tests in batch mode. 1405;;; Running tests in batch mode.
1406 1406
1407(defvar ert-batch-backtrace-right-margin 70 1407(defvar ert-batch-backtrace-right-margin 70
1408 "*The maximum line length for printing backtraces in `ert-run-tests-batch'.") 1408 "The maximum line length for printing backtraces in `ert-run-tests-batch'.")
1409 1409
1410;;;###autoload 1410;;;###autoload
1411(defun ert-run-tests-batch (&optional selector) 1411(defun ert-run-tests-batch (&optional selector)
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index b6b7c266263..87b6cceb24b 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -241,7 +241,7 @@ and idle timers such as are scheduled by `run-with-idle-timer'."
241 "Third-to-last timer that was run.") 241 "Third-to-last timer that was run.")
242 242
243(defvar timer-max-repeats 10 243(defvar timer-max-repeats 10
244 "*Maximum number of times to repeat a timer, if many repeats are delayed. 244 "Maximum number of times to repeat a timer, if many repeats are delayed.
245Timer invocations can be delayed because Emacs is suspended or busy, 245Timer invocations can be delayed because Emacs is suspended or busy,
246or because the system's time changes. If such an occurrence makes it 246or because the system's time changes. If such an occurrence makes it
247appear that many invocations are overdue, this variable controls 247appear that many invocations are overdue, this variable controls
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 68f40349454..111ce34dc1a 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -2119,7 +2119,7 @@ Undo previous insertion and inserts new."
2119(defcustom viper-smart-suffix-list 2119(defcustom viper-smart-suffix-list
2120 '("" "tex" "c" "cc" "C" "java" "el" "html" "htm" "xml" 2120 '("" "tex" "c" "cc" "C" "java" "el" "html" "htm" "xml"
2121 "pl" "flr" "P" "p" "h" "H") 2121 "pl" "flr" "P" "p" "h" "H")
2122 "*List of suffixes that Viper tries to append to filenames ending with a `.'. 2122 "List of suffixes that Viper tries to append to filenames ending with a `.'.
2123This is useful when the current directory contains files with the same 2123This is useful when the current directory contains files with the same
2124prefix and many different suffixes. Usually, only one of the suffixes 2124prefix and many different suffixes. Usually, only one of the suffixes
2125represents an editable file. However, file completion will stop at the `.' 2125represents an editable file. However, file completion will stop at the `.'
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 3d538f1bd0d..acaedde3004 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -368,14 +368,14 @@ corresponding function symbol."
368(defvar viper-keep-reading-filename nil) 368(defvar viper-keep-reading-filename nil)
369 369
370(defcustom ex-cycle-other-window t 370(defcustom ex-cycle-other-window t
371 "*If t, :n and :b cycles through files and buffers in other window. 371 "If t, :n and :b cycles through files and buffers in other window.
372Then :N and :B cycles in the current window. If nil, this behavior is 372Then :N and :B cycles in the current window. If nil, this behavior is
373reversed." 373reversed."
374 :type 'boolean 374 :type 'boolean
375 :group 'viper-ex) 375 :group 'viper-ex)
376 376
377(defcustom ex-cycle-through-non-files nil 377(defcustom ex-cycle-through-non-files nil
378 "*Cycle through *scratch* and other buffers that don't visit any file." 378 "Cycle through *scratch* and other buffers that don't visit any file."
379 :type 'boolean 379 :type 'boolean
380 :group 'viper-ex) 380 :group 'viper-ex)
381 381
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index f8ab5a1f805..76a8c410676 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -372,7 +372,7 @@ Use `M-x viper-set-expert-level' to change this.")
372(defconst viper-buffer-undo-list-mark 'viper) 372(defconst viper-buffer-undo-list-mark 'viper)
373 373
374(defcustom viper-keep-point-on-undo nil 374(defcustom viper-keep-point-on-undo nil
375 "*Non-nil means not to move point while undoing commands. 375 "Non-nil means not to move point while undoing commands.
376This style is different from Emacs and Vi. Try it to see if 376This style is different from Emacs and Vi. Try it to see if
377it better fits your working style." 377it better fits your working style."
378 :type 'boolean 378 :type 'boolean
@@ -403,7 +403,7 @@ delete the text being replaced, as in standard Vi."
403 :group 'viper) 403 :group 'viper)
404 404
405(defcustom viper-replace-overlay-cursor-color "Red" 405(defcustom viper-replace-overlay-cursor-color "Red"
406 "*Cursor color when Viper is in Replace state." 406 "Cursor color when Viper is in Replace state."
407 :type 'string 407 :type 'string
408 :group 'viper) 408 :group 'viper)
409 409
@@ -450,7 +450,7 @@ is non-nil."
450(defcustom viper-use-replace-region-delimiters 450(defcustom viper-use-replace-region-delimiters
451 (or (not (viper-has-face-support-p)) 451 (or (not (viper-has-face-support-p))
452 (and (featurep 'xemacs) (eq (viper-device-type) 'tty))) 452 (and (featurep 'xemacs) (eq (viper-device-type) 'tty)))
453 "*If non-nil, Viper will always use `viper-replace-region-end-delimiter' and 453 "If non-nil, Viper will always use `viper-replace-region-end-delimiter' and
454`viper-replace-region-start-delimiter' to delimit replacement regions, even on 454`viper-replace-region-start-delimiter' to delimit replacement regions, even on
455color displays. By default, the delimiters are used only on TTYs." 455color displays. By default, the delimiters are used only on TTYs."
456 :type 'boolean 456 :type 'boolean
@@ -519,7 +519,7 @@ text."
519 519
520;; Fast keyseq and ESC keyseq timeouts 520;; Fast keyseq and ESC keyseq timeouts
521(defcustom viper-fast-keyseq-timeout 200 521(defcustom viper-fast-keyseq-timeout 200
522 "*Key sequence separated by no more than this many milliseconds is viewed as a Vi-style macro, if such a macro is defined. 522 "Key sequence separated by no more than this many milliseconds is viewed as a Vi-style macro, if such a macro is defined.
523Setting this too high may slow down your typing. Setting this value too low 523Setting this too high may slow down your typing. Setting this value too low
524will make it hard to use Vi-style timeout macros." 524will make it hard to use Vi-style timeout macros."
525 :type 'integer 525 :type 'integer
@@ -549,14 +549,14 @@ will make it hard to use Vi-style timeout macros."
549 549
550(viper-deflocalvar viper-auto-indent nil "") 550(viper-deflocalvar viper-auto-indent nil "")
551(defcustom viper-auto-indent nil 551(defcustom viper-auto-indent nil
552 "*Enable autoindent, if t. 552 "Enable autoindent, if t.
553This is a buffer-local variable." 553This is a buffer-local variable."
554 :type 'boolean 554 :type 'boolean
555 :group 'viper) 555 :group 'viper)
556 556
557(viper-deflocalvar viper-electric-mode t "") 557(viper-deflocalvar viper-electric-mode t "")
558(defcustom viper-electric-mode t 558(defcustom viper-electric-mode t
559 "*If t, electrify Viper. 559 "If t, electrify Viper.
560Currently, this only electrifies auto-indentation, making it appropriate to the 560Currently, this only electrifies auto-indentation, making it appropriate to the
561mode of the buffer. 561mode of the buffer.
562This means that auto-indentation will depart from standard Vi and will indent 562This means that auto-indentation will depart from standard Vi and will indent
@@ -566,7 +566,7 @@ programs and LaTeX documents."
566 :group 'viper) 566 :group 'viper)
567 567
568(defcustom viper-shift-width 8 568(defcustom viper-shift-width 8
569 "*The value of the shiftwidth. 569 "The value of the shiftwidth.
570This determines the number of columns by which the Ctl-t moves the cursor in 570This determines the number of columns by which the Ctl-t moves the cursor in
571the Insert state." 571the Insert state."
572 :type 'integer 572 :type 'integer
@@ -575,7 +575,7 @@ the Insert state."
575;; Variables for repeating destructive commands 575;; Variables for repeating destructive commands
576 576
577(defcustom viper-keep-point-on-repeat t 577(defcustom viper-keep-point-on-repeat t
578 "*If t, don't move point when repeating previous command. 578 "If t, don't move point when repeating previous command.
579This is useful for doing repeated changes with the '.' key. 579This is useful for doing repeated changes with the '.' key.
580The user can change this to nil, if she likes when the cursor moves 580The user can change this to nil, if she likes when the cursor moves
581to a new place after repeating previous Vi command." 581to a new place after repeating previous Vi command."
@@ -668,18 +668,18 @@ to a new place after repeating previous Vi command."
668(defvar viper-s-forward nil) 668(defvar viper-s-forward nil)
669 669
670(defcustom viper-case-fold-search nil 670(defcustom viper-case-fold-search nil
671 "*If not nil, search ignores cases." 671 "If not nil, search ignores cases."
672 :type 'boolean 672 :type 'boolean
673 :group 'viper-search) 673 :group 'viper-search)
674 674
675(defcustom viper-re-search t 675(defcustom viper-re-search t
676 "*If not nil, search is regexp search, otherwise vanilla search." 676 "If not nil, search is regexp search, otherwise vanilla search."
677 :type 'boolean 677 :type 'boolean
678 :tag "Regexp Search" 678 :tag "Regexp Search"
679 :group 'viper-search) 679 :group 'viper-search)
680 680
681(defcustom viper-search-scroll-threshold 2 681(defcustom viper-search-scroll-threshold 2
682 "*If search lands within this threshold from the window top/bottom, 682 "If search lands within this threshold from the window top/bottom,
683the window will be scrolled up or down appropriately, to reveal context. 683the window will be scrolled up or down appropriately, to reveal context.
684If you want Viper search to behave as usual in Vi, set this variable to a 684If you want Viper search to behave as usual in Vi, set this variable to a
685negative number." 685negative number."
@@ -687,32 +687,32 @@ negative number."
687 :group 'viper-search) 687 :group 'viper-search)
688 688
689(defcustom viper-re-query-replace t 689(defcustom viper-re-query-replace t
690 "*If t then do regexp replace, if nil then do string replace." 690 "If t then do regexp replace, if nil then do string replace."
691 :type 'boolean 691 :type 'boolean
692 :tag "Regexp Query Replace" 692 :tag "Regexp Query Replace"
693 :group 'viper-search) 693 :group 'viper-search)
694 694
695(defcustom viper-re-replace t 695(defcustom viper-re-replace t
696 "*If t, do regexp replace. nil means do string replace." 696 "If t, do regexp replace. nil means do string replace."
697 :type 'boolean 697 :type 'boolean
698 :tag "Regexp Replace" 698 :tag "Regexp Replace"
699 :group 'viper-search) 699 :group 'viper-search)
700 700
701(defcustom viper-parse-sexp-ignore-comments t 701(defcustom viper-parse-sexp-ignore-comments t
702 "*If t, `%' ignores the parentheses that occur inside comments." 702 "If t, `%' ignores the parentheses that occur inside comments."
703 :type 'boolean 703 :type 'boolean
704 :group 'viper) 704 :group 'viper)
705 705
706(viper-deflocalvar viper-ex-style-motion t "") 706(viper-deflocalvar viper-ex-style-motion t "")
707(defcustom viper-ex-style-motion t 707(defcustom viper-ex-style-motion t
708 "*If t, the commands l,h do not cross lines, etc (Ex-style). 708 "If t, the commands l,h do not cross lines, etc (Ex-style).
709If nil, these commands cross line boundaries." 709If nil, these commands cross line boundaries."
710 :type 'boolean 710 :type 'boolean
711 :group 'viper) 711 :group 'viper)
712 712
713(viper-deflocalvar viper-ex-style-editing t "") 713(viper-deflocalvar viper-ex-style-editing t "")
714(defcustom viper-ex-style-editing t 714(defcustom viper-ex-style-editing t
715 "*If t, Ex-style behavior while editing in Vi command and insert states. 715 "If t, Ex-style behavior while editing in Vi command and insert states.
716`Backspace' and `Delete' don't cross line boundaries in insert. 716`Backspace' and `Delete' don't cross line boundaries in insert.
717`X' and `x' can't delete characters across line boundary in Vi, etc. 717`X' and `x' can't delete characters across line boundary in Vi, etc.
718Note: this doesn't preclude `Backspace' and `Delete' from deleting characters 718Note: this doesn't preclude `Backspace' and `Delete' from deleting characters
@@ -724,32 +724,32 @@ If nil, the above commands can work across lines."
724 724
725(viper-deflocalvar viper-ESC-moves-cursor-back viper-ex-style-editing "") 725(viper-deflocalvar viper-ESC-moves-cursor-back viper-ex-style-editing "")
726(defcustom viper-ESC-moves-cursor-back nil 726(defcustom viper-ESC-moves-cursor-back nil
727 "*If t, ESC moves cursor back when changing from insert to vi state. 727 "If t, ESC moves cursor back when changing from insert to vi state.
728If nil, the cursor stays where it was when ESC was hit." 728If nil, the cursor stays where it was when ESC was hit."
729 :type 'boolean 729 :type 'boolean
730 :group 'viper) 730 :group 'viper)
731 731
732(viper-deflocalvar viper-delete-backwards-in-replace nil "") 732(viper-deflocalvar viper-delete-backwards-in-replace nil "")
733(defcustom viper-delete-backwards-in-replace nil 733(defcustom viper-delete-backwards-in-replace nil
734 "*If t, DEL key will delete characters while moving the cursor backwards. 734 "If t, DEL key will delete characters while moving the cursor backwards.
735If nil, the cursor will move backwards without deleting anything." 735If nil, the cursor will move backwards without deleting anything."
736 :type 'boolean 736 :type 'boolean
737 :group 'viper) 737 :group 'viper)
738 738
739(defcustom viper-buffer-search-char nil 739(defcustom viper-buffer-search-char nil
740 "*Key used for buffer-searching. Must be a character type, e.g., ?g." 740 "Key used for buffer-searching. Must be a character type, e.g., ?g."
741 :type '(choice (const nil) character) 741 :type '(choice (const nil) character)
742 :group 'viper-search) 742 :group 'viper-search)
743 743
744(defcustom viper-search-wrap-around t 744(defcustom viper-search-wrap-around t
745 "*If t, search wraps around." 745 "If t, search wraps around."
746 :type 'boolean 746 :type 'boolean
747 :tag "Search Wraps Around" 747 :tag "Search Wraps Around"
748 :group 'viper-search) 748 :group 'viper-search)
749 749
750(viper-deflocalvar viper-related-files-and-buffers-ring nil "") 750(viper-deflocalvar viper-related-files-and-buffers-ring nil "")
751(defcustom viper-related-files-and-buffers-ring nil 751(defcustom viper-related-files-and-buffers-ring nil
752 "*List of file and buffer names that are considered to be related to the current buffer. 752 "List of file and buffer names that are considered to be related to the current buffer.
753Related buffers can be cycled through via :R and :P commands." 753Related buffers can be cycled through via :R and :P commands."
754 :type 'boolean 754 :type 'boolean
755 :group 'viper-misc) 755 :group 'viper-misc)
@@ -771,7 +771,7 @@ Related buffers can be cycled through via :R and :P commands."
771 "^\\\\[sb][a-z]*{.*}\\s-*$\\|" ; latex 771 "^\\\\[sb][a-z]*{.*}\\s-*$\\|" ; latex
772 "^@node\\|@table\\|^@m?enu\\|^@itemize\\|^@if\\|" ; texinfo 772 "^@node\\|@table\\|^@m?enu\\|^@itemize\\|^@if\\|" ; texinfo
773 "^.+:-") ; prolog 773 "^.+:-") ; prolog
774 "*Regexps for Headings. Used by \[\[ and \]\].") 774 "Regexps for Headings. Used by \[\[ and \]\].")
775 775
776(defvar viper-heading-end 776(defvar viper-heading-end
777 (concat "^}\\|" ; C/C++ 777 (concat "^}\\|" ; C/C++
@@ -826,7 +826,7 @@ Related buffers can be cycled through via :R and :P commands."
826(defface viper-search 826(defface viper-search
827 '((((class color)) (:foreground "Black" :background "khaki")) 827 '((((class color)) (:foreground "Black" :background "khaki"))
828 (t (:underline t :stipple "gray3"))) 828 (t (:underline t :stipple "gray3")))
829 "*Face used to flash out the search pattern." 829 "Face used to flash out the search pattern."
830 :group 'viper-highlighting) 830 :group 'viper-highlighting)
831;; An internal variable. Viper takes the face from here. 831;; An internal variable. Viper takes the face from here.
832(defvar viper-search-face 'viper-search 832(defvar viper-search-face 'viper-search
@@ -838,7 +838,7 @@ this variable represents.")
838(defface viper-replace-overlay 838(defface viper-replace-overlay
839 '((((class color)) (:foreground "Black" :background "darkseagreen2")) 839 '((((class color)) (:foreground "Black" :background "darkseagreen2"))
840 (t (:underline t :stipple "gray3"))) 840 (t (:underline t :stipple "gray3")))
841 "*Face for highlighting replace regions on a window display." 841 "Face for highlighting replace regions on a window display."
842 :group 'viper-highlighting) 842 :group 'viper-highlighting)
843;; An internal variable. Viper takes the face from here. 843;; An internal variable. Viper takes the face from here.
844(defvar viper-replace-overlay-face 'viper-replace-overlay 844(defvar viper-replace-overlay-face 'viper-replace-overlay
@@ -946,19 +946,19 @@ Should be set in `~/.viper' file."
946 :group 'viper) 946 :group 'viper)
947 947
948(defcustom viper-vi-state-hook 'viper-restore-cursor-type 948(defcustom viper-vi-state-hook 'viper-restore-cursor-type
949 "*Hooks run just before the switch to Vi mode is completed." 949 "Hooks run just before the switch to Vi mode is completed."
950 :type 'hook 950 :type 'hook
951 :group 'viper-hooks) 951 :group 'viper-hooks)
952(defcustom viper-insert-state-hook 'viper-set-insert-cursor-type 952(defcustom viper-insert-state-hook 'viper-set-insert-cursor-type
953 "*Hooks run just before the switch to Insert mode is completed." 953 "Hooks run just before the switch to Insert mode is completed."
954 :type 'hook 954 :type 'hook
955 :group 'viper-hooks) 955 :group 'viper-hooks)
956(defcustom viper-replace-state-hook 'viper-restore-cursor-type 956(defcustom viper-replace-state-hook 'viper-restore-cursor-type
957 "*Hooks run just before the switch to Replace mode is completed." 957 "Hooks run just before the switch to Replace mode is completed."
958 :type 'hook 958 :type 'hook
959 :group 'viper-hooks) 959 :group 'viper-hooks)
960(defcustom viper-emacs-state-hook 'viper-restore-cursor-type 960(defcustom viper-emacs-state-hook 'viper-restore-cursor-type
961 "*Hooks run just before the switch to Emacs mode is completed." 961 "Hooks run just before the switch to Emacs mode is completed."
962 :type 'hook 962 :type 'hook
963 :group 'viper-hooks) 963 :group 'viper-hooks)
964 964
@@ -980,7 +980,7 @@ Should be set in `~/.viper' file."
980 (setq cursor-type '(bar . 2)))) 980 (setq cursor-type '(bar . 2))))
981 981
982(defun viper-ESC-keyseq-timeout () 982(defun viper-ESC-keyseq-timeout ()
983 "*Key sequence beginning with ESC and separated by no more than this many milliseconds is considered to be generated by a keyboard function key. 983 "Key sequence beginning with ESC and separated by no more than this many milliseconds is considered to be generated by a keyboard function key.
984Setting this too high may slow down switching from insert to vi state. Setting 984Setting this too high may slow down switching from insert to vi state. Setting
985this value too low will make it impossible to use function keys in insert mode 985this value too low will make it impossible to use function keys in insert mode
986on a dumb terminal." 986on a dumb terminal."
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 65638dfff3c..ad1e32b5546 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -48,19 +48,19 @@
48;;; Emacs keys in other states. 48;;; Emacs keys in other states.
49 49
50(defcustom viper-want-emacs-keys-in-insert t 50(defcustom viper-want-emacs-keys-in-insert t
51 "*Set to nil if you want complete Vi compatibility in insert mode. 51 "Set to nil if you want complete Vi compatibility in insert mode.
52Complete compatibility with Vi is not recommended for power use of Viper." 52Complete compatibility with Vi is not recommended for power use of Viper."
53 :type 'boolean 53 :type 'boolean
54 :group 'viper) 54 :group 'viper)
55 55
56(defcustom viper-want-emacs-keys-in-vi t 56(defcustom viper-want-emacs-keys-in-vi t
57 "*Set to nil if you want complete Vi compatibility in Vi mode. 57 "Set to nil if you want complete Vi compatibility in Vi mode.
58Full Vi compatibility is not recommended for power use of Viper." 58Full Vi compatibility is not recommended for power use of Viper."
59 :type 'boolean 59 :type 'boolean
60 :group 'viper) 60 :group 'viper)
61 61
62(defcustom viper-no-multiple-ESC t 62(defcustom viper-no-multiple-ESC t
63 "*If true, multiple ESC in Vi mode will cause bell to ring. 63 "If true, multiple ESC in Vi mode will cause bell to ring.
64This is set to t on a windowing terminal and to 'twice on a dumb 64This is set to t on a windowing terminal and to 'twice on a dumb
65terminal (unless the user level is 1, 2, or 5). On a dumb terminal, this 65terminal (unless the user level is 1, 2, or 5). On a dumb terminal, this
66enables cursor keys and is generally more convenient, as terminals usually 66enables cursor keys and is generally more convenient, as terminals usually
@@ -71,7 +71,7 @@ as is allowed by the major mode in effect."
71 :group 'viper) 71 :group 'viper)
72 72
73(defcustom viper-want-ctl-h-help nil 73(defcustom viper-want-ctl-h-help nil
74 "*If non-nil, C-h gets bound to help-command; otherwise, C-h gets the usual Vi bindings." 74 "If non-nil, C-h gets bound to help-command; otherwise, C-h gets the usual Vi bindings."
75 :type 'boolean 75 :type 'boolean
76 :group 'viper) 76 :group 'viper)
77 77
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 58d8fb45b92..eda1a7ec937 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -63,7 +63,7 @@
63(defvar viper-current-frame-saved (selected-frame)) 63(defvar viper-current-frame-saved (selected-frame))
64 64
65(defcustom viper-surrounding-word-function 'viper-surrounding-word 65(defcustom viper-surrounding-word-function 'viper-surrounding-word
66 "*Function that determines what constitutes a word for clicking events. 66 "Function that determines what constitutes a word for clicking events.
67Takes two parameters: a COUNT, indicating how many words to return, 67Takes two parameters: a COUNT, indicating how many words to return,
68and CLICK-COUNT, telling whether this is the first click, a double-click, 68and CLICK-COUNT, telling whether this is the first click, a double-click,
69or a triple-click." 69or a triple-click."
@@ -77,7 +77,7 @@ or a triple-click."
77 mouse-track-multi-click-time 77 mouse-track-multi-click-time
78 double-click-time) 78 double-click-time)
79 500) 79 500)
80 "*Time interval in millisecond within which successive mouse clicks are 80 "Time interval in millisecond within which successive mouse clicks are
81considered related." 81considered related."
82 :type 'integer 82 :type 'integer
83 :group 'viper-mouse) 83 :group 'viper-mouse)
@@ -624,7 +624,7 @@ bindings in the Viper manual."
624 624
625 625
626(defcustom viper-mouse-search-key '(meta shift 1) 626(defcustom viper-mouse-search-key '(meta shift 1)
627 "*Key used to click-search in Viper. 627 "Key used to click-search in Viper.
628This must be a list that specifies the mouse button and modifiers. 628This must be a list that specifies the mouse button and modifiers.
629The supported modifiers are `meta', `shift', and `control'. 629The supported modifiers are `meta', `shift', and `control'.
630For instance, `(meta shift 1)' means that holding the meta and shift 630For instance, `(meta shift 1)' means that holding the meta and shift
@@ -640,7 +640,7 @@ This buffer may be different from the one where the click occurred."
640 :group 'viper-mouse) 640 :group 'viper-mouse)
641 641
642(defcustom viper-mouse-insert-key '(meta shift 2) 642(defcustom viper-mouse-insert-key '(meta shift 2)
643 "*Key used to click-insert in Viper. 643 "Key used to click-insert in Viper.
644Must be a list that specifies the mouse button and modifiers. 644Must be a list that specifies the mouse button and modifiers.
645The supported modifiers are `meta', `shift', and `control'. 645The supported modifiers are `meta', `shift', and `control'.
646For instance, `(meta shift 2)' means that holding the meta and shift keys 646For instance, `(meta shift 2)' means that holding the meta and shift keys
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index cdeef733bc5..4afa379f389 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1323,7 +1323,7 @@ sets the default value."
1323 (viper-update-syntax-classes)) 1323 (viper-update-syntax-classes))
1324 1324
1325(defcustom viper-syntax-preference 'reformed-vi 1325(defcustom viper-syntax-preference 'reformed-vi
1326 "*Syntax type characterizing Viper's alphanumeric symbols. 1326 "Syntax type characterizing Viper's alphanumeric symbols.
1327Affects movement and change commands that deal with Vi-style words. 1327Affects movement and change commands that deal with Vi-style words.
1328Works best when set in the hooks to various major modes. 1328Works best when set in the hooks to various major modes.
1329 1329
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 12c186e234e..9cf6c91265e 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -435,7 +435,7 @@ widget."
435 view-mode 435 view-mode
436 vm-mode 436 vm-mode
437 vm-summary-mode) 437 vm-summary-mode)
438 "*A list of major modes that should come up in Emacs state. 438 "A list of major modes that should come up in Emacs state.
439Normally, Viper would bring buffers up in Emacs state, unless the corresponding 439Normally, Viper would bring buffers up in Emacs state, unless the corresponding
440major mode has been placed on `viper-vi-state-mode-list' or 440major mode has been placed on `viper-vi-state-mode-list' or
441`viper-insert-state-mode-list'. So, don't place a new mode on this list, 441`viper-insert-state-mode-list'. So, don't place a new mode on this list,
@@ -451,7 +451,7 @@ unless it is coming up in a wrong Viper state."
451 erc-mode 451 erc-mode
452 eshell-mode 452 eshell-mode
453 shell-mode) 453 shell-mode)
454 "*A list of major modes that should come up in Vi Insert state." 454 "A list of major modes that should come up in Vi Insert state."
455 :type '(repeat symbol) 455 :type '(repeat symbol)
456 :group 'viper-misc) 456 :group 'viper-misc)
457 457
diff --git a/lisp/epa.el b/lisp/epa.el
index 3b9933f6984..58f4026a773 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -177,18 +177,18 @@ the separate window."
177 (20 . ?G))) 177 (20 . ?G)))
178 178
179(defvar epa-protocol 'OpenPGP 179(defvar epa-protocol 'OpenPGP
180 "*The default protocol. 180 "The default protocol.
181The value can be either OpenPGP or CMS. 181The value can be either OpenPGP or CMS.
182 182
183You should bind this variable with `let', but do not set it globally.") 183You should bind this variable with `let', but do not set it globally.")
184 184
185(defvar epa-armor nil 185(defvar epa-armor nil
186 "*If non-nil, epa commands create ASCII armored output. 186 "If non-nil, epa commands create ASCII armored output.
187 187
188You should bind this variable with `let', but do not set it globally.") 188You should bind this variable with `let', but do not set it globally.")
189 189
190(defvar epa-textmode nil 190(defvar epa-textmode nil
191 "*If non-nil, epa commands treat input files as text. 191 "If non-nil, epa commands treat input files as text.
192 192
193You should bind this variable with `let', but do not set it globally.") 193You should bind this variable with `let', but do not set it globally.")
194 194
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index 699c4e20552..ab429a12589 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -138,7 +138,7 @@ Related variables: `erc-public-away-p' and `erc-away-nickname'."
138 (remove-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators)))) 138 (remove-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators))))
139 139
140(defcustom erc-autoaway-idle-method 'user 140(defcustom erc-autoaway-idle-method 'user
141 "*The method used to determine how long you have been idle. 141 "The method used to determine how long you have been idle.
142If 'user, the time of the last command sent to Emacs is used. 142If 'user, the time of the last command sent to Emacs is used.
143If 'emacs, the idle time in Emacs is used. 143If 'emacs, the idle time in Emacs is used.
144If 'irc, the time of the last IRC command is used. 144If 'irc, the time of the last IRC command is used.
@@ -160,7 +160,7 @@ definitions of being idle."
160 (set sym val)))) 160 (set sym val))))
161 161
162(defcustom erc-auto-set-away t 162(defcustom erc-auto-set-away t
163 "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling. 163 "If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.
164ERC autoaway mode can set you away when you idle, and set you no 164ERC autoaway mode can set you away when you idle, and set you no
165longer away when you type something. This variable controls whether 165longer away when you type something. This variable controls whether
166you will be set away when you idle. See `erc-auto-discard-away' for 166you will be set away when you idle. See `erc-auto-discard-away' for
@@ -169,7 +169,7 @@ the other half."
169 :type 'boolean) 169 :type 'boolean)
170 170
171(defcustom erc-auto-discard-away t 171(defcustom erc-auto-discard-away t
172 "*If non-nil, sending anything when away automatically discards away state. 172 "If non-nil, sending anything when away automatically discards away state.
173ERC autoaway mode can set you away when you idle, and set you no 173ERC autoaway mode can set you away when you idle, and set you no
174longer away when you type something. This variable controls whether 174longer away when you type something. This variable controls whether
175you will be set no longer away when you type something. See 175you will be set no longer away when you type something. See
@@ -179,13 +179,13 @@ See also `erc-autoaway-no-auto-discard-regexp'."
179 :type 'boolean) 179 :type 'boolean)
180 180
181(defcustom erc-autoaway-no-auto-discard-regexp "^/g?away.*$" 181(defcustom erc-autoaway-no-auto-discard-regexp "^/g?away.*$"
182 "*Input that matches this will not automatically discard away status. 182 "Input that matches this will not automatically discard away status.
183See `erc-auto-discard-away'." 183See `erc-auto-discard-away'."
184 :group 'erc-autoaway 184 :group 'erc-autoaway
185 :type 'regexp) 185 :type 'regexp)
186 186
187(defcustom erc-autoaway-idle-seconds 1800 187(defcustom erc-autoaway-idle-seconds 1800
188 "*Number of seconds after which ERC will set you automatically away. 188 "Number of seconds after which ERC will set you automatically away.
189If you are changing this variable using lisp instead of customizing it, 189If you are changing this variable using lisp instead of customizing it,
190you have to run `erc-autoaway-reestablish-idletimer' afterwards." 190you have to run `erc-autoaway-reestablish-idletimer' afterwards."
191 :group 'erc-autoaway 191 :group 'erc-autoaway
@@ -197,7 +197,7 @@ you have to run `erc-autoaway-reestablish-idletimer' afterwards."
197 197
198(defcustom erc-autoaway-message 198(defcustom erc-autoaway-message
199 "I'm gone (autoaway after %i seconds of idletime)" 199 "I'm gone (autoaway after %i seconds of idletime)"
200 "*Message ERC will use when setting you automatically away. 200 "Message ERC will use when setting you automatically away.
201It is used as a `format' string with the argument of the idletime 201It is used as a `format' string with the argument of the idletime
202in seconds." 202in seconds."
203 :group 'erc-autoaway 203 :group 'erc-autoaway
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 7bc56584eaf..62f524ed001 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -311,7 +311,7 @@ If a key is pressed while ERC is waiting, it will stop waiting."
311 :type 'number) 311 :type 'number)
312 312
313(defcustom erc-split-line-length 440 313(defcustom erc-split-line-length 440
314 "*The maximum length of a single message. 314 "The maximum length of a single message.
315If a message exceeds this size, it is broken into multiple ones. 315If a message exceeds this size, it is broken into multiple ones.
316 316
317IRC allows for lines up to 512 bytes. Two of them are CR LF. 317IRC allows for lines up to 512 bytes. Two of them are CR LF.
@@ -379,14 +379,14 @@ It should take same arguments as `open-network-stream' does."
379 :type 'function) 379 :type 'function)
380 380
381(defcustom erc-server-prevent-duplicates '("301") 381(defcustom erc-server-prevent-duplicates '("301")
382 "*Either nil or a list of strings. 382 "Either nil or a list of strings.
383Each string is a IRC message type, like PRIVMSG or NOTICE. 383Each string is a IRC message type, like PRIVMSG or NOTICE.
384All Message types in that list of subjected to duplicate prevention." 384All Message types in that list of subjected to duplicate prevention."
385 :type '(choice (const nil) (list string)) 385 :type '(choice (const nil) (list string))
386 :group 'erc-server) 386 :group 'erc-server)
387 387
388(defcustom erc-server-duplicate-timeout 60 388(defcustom erc-server-duplicate-timeout 60
389 "*The time allowed in seconds between duplicate messages. 389 "The time allowed in seconds between duplicate messages.
390 390
391If two identical messages arrive within this value of one another, the second 391If two identical messages arrive within this value of one another, the second
392isn't displayed." 392isn't displayed."
@@ -399,7 +399,7 @@ isn't displayed."
399;; (http://www.nongnu.org/circe) 399;; (http://www.nongnu.org/circe)
400 400
401(defcustom erc-server-flood-margin 10 401(defcustom erc-server-flood-margin 10
402 "*A margin on how much excess data we send. 402 "A margin on how much excess data we send.
403The flood protection algorithm of ERC works like the one 403The flood protection algorithm of ERC works like the one
404detailed in RFC 2813, section 5.8 \"Flood control of clients\". 404detailed in RFC 2813, section 5.8 \"Flood control of clients\".
405 405
@@ -423,14 +423,14 @@ protection algorithm."
423;; Ping handling 423;; Ping handling
424 424
425(defcustom erc-server-send-ping-interval 30 425(defcustom erc-server-send-ping-interval 30
426 "*Interval of sending pings to the server, in seconds. 426 "Interval of sending pings to the server, in seconds.
427If this is set to nil, pinging the server is disabled." 427If this is set to nil, pinging the server is disabled."
428 :group 'erc-server 428 :group 'erc-server
429 :type '(choice (const :tag "Disabled" nil) 429 :type '(choice (const :tag "Disabled" nil)
430 (integer :tag "Seconds"))) 430 (integer :tag "Seconds")))
431 431
432(defcustom erc-server-send-ping-timeout 120 432(defcustom erc-server-send-ping-timeout 120
433 "*If the time between ping and response is greater than this, reconnect. 433 "If the time between ping and response is greater than this, reconnect.
434The time is in seconds. 434The time is in seconds.
435 435
436This must be greater than or equal to the value for 436This must be greater than or equal to the value for
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 17b8c457f38..727e3de58e8 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -115,13 +115,13 @@ longer than `erc-fill-column'."
115 :type 'boolean) 115 :type 'boolean)
116 116
117(defcustom erc-button-rfc-url "http://www.faqs.org/rfcs/rfc%s.html" 117(defcustom erc-button-rfc-url "http://www.faqs.org/rfcs/rfc%s.html"
118 "*URL used to browse rfc references. 118 "URL used to browse rfc references.
119%s is replaced by the number." 119%s is replaced by the number."
120 :group 'erc-button 120 :group 'erc-button
121 :type 'string) 121 :type 'string)
122 122
123(defcustom erc-button-google-url "http://www.google.com/search?q=%s" 123(defcustom erc-button-google-url "http://www.google.com/search?q=%s"
124 "*URL used to browse Google search references. 124 "URL used to browse Google search references.
125%s is replaced by the search string." 125%s is replaced by the search string."
126 :group 'erc-button 126 :group 'erc-button
127 :type 'string) 127 :type 'string)
@@ -155,7 +155,7 @@ longer than `erc-fill-column'."
155 1) 155 1)
156 ;; other 156 ;; other
157 ("\\s-\\(@\\([0-9][0-9][0-9]\\)\\)" 1 t erc-button-beats-to-time 2)) 157 ("\\s-\\(@\\([0-9][0-9][0-9]\\)\\)" 1 t erc-button-beats-to-time 2))
158 "*Alist of regexps matching buttons in ERC buffers. 158 "Alist of regexps matching buttons in ERC buffers.
159Each entry has the form (REGEXP BUTTON FORM CALLBACK PAR...), where 159Each entry has the form (REGEXP BUTTON FORM CALLBACK PAR...), where
160 160
161REGEXP is the string matching text around the button or a symbol 161REGEXP is the string matching text around the button or a symbol
@@ -198,12 +198,12 @@ PAR is a number of a regexp grouping whose text will be passed to
198 (integer :tag "Regexp section number"))))) 198 (integer :tag "Regexp section number")))))
199 199
200(defcustom erc-emacswiki-url "http://www.emacswiki.org/cgi-bin/wiki.pl?" 200(defcustom erc-emacswiki-url "http://www.emacswiki.org/cgi-bin/wiki.pl?"
201 "*URL of the EmacsWiki Homepage." 201 "URL of the EmacsWiki Homepage."
202 :group 'erc-button 202 :group 'erc-button
203 :type 'string) 203 :type 'string)
204 204
205(defcustom erc-emacswiki-lisp-url "http://www.emacswiki.org/elisp/" 205(defcustom erc-emacswiki-lisp-url "http://www.emacswiki.org/elisp/"
206 "*URL of the EmacsWiki ELisp area." 206 "URL of the EmacsWiki ELisp area."
207 :group 'erc-button 207 :group 'erc-button
208 :type 'string) 208 :type 'string)
209 209
@@ -488,7 +488,7 @@ For use on `completion-at-point-functions'."
488 ("Query" . (erc-cmd-QUERY nick)) 488 ("Query" . (erc-cmd-QUERY nick))
489 ("Whois" . (erc-cmd-WHOIS nick)) 489 ("Whois" . (erc-cmd-WHOIS nick))
490 ("Lastlog" . (erc-cmd-LASTLOG nick))) 490 ("Lastlog" . (erc-cmd-LASTLOG nick)))
491 "*An alist of possible actions to take on a nickname. 491 "An alist of possible actions to take on a nickname.
492An entry looks like (\"Action\" . SEXP) where SEXP is evaluated with 492An entry looks like (\"Action\" . SEXP) where SEXP is evaluated with
493the variable `nick' bound to the nick in question. 493the variable `nick' bound to the nick in question.
494 494
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index f68b3591fbb..ba87cf63993 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -75,7 +75,7 @@ IRC users."
75 :group 'erc) 75 :group 'erc)
76 76
77(defcustom erc-dcc-verbose nil 77(defcustom erc-dcc-verbose nil
78 "*If non-nil, be verbose about DCC activity reporting." 78 "If non-nil, be verbose about DCC activity reporting."
79 :group 'erc-dcc 79 :group 'erc-dcc
80 :type 'boolean) 80 :type 'boolean)
81 81
@@ -316,7 +316,7 @@ Should be set to a string or nil. If nil, use the value of
316 :valid-regexp erc-dcc-ipv4-regexp))) 316 :valid-regexp erc-dcc-ipv4-regexp)))
317 317
318(defcustom erc-dcc-send-request 'ask 318(defcustom erc-dcc-send-request 'ask
319 "*How to treat incoming DCC Send requests. 319 "How to treat incoming DCC Send requests.
320'ask - Report the Send request, and wait for the user to manually accept it 320'ask - Report the Send request, and wait for the user to manually accept it
321 You might want to set `erc-dcc-auto-masks' for this. 321 You might want to set `erc-dcc-auto-masks' for this.
322'auto - Automatically accept the request and begin downloading the file 322'auto - Automatically accept the request and begin downloading the file
@@ -405,7 +405,7 @@ the accepted connection."
405;;; Interactive command handling 405;;; Interactive command handling
406 406
407(defcustom erc-dcc-get-default-directory nil 407(defcustom erc-dcc-get-default-directory nil
408 "*Default directory for incoming DCC file transfers. 408 "Default directory for incoming DCC file transfers.
409If this is nil, then the current value of `default-directory' is used." 409If this is nil, then the current value of `default-directory' is used."
410 :group 'erc-dcc 410 :group 'erc-dcc
411 :type '(choice (const nil :tag "Default directory") directory)) 411 :type '(choice (const nil :tag "Default directory") directory))
@@ -719,7 +719,7 @@ match, returns that regexp and nil otherwise."
719 "^DCC CHAT +chat +\\([0-9]+\\) +\\([0-9]+\\)") 719 "^DCC CHAT +chat +\\([0-9]+\\) +\\([0-9]+\\)")
720 720
721(defcustom erc-dcc-chat-request 'ask 721(defcustom erc-dcc-chat-request 'ask
722 "*How to treat incoming DCC Chat requests. 722 "How to treat incoming DCC Chat requests.
723'ask - Report the Chat request, and wait for the user to manually accept it 723'ask - Report the Chat request, and wait for the user to manually accept it
724'auto - Automatically accept the request and open a new chat window 724'auto - Automatically accept the request and open a new chat window
725'ignore - Ignore incoming DCC chat requests completely." 725'ignore - Ignore incoming DCC chat requests completely."
@@ -777,12 +777,12 @@ match, returns that regexp and nil otherwise."
777;;; SEND handling 777;;; SEND handling
778 778
779(defcustom erc-dcc-block-size 1024 779(defcustom erc-dcc-block-size 1024
780 "*Block size to use for DCC SEND sessions." 780 "Block size to use for DCC SEND sessions."
781 :group 'erc-dcc 781 :group 'erc-dcc
782 :type 'integer) 782 :type 'integer)
783 783
784(defcustom erc-dcc-pump-bytes nil 784(defcustom erc-dcc-pump-bytes nil
785 "*If set to an integer, keep sending until that number of bytes are 785 "If set to an integer, keep sending until that number of bytes are
786unconfirmed." 786unconfirmed."
787 :group 'erc-dcc 787 :group 'erc-dcc
788 :type '(choice (const nil) integer)) 788 :type '(choice (const nil) integer))
@@ -856,7 +856,7 @@ bytes sent."
856 856
857(defcustom erc-dcc-send-connect-hook 857(defcustom erc-dcc-send-connect-hook
858 '(erc-dcc-display-send erc-dcc-send-block) 858 '(erc-dcc-display-send erc-dcc-send-block)
859 "*Hook run whenever the remote end of a DCC SEND offer connected to your 859 "Hook run whenever the remote end of a DCC SEND offer connected to your
860listening port." 860listening port."
861 :group 'erc-dcc 861 :group 'erc-dcc
862 :type 'hook) 862 :type 'hook)
@@ -1046,12 +1046,12 @@ transfer is complete."
1046;;; CHAT handling 1046;;; CHAT handling
1047 1047
1048(defcustom erc-dcc-chat-buffer-name-format "DCC-CHAT-%s" 1048(defcustom erc-dcc-chat-buffer-name-format "DCC-CHAT-%s"
1049 "*Format to use for DCC Chat buffer names." 1049 "Format to use for DCC Chat buffer names."
1050 :group 'erc-dcc 1050 :group 'erc-dcc
1051 :type 'string) 1051 :type 'string)
1052 1052
1053(defcustom erc-dcc-chat-mode-hook nil 1053(defcustom erc-dcc-chat-mode-hook nil
1054 "*Hook calls when `erc-dcc-chat-mode' finished setting up the buffer." 1054 "Hook calls when `erc-dcc-chat-mode' finished setting up the buffer."
1055 :group 'erc-dcc 1055 :group 'erc-dcc
1056 :type 'hook) 1056 :type 'hook)
1057 1057
@@ -1100,7 +1100,7 @@ Possible values are: ask, auto, ignore."
1100(defalias 'pcomplete/erc-mode/SREQ 'pcomplete/erc-mode/CREQ) 1100(defalias 'pcomplete/erc-mode/SREQ 'pcomplete/erc-mode/CREQ)
1101 1101
1102(defvar erc-dcc-chat-filter-hook '(erc-dcc-chat-parse-output) 1102(defvar erc-dcc-chat-filter-hook '(erc-dcc-chat-parse-output)
1103 "*Hook to run after doing parsing (and possible insertion) of DCC messages.") 1103 "Hook to run after doing parsing (and possible insertion) of DCC messages.")
1104 1104
1105(defvar erc-dcc-chat-mode-map 1105(defvar erc-dcc-chat-mode-map
1106 (let ((map (make-sparse-keymap))) 1106 (let ((map (make-sparse-keymap)))
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index bf74ed7be87..acff76beb16 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -183,7 +183,7 @@ themselves."
183 :group 'erc) 183 :group 'erc)
184 184
185(defcustom erc-interpret-controls-p t 185(defcustom erc-interpret-controls-p t
186 "*If non-nil, display IRC colors and other highlighting effects. 186 "If non-nil, display IRC colors and other highlighting effects.
187 187
188If this is set to the symbol `remove', ERC removes all IRC colors and 188If this is set to the symbol `remove', ERC removes all IRC colors and
189highlighting effects. When this variable is non-nil, it can cause Emacs to run 189highlighting effects. When this variable is non-nil, it can cause Emacs to run
@@ -196,7 +196,7 @@ emergency (message flood) it can be turned off to save processing time. See
196 (const :tag "Display raw control characters" nil))) 196 (const :tag "Display raw control characters" nil)))
197 197
198(defcustom erc-interpret-mirc-color nil 198(defcustom erc-interpret-mirc-color nil
199 "*If non-nil, ERC will interpret mIRC color codes." 199 "If non-nil, ERC will interpret mIRC color codes."
200 :group 'erc-control-characters 200 :group 'erc-control-characters
201 :type 'boolean) 201 :type 'boolean)
202 202
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 9f50a1d117c..eefe51ae706 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -101,7 +101,7 @@
101 :group 'erc) 101 :group 'erc)
102 102
103(defcustom erc-generate-log-file-name-function 'erc-generate-log-file-name-long 103(defcustom erc-generate-log-file-name-function 'erc-generate-log-file-name-long
104 "*A function to generate a log filename. 104 "A function to generate a log filename.
105The function must take five arguments: BUFFER, TARGET, NICK, SERVER and PORT. 105The function must take five arguments: BUFFER, TARGET, NICK, SERVER and PORT.
106BUFFER is the buffer to be saved, 106BUFFER is the buffer to be saved,
107TARGET is the name of the channel, or the target of the query, 107TARGET is the name of the channel, or the target of the query,
@@ -157,12 +157,12 @@ arguments."
157 (const :tag "Disable logging" nil))) 157 (const :tag "Disable logging" nil)))
158 158
159(defcustom erc-log-insert-log-on-open nil 159(defcustom erc-log-insert-log-on-open nil
160 "*Insert log file contents into the buffer if a log file exists." 160 "Insert log file contents into the buffer if a log file exists."
161 :group 'erc-log 161 :group 'erc-log
162 :type 'boolean) 162 :type 'boolean)
163 163
164(defcustom erc-save-buffer-on-part t 164(defcustom erc-save-buffer-on-part t
165 "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART. 165 "Save the channel buffer content using `erc-save-buffer-in-logs' on PART.
166 166
167If you set this to nil, you may want to enable both 167If you set this to nil, you may want to enable both
168`erc-log-write-after-send' and `erc-log-write-after-insert'." 168`erc-log-write-after-send' and `erc-log-write-after-insert'."
@@ -170,7 +170,7 @@ If you set this to nil, you may want to enable both
170 :type 'boolean) 170 :type 'boolean)
171 171
172(defcustom erc-save-queries-on-quit t 172(defcustom erc-save-queries-on-quit t
173 "*Save all query (also channel) buffers of the server on QUIT. 173 "Save all query (also channel) buffers of the server on QUIT.
174 174
175If you set this to nil, you may want to enable both 175If you set this to nil, you may want to enable both
176`erc-log-write-after-send' and `erc-log-write-after-insert'." 176`erc-log-write-after-send' and `erc-log-write-after-insert'."
@@ -178,7 +178,7 @@ If you set this to nil, you may want to enable both
178 :type 'boolean) 178 :type 'boolean)
179 179
180(defcustom erc-log-write-after-send nil 180(defcustom erc-log-write-after-send nil
181 "*If non-nil, write to log file after every message you send. 181 "If non-nil, write to log file after every message you send.
182 182
183If you set this to nil, you may want to enable both 183If you set this to nil, you may want to enable both
184`erc-save-buffer-on-part' and `erc-save-queries-on-quit'." 184`erc-save-buffer-on-part' and `erc-save-queries-on-quit'."
@@ -186,7 +186,7 @@ If you set this to nil, you may want to enable both
186 :type 'boolean) 186 :type 'boolean)
187 187
188(defcustom erc-log-write-after-insert nil 188(defcustom erc-log-write-after-insert nil
189 "*If non-nil, write to log file when new text is added to a 189 "If non-nil, write to log file when new text is added to a
190logged ERC buffer. 190logged ERC buffer.
191 191
192If you set this to nil, you may want to enable both 192If you set this to nil, you may want to enable both
@@ -197,14 +197,14 @@ If you set this to nil, you may want to enable both
197(defcustom erc-log-file-coding-system (if (featurep 'xemacs) 197(defcustom erc-log-file-coding-system (if (featurep 'xemacs)
198 'binary 198 'binary
199 'emacs-mule) 199 'emacs-mule)
200 "*The coding system ERC should use for writing log files. 200 "The coding system ERC should use for writing log files.
201 201
202This should ideally, be a \"catch-all\" coding system, like 202This should ideally, be a \"catch-all\" coding system, like
203`emacs-mule', or `iso-2022-7bit'." 203`emacs-mule', or `iso-2022-7bit'."
204 :group 'erc-log) 204 :group 'erc-log)
205 205
206(defcustom erc-log-filter-function nil 206(defcustom erc-log-filter-function nil
207 "*If non-nil, pass text through the given function before writing it to 207 "If non-nil, pass text through the given function before writing it to
208a log file. 208a log file.
209 209
210The function should take one argument, which is the text to filter." 210The function should take one argument, which is the text to filter."
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 2a61247307f..dd9e02dfab5 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -83,7 +83,7 @@ Useful to mark nicks from dangerous hosts."
83 :type '(repeat regexp)) 83 :type '(repeat regexp))
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:
@@ -105,7 +105,7 @@ Any other value disables highlighting of current nickname altogether."
105 (const all))) 105 (const all)))
106 106
107(defcustom erc-pal-highlight-type 'nick 107(defcustom erc-pal-highlight-type 'nick
108 "*Determines how to highlight messages by pals. 108 "Determines how to highlight messages by pals.
109See `erc-pals'. 109See `erc-pals'.
110 110
111The following values are allowed: 111The following values are allowed:
@@ -121,7 +121,7 @@ Any other value disables pal highlighting altogether."
121 (const all))) 121 (const all)))
122 122
123(defcustom erc-fool-highlight-type 'nick 123(defcustom erc-fool-highlight-type 'nick
124 "*Determines how to highlight messages by fools. 124 "Determines how to highlight messages by fools.
125See `erc-fools'. 125See `erc-fools'.
126 126
127The following values are allowed: 127The following values are allowed:
@@ -137,7 +137,7 @@ Any other value disables fool highlighting altogether."
137 (const all))) 137 (const all)))
138 138
139(defcustom erc-keyword-highlight-type 'keyword 139(defcustom erc-keyword-highlight-type 'keyword
140 "*Determines how to highlight messages containing keywords. 140 "Determines how to highlight messages containing keywords.
141See variable `erc-keywords'. 141See variable `erc-keywords'.
142 142
143The following values are allowed: 143The following values are allowed:
@@ -152,7 +152,7 @@ Any other value disables keyword highlighting altogether."
152 (const all))) 152 (const all)))
153 153
154(defcustom erc-dangerous-host-highlight-type 'nick 154(defcustom erc-dangerous-host-highlight-type 'nick
155 "*Determines how to highlight messages by nicks from dangerous-hosts. 155 "Determines how to highlight messages by nicks from dangerous-hosts.
156See `erc-dangerous-hosts'. 156See `erc-dangerous-hosts'.
157 157
158The following values are allowed: 158The following values are allowed:
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index d1a33405765..3bf82c13f19 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -40,19 +40,19 @@
40 :group 'erc) 40 :group 'erc)
41 41
42(defcustom erc-notify-list nil 42(defcustom erc-notify-list nil
43 "*List of nicknames you want to be notified about online/offline 43 "List of nicknames you want to be notified about online/offline
44status change." 44status change."
45 :group 'erc-notify 45 :group 'erc-notify
46 :type '(repeat string)) 46 :type '(repeat string))
47 47
48(defcustom erc-notify-interval 60 48(defcustom erc-notify-interval 60
49 "*Time interval (in seconds) for checking online status of notified 49 "Time interval (in seconds) for checking online status of notified
50people." 50people."
51 :group 'erc-notify 51 :group 'erc-notify
52 :type 'integer) 52 :type 'integer)
53 53
54(defcustom erc-notify-signon-hook nil 54(defcustom erc-notify-signon-hook nil
55 "*Hook run after someone on `erc-notify-list' has signed on. 55 "Hook run after someone on `erc-notify-list' has signed on.
56Two arguments are passed to the function, SERVER and NICK, both 56Two arguments are passed to the function, SERVER and NICK, both
57strings." 57strings."
58 :group 'erc-notify 58 :group 'erc-notify
@@ -60,7 +60,7 @@ strings."
60 :options '(erc-notify-signon)) 60 :options '(erc-notify-signon))
61 61
62(defcustom erc-notify-signoff-hook nil 62(defcustom erc-notify-signoff-hook nil
63 "*Hook run after someone on `erc-notify-list' has signed off. 63 "Hook run after someone on `erc-notify-list' has signed off.
64Two arguments are passed to the function, SERVER and NICK, both 64Two arguments are passed to the function, SERVER and NICK, both
65strings." 65strings."
66 :group 'erc-notify 66 :group 'erc-notify
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index ba27b0374aa..d3cbe8a5804 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -49,7 +49,7 @@
49 :group 'erc) 49 :group 'erc)
50 50
51(defcustom erc-pcomplete-nick-postfix ":" 51(defcustom erc-pcomplete-nick-postfix ":"
52 "*When `pcomplete' is used in the first word after the prompt, 52 "When `pcomplete' is used in the first word after the prompt,
53add this string to nicks completed." 53add this string to nicks completed."
54 :group 'erc-pcomplete 54 :group 'erc-pcomplete
55 :type 'string) 55 :type 'string)
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 569abad2a08..8b44cb5146c 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -62,7 +62,7 @@ and play sound files as requested."
62 :group 'erc) 62 :group 'erc)
63 63
64(defcustom erc-play-sound t 64(defcustom erc-play-sound t
65 "*Play sounds when you receive CTCP SOUND requests." 65 "Play sounds when you receive CTCP SOUND requests."
66 :group 'erc-sound 66 :group 'erc-sound
67 :type 'boolean) 67 :type 'boolean)
68 68
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index e02b045ebd2..4d55e21da72 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -47,7 +47,7 @@ in your .emacs file or interactively using `load-library'."
47 :group 'erc) 47 :group 'erc)
48 48
49(defcustom erc-timestamp-format "[%H:%M]" 49(defcustom erc-timestamp-format "[%H:%M]"
50 "*If set to a string, messages will be timestamped. 50 "If set to a string, messages will be timestamped.
51This string is processed using `format-time-string'. 51This string is processed using `format-time-string'.
52Good examples are \"%T\" and \"%H:%M\". 52Good examples are \"%T\" and \"%H:%M\".
53 53
@@ -57,7 +57,7 @@ If nil, timestamping is turned off."
57 (string))) 57 (string)))
58 58
59(defcustom erc-timestamp-format-left "\n[%a %b %e %Y]\n" 59(defcustom erc-timestamp-format-left "\n[%a %b %e %Y]\n"
60 "*If set to a string, messages will be timestamped. 60 "If set to a string, messages will be timestamped.
61This string is processed using `format-time-string'. 61This string is processed using `format-time-string'.
62Good examples are \"%T\" and \"%H:%M\". 62Good examples are \"%T\" and \"%H:%M\".
63 63
@@ -71,7 +71,7 @@ If nil, timestamping is turned off."
71 (string))) 71 (string)))
72 72
73(defcustom erc-timestamp-format-right " [%H:%M]" 73(defcustom erc-timestamp-format-right " [%H:%M]"
74 "*If set to a string, messages will be timestamped. 74 "If set to a string, messages will be timestamped.
75This string is processed using `format-time-string'. 75This string is processed using `format-time-string'.
76Good examples are \"%T\" and \"%H:%M\". 76Good examples are \"%T\" and \"%H:%M\".
77 77
@@ -85,7 +85,7 @@ If nil, timestamping is turned off."
85 (string))) 85 (string)))
86 86
87(defcustom erc-insert-timestamp-function 'erc-insert-timestamp-left-and-right 87(defcustom erc-insert-timestamp-function 'erc-insert-timestamp-left-and-right
88 "*Function to use to insert timestamps. 88 "Function to use to insert timestamps.
89 89
90It takes a single argument STRING which is the final string 90It takes a single argument STRING which is the final string
91which all text-properties already appended. This function only cares about 91which all text-properties already appended. This function only cares about
@@ -102,7 +102,7 @@ You will probably want to set
102 function)) 102 function))
103 103
104(defcustom erc-away-timestamp-format "<%H:%M>" 104(defcustom erc-away-timestamp-format "<%H:%M>"
105 "*Timestamp format used when marked as being away. 105 "Timestamp format used when marked as being away.
106 106
107If nil, timestamping is turned off when away unless `erc-timestamp-format' 107If nil, timestamping is turned off when away unless `erc-timestamp-format'
108is set. 108is set.
@@ -114,7 +114,7 @@ If `erc-timestamp-format' is set, this will not be used."
114 114
115(defcustom erc-insert-away-timestamp-function 115(defcustom erc-insert-away-timestamp-function
116 'erc-insert-timestamp-left-and-right 116 'erc-insert-timestamp-left-and-right
117 "*Function to use to insert the away timestamp. 117 "Function to use to insert the away timestamp.
118 118
119See `erc-insert-timestamp-function' for details." 119See `erc-insert-timestamp-function' for details."
120 :group 'erc-stamp 120 :group 'erc-stamp
@@ -124,7 +124,7 @@ See `erc-insert-timestamp-function' for details."
124 function)) 124 function))
125 125
126(defcustom erc-hide-timestamps nil 126(defcustom erc-hide-timestamps nil
127 "*If non-nil, timestamps will be invisible. 127 "If non-nil, timestamps will be invisible.
128 128
129This is useful for logging, because, although timestamps will be 129This is useful for logging, because, although timestamps will be
130hidden, they will still be present in the logs." 130hidden, they will still be present in the logs."
@@ -132,7 +132,7 @@ hidden, they will still be present in the logs."
132 :type 'boolean) 132 :type 'boolean)
133 133
134(defcustom erc-echo-timestamps nil 134(defcustom erc-echo-timestamps nil
135 "*If non-nil, print timestamp in the minibuffer when point is moved. 135 "If non-nil, print timestamp in the minibuffer when point is moved.
136Using this variable, you can turn off normal timestamping, 136Using this variable, you can turn off normal timestamping,
137and simply move point to an irc message to see its timestamp 137and simply move point to an irc message to see its timestamp
138printed in the minibuffer." 138printed in the minibuffer."
@@ -140,14 +140,14 @@ printed in the minibuffer."
140 :type 'boolean) 140 :type 'boolean)
141 141
142(defcustom erc-echo-timestamp-format "Timestamped %A, %H:%M:%S" 142(defcustom erc-echo-timestamp-format "Timestamped %A, %H:%M:%S"
143 "*Format string to be used when `erc-echo-timestamps' is non-nil. 143 "Format string to be used when `erc-echo-timestamps' is non-nil.
144This string specifies the format of the timestamp being echoed in 144This string specifies the format of the timestamp being echoed in
145the minibuffer." 145the minibuffer."
146 :group 'erc-stamp 146 :group 'erc-stamp
147 :type 'string) 147 :type 'string)
148 148
149(defcustom erc-timestamp-intangible t 149(defcustom erc-timestamp-intangible t
150 "*Whether the timestamps should be intangible, i.e. prevent the point 150 "Whether the timestamps should be intangible, i.e. prevent the point
151from entering them and instead jump over them." 151from entering them and instead jump over them."
152 :group 'erc-stamp 152 :group 'erc-stamp
153 :type 'boolean) 153 :type 'boolean)
@@ -205,7 +205,7 @@ This is used when `erc-insert-timestamp-function' is set to
205(make-variable-buffer-local 'erc-timestamp-last-inserted-right) 205(make-variable-buffer-local 'erc-timestamp-last-inserted-right)
206 206
207(defcustom erc-timestamp-only-if-changed-flag t 207(defcustom erc-timestamp-only-if-changed-flag t
208 "*Insert timestamp only if its value changed since last insertion. 208 "Insert timestamp only if its value changed since last insertion.
209If `erc-insert-timestamp-function' is `erc-insert-timestamp-left', a 209If `erc-insert-timestamp-function' is `erc-insert-timestamp-left', a
210string of spaces which is the same size as the timestamp is added to 210string of spaces which is the same size as the timestamp is added to
211the beginning of the line in its place. If you use 211the beginning of the line in its place. If you use
@@ -215,7 +215,7 @@ timestamp."
215 :type 'boolean) 215 :type 'boolean)
216 216
217(defcustom erc-timestamp-right-column nil 217(defcustom erc-timestamp-right-column nil
218 "*If non-nil, the column at which the timestamp is inserted, 218 "If non-nil, the column at which the timestamp is inserted,
219if the timestamp is to be printed to the right. If nil, 219if the timestamp is to be printed to the right. If nil,
220`erc-insert-timestamp-right' will use other means to determine 220`erc-insert-timestamp-right' will use other means to determine
221the correct column." 221the correct column."
@@ -227,7 +227,7 @@ the correct column."
227(defcustom erc-timestamp-use-align-to (and (not (featurep 'xemacs)) 227(defcustom erc-timestamp-use-align-to (and (not (featurep 'xemacs))
228 (>= emacs-major-version 22) 228 (>= emacs-major-version 22)
229 (eq window-system 'x)) 229 (eq window-system 'x))
230 "*If non-nil, use the :align-to display property to align the stamp. 230 "If non-nil, use the :align-to display property to align the stamp.
231This gives better results when variable-width characters (like 231This gives better results when variable-width characters (like
232Asian language characters and math symbols) precede a timestamp. 232Asian language characters and math symbols) precede a timestamp.
233Unfortunately, it only works in Emacs 22 and when using the X 233Unfortunately, it only works in Emacs 22 and when using the X
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index ac899302c3c..e4a41089539 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -93,13 +93,13 @@ Activity means that there was no user input in the last 10 seconds."
93 :type '(repeat string)) 93 :type '(repeat string))
94 94
95(defcustom erc-track-remove-disconnected-buffers nil 95(defcustom erc-track-remove-disconnected-buffers nil
96 "*If true, remove buffers associated with a server that is 96 "If true, remove buffers associated with a server that is
97disconnected from `erc-modified-channels-alist'." 97disconnected from `erc-modified-channels-alist'."
98 :group 'erc-track 98 :group 'erc-track
99 :type 'boolean) 99 :type 'boolean)
100 100
101(defcustom erc-track-exclude-types '("NICK" "333" "353") 101(defcustom erc-track-exclude-types '("NICK" "333" "353")
102 "*List of message types to be ignored. 102 "List of message types to be ignored.
103This list could look like '(\"JOIN\" \"PART\"). 103This list could look like '(\"JOIN\" \"PART\").
104 104
105By default, exclude changes of nicknames (NICK), display of who 105By default, exclude changes of nicknames (NICK), display of who
@@ -109,7 +109,7 @@ channel (353)."
109 :type 'erc-message-type) 109 :type 'erc-message-type)
110 110
111(defcustom erc-track-exclude-server-buffer nil 111(defcustom erc-track-exclude-server-buffer nil
112 "*If true, don't perform tracking on the server buffer; this is 112 "If true, don't perform tracking on the server buffer; this is
113useful for excluding all the things like MOTDs from the server and 113useful for excluding all the things like MOTDs from the server and
114other miscellaneous functions." 114other miscellaneous functions."
115 :group 'erc-track 115 :group 'erc-track
@@ -127,7 +127,7 @@ the mode-line should be reduced to."
127 :type 'number) 127 :type 'number)
128 128
129(defcustom erc-track-shorten-aggressively nil 129(defcustom erc-track-shorten-aggressively nil
130 "*If non-nil, channel names will be shortened more aggressively. 130 "If non-nil, channel names will be shortened more aggressively.
131Usually, names are not shortened if this will save only one character. 131Usually, names are not shortened if this will save only one character.
132Example: If there are two channels, #linux-de and #linux-fr, then 132Example: If there are two channels, #linux-de and #linux-fr, then
133normally these will not be shortened. When shortening aggressively, 133normally these will not be shortened. When shortening aggressively,
@@ -150,7 +150,7 @@ This setting is used by `erc-track-shorten-names'."
150 (const :tag "Max" max))) 150 (const :tag "Max" max)))
151 151
152(defcustom erc-track-shorten-function 'erc-track-shorten-names 152(defcustom erc-track-shorten-function 'erc-track-shorten-names
153 "*This function will be used to reduce the channel names before display. 153 "This function will be used to reduce the channel names before display.
154It takes one argument, CHANNEL-NAMES which is a list of strings. 154It takes one argument, CHANNEL-NAMES which is a list of strings.
155It should return a list of strings of the same number of elements. 155It should return a list of strings of the same number of elements.
156If nil instead of a function, shortening is disabled." 156If nil instead of a function, shortening is disabled."
@@ -169,7 +169,7 @@ notification of channel activity."
169 :type 'hook) 169 :type 'hook)
170 170
171(defcustom erc-track-use-faces t 171(defcustom erc-track-use-faces t
172 "*Use faces in the mode-line. 172 "Use faces in the mode-line.
173The faces used are the same as used for text in the buffers. 173The faces used are the same as used for text in the buffers.
174\(e.g. `erc-pal-face' is used if a pal sent a message to that channel.)" 174\(e.g. `erc-pal-face' is used if a pal sent a message to that channel.)"
175 :group 'erc-track 175 :group 'erc-track
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 6aa4e718d0a..dd47c601ea8 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -36,7 +36,7 @@
36 :group 'erc) 36 :group 'erc)
37 37
38(defcustom erc-max-buffer-size 30000 38(defcustom erc-max-buffer-size 30000
39 "*Maximum size in chars of each ERC buffer. 39 "Maximum size in chars of each ERC buffer.
40Used only when auto-truncation is enabled. 40Used only when auto-truncation is enabled.
41\(see `erc-truncate-buffer' and `erc-insert-post-hook')." 41\(see `erc-truncate-buffer' and `erc-insert-post-hook')."
42 :group 'erc-truncate 42 :group 'erc-truncate
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 98e26dd9af0..0328c407aa0 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -29,13 +29,13 @@
29(require 'erc-dcc) 29(require 'erc-dcc)
30 30
31(defcustom erc-xdcc-files nil 31(defcustom erc-xdcc-files nil
32 "*List of files to offer via XDCC. 32 "List of files to offer via XDCC.
33Your friends should issue \"/ctcp yournick XDCC list\" to see this." 33Your friends should issue \"/ctcp yournick XDCC list\" to see this."
34 :group 'erc-dcc 34 :group 'erc-dcc
35 :type '(repeat file)) 35 :type '(repeat file))
36 36
37(defcustom erc-xdcc-verbose-flag t 37(defcustom erc-xdcc-verbose-flag t
38 "*Report XDCC CTCP requests in the server buffer." 38 "Report XDCC CTCP requests in the server buffer."
39 :group 'erc-dcc 39 :group 'erc-dcc
40 :type 'boolean) 40 :type 'boolean)
41 41
@@ -43,7 +43,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this."
43 '(("help" . erc-xdcc-help) 43 '(("help" . erc-xdcc-help)
44 ("list" . erc-xdcc-list) 44 ("list" . erc-xdcc-list)
45 ("send" . erc-xdcc-send)) 45 ("send" . erc-xdcc-send))
46 "*Sub-command handler alist for XDCC CTCP queries." 46 "Sub-command handler alist for XDCC CTCP queries."
47 :group 'erc-dcc 47 :group 'erc-dcc
48 :type '(alist :key-type (string :tag "Sub-command") :value-type function)) 48 :type '(alist :key-type (string :tag "Sub-command") :value-type function))
49 49
@@ -54,7 +54,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this."
54 ("Type \"/ctcp " (erc-current-nick) 54 ("Type \"/ctcp " (erc-current-nick)
55 " XDCC list\" to see the list of offered files, then type \"/ctcp " 55 " XDCC list\" to see the list of offered files, then type \"/ctcp "
56 (erc-current-nick) " XDCC send #\" to get a particular file number.")) 56 (erc-current-nick) " XDCC send #\" to get a particular file number."))
57 "*Help text sent in response to XDCC help command. 57 "Help text sent in response to XDCC help command.
58A list of messages, each consisting of strings and expressions, expressions 58A list of messages, each consisting of strings and expressions, expressions
59being evaluated and should return strings." 59being evaluated and should return strings."
60 :group 'erc-dcc 60 :group 'erc-dcc
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 63777fb3897..62b701204d1 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -255,7 +255,7 @@ If nil, only \"> \" will be shown."
255 (repeat :inline t :tag "Others" (string :tag "IRC Message Type")))) 255 (repeat :inline t :tag "Others" (string :tag "IRC Message Type"))))
256 256
257(defcustom erc-hide-list nil 257(defcustom erc-hide-list nil
258 "*List of IRC type messages to hide. 258 "List of IRC type messages to hide.
259A typical value would be '(\"JOIN\" \"PART\" \"QUIT\")." 259A typical value would be '(\"JOIN\" \"PART\" \"QUIT\")."
260 :group 'erc-ignore 260 :group 'erc-ignore
261 :type 'erc-message-type) 261 :type 'erc-message-type)
@@ -653,12 +653,12 @@ This only has any meaning if the variable `erc-command-indicator' is non-nil."
653 prompt)))) 653 prompt))))
654 654
655(defcustom erc-notice-prefix "*** " 655(defcustom erc-notice-prefix "*** "
656 "*Prefix for all notices." 656 "Prefix for all notices."
657 :group 'erc-display 657 :group 'erc-display
658 :type 'string) 658 :type 'string)
659 659
660(defcustom erc-notice-highlight-type 'all 660(defcustom erc-notice-highlight-type 'all
661 "*Determines how to highlight notices. 661 "Determines how to highlight notices.
662See `erc-notice-prefix'. 662See `erc-notice-prefix'.
663 663
664The following values are allowed: 664The following values are allowed:
@@ -673,7 +673,7 @@ Any other value disables notice's highlighting altogether."
673 (const :tag "don't highlight notices at all" nil))) 673 (const :tag "don't highlight notices at all" nil)))
674 674
675(defcustom erc-echo-notice-hook nil 675(defcustom erc-echo-notice-hook nil
676 "*Specifies a list of functions to call to echo a private 676 "Specifies a list of functions to call to echo a private
677notice. Each function is called with four arguments, the string 677notice. Each function is called with four arguments, the string
678to display, the parsed server message, the target buffer (or 678to display, the parsed server message, the target buffer (or
679nil), and the sender. The functions are called in order, until a 679nil), and the sender. The functions are called in order, until a
@@ -704,7 +704,7 @@ See also: `erc-echo-notice-always-hook',
704 704
705(defcustom erc-echo-notice-always-hook 705(defcustom erc-echo-notice-always-hook
706 '(erc-echo-notice-in-default-buffer) 706 '(erc-echo-notice-in-default-buffer)
707 "*Specifies a list of functions to call to echo a private 707 "Specifies a list of functions to call to echo a private
708notice. Each function is called with four arguments, the string 708notice. Each function is called with four arguments, the string
709to display, the parsed server message, the target buffer (or 709to display, the parsed server message, the target buffer (or
710nil), and the sender. The functions are called in order, and all 710nil), and the sender. The functions are called in order, and all
@@ -736,17 +736,17 @@ See also: `erc-echo-notice-hook',
736;; other tunable parameters 736;; other tunable parameters
737 737
738(defcustom erc-whowas-on-nosuchnick nil 738(defcustom erc-whowas-on-nosuchnick nil
739 "*If non-nil, do a whowas on a nick if no such nick." 739 "If non-nil, do a whowas on a nick if no such nick."
740 :group 'erc 740 :group 'erc
741 :type 'boolean) 741 :type 'boolean)
742 742
743(defcustom erc-verbose-server-ping nil 743(defcustom erc-verbose-server-ping nil
744 "*If non-nil, show every time you get a PING or PONG from the server." 744 "If non-nil, show every time you get a PING or PONG from the server."
745 :group 'erc-paranoia 745 :group 'erc-paranoia
746 :type 'boolean) 746 :type 'boolean)
747 747
748(defcustom erc-public-away-p nil 748(defcustom erc-public-away-p nil
749 "*Let others know you are back when you are no longer marked away. 749 "Let others know you are back when you are no longer marked away.
750This happens in this form: 750This happens in this form:
751* <nick> is back (gone for <time>) 751* <nick> is back (gone for <time>)
752 752
@@ -755,7 +755,7 @@ Many consider it impolite to do so automatically."
755 :type 'boolean) 755 :type 'boolean)
756 756
757(defcustom erc-away-nickname nil 757(defcustom erc-away-nickname nil
758 "*The nickname to take when you are marked as being away." 758 "The nickname to take when you are marked as being away."
759 :group 'erc 759 :group 'erc
760 :type '(choice (const nil) 760 :type '(choice (const nil)
761 string)) 761 string))
@@ -796,7 +796,7 @@ If nil, ERC will call `system-name' to get this information."
796 string)) 796 string))
797 797
798(defcustom erc-ignore-list nil 798(defcustom erc-ignore-list nil
799 "*List of regexps matching user identifiers to ignore. 799 "List of regexps matching user identifiers to ignore.
800 800
801A user identifier has the form \"nick!login@host\". If an 801A user identifier has the form \"nick!login@host\". If an
802identifier matches, the message from the person will not be 802identifier matches, the message from the person will not be
@@ -806,7 +806,7 @@ processed."
806(make-variable-buffer-local 'erc-ignore-list) 806(make-variable-buffer-local 'erc-ignore-list)
807 807
808(defcustom erc-ignore-reply-list nil 808(defcustom erc-ignore-reply-list nil
809 "*List of regexps matching user identifiers to ignore completely. 809 "List of regexps matching user identifiers to ignore completely.
810 810
811This differs from `erc-ignore-list' in that it also ignores any 811This differs from `erc-ignore-list' in that it also ignores any
812messages directed at the user. 812messages directed at the user.
@@ -824,7 +824,7 @@ people. You can update the ERC internal info using /WHO *."
824 :type '(repeat regexp)) 824 :type '(repeat regexp))
825 825
826(defvar erc-flood-protect t 826(defvar erc-flood-protect t
827 "*If non-nil, flood protection is enabled. 827 "If non-nil, flood protection is enabled.
828Flooding is sending too much information to the server in too 828Flooding is sending too much information to the server in too
829short of an interval, which may cause the server to terminate the 829short of an interval, which may cause the server to terminate the
830connection. 830connection.
@@ -854,7 +854,7 @@ directory in the list."
854 :type '(repeat directory)) 854 :type '(repeat directory))
855 855
856(defcustom erc-script-echo t 856(defcustom erc-script-echo t
857 "*If non-nil, echo the IRC script commands locally." 857 "If non-nil, echo the IRC script commands locally."
858 :group 'erc-scripts 858 :group 'erc-scripts
859 :type 'boolean) 859 :type 'boolean)
860 860
@@ -929,7 +929,7 @@ will be used as the part message."
929 :type '(repeat (list regexp (choice (string) (function))))) 929 :type '(repeat (list regexp (choice (string) (function)))))
930 930
931(defcustom erc-quit-reason 'erc-quit-reason-normal 931(defcustom erc-quit-reason 'erc-quit-reason-normal
932 "*A function which returns the reason for quitting. 932 "A function which returns the reason for quitting.
933 933
934The function is passed a single argument, the string typed by the 934The function is passed a single argument, the string typed by the
935user after \"/quit\"." 935user after \"/quit\"."
@@ -1480,7 +1480,7 @@ The available choices are:
1480 (const :tag "Use current buffer" t))) 1480 (const :tag "Use current buffer" t)))
1481 1481
1482(defcustom erc-frame-alist nil 1482(defcustom erc-frame-alist nil
1483 "*Alist of frame parameters for creating erc frames. 1483 "Alist of frame parameters for creating erc frames.
1484A value of nil means to use `default-frame-alist'." 1484A value of nil means to use `default-frame-alist'."
1485 :group 'erc-buffers 1485 :group 'erc-buffers
1486 :type '(repeat (cons :format "%v" 1486 :type '(repeat (cons :format "%v"
@@ -1488,13 +1488,13 @@ A value of nil means to use `default-frame-alist'."
1488 (sexp :tag "Value")))) 1488 (sexp :tag "Value"))))
1489 1489
1490(defcustom erc-frame-dedicated-flag nil 1490(defcustom erc-frame-dedicated-flag nil
1491 "*Non-nil means the erc frames are dedicated to that buffer. 1491 "Non-nil means the erc frames are dedicated to that buffer.
1492This only has effect when `erc-join-buffer' is set to `frame'." 1492This only has effect when `erc-join-buffer' is set to `frame'."
1493 :group 'erc-buffers 1493 :group 'erc-buffers
1494 :type 'boolean) 1494 :type 'boolean)
1495 1495
1496(defcustom erc-reuse-frames t 1496(defcustom erc-reuse-frames t
1497 "*Determines whether new frames are always created. 1497 "Determines whether new frames are always created.
1498Non-nil means that a new frame is not created to display an ERC 1498Non-nil means that a new frame is not created to display an ERC
1499buffer if there is already a window displaying it. This only has 1499buffer if there is already a window displaying it. This only has
1500effect when `erc-join-buffer' is set to `frame'." 1500effect when `erc-join-buffer' is set to `frame'."
@@ -1511,7 +1511,7 @@ effect when `erc-join-buffer' is set to `frame'."
1511 (t nil))) 1511 (t nil)))
1512 1512
1513(defcustom erc-reuse-buffers t 1513(defcustom erc-reuse-buffers t
1514 "*If nil, create new buffers on joining a channel/query. 1514 "If nil, create new buffers on joining a channel/query.
1515If non-nil, a new buffer will only be created when you join 1515If non-nil, a new buffer will only be created when you join
1516channels with same names on different servers, or have query buffers 1516channels with same names on different servers, or have query buffers
1517open with nicks of the same name on different servers. Otherwise, 1517open with nicks of the same name on different servers. Otherwise,
@@ -3799,7 +3799,7 @@ This places `point' just after the prompt, or at the beginning of the line."
3799 3799
3800(defcustom erc-default-server-hook '(erc-debug-missing-hooks 3800(defcustom erc-default-server-hook '(erc-debug-missing-hooks
3801 erc-default-server-handler) 3801 erc-default-server-handler)
3802 "*Default for server messages which aren't covered by `erc-server-hooks'." 3802 "Default for server messages which aren't covered by `erc-server-hooks'."
3803 :group 'erc-server-hooks 3803 :group 'erc-server-hooks
3804 :type 'hook) 3804 :type 'hook)
3805 3805
@@ -4017,7 +4017,7 @@ and as second argument the event parsed as a vector."
4017 str)) 4017 str))
4018 4018
4019(defcustom erc-format-nick-function 'erc-format-nick 4019(defcustom erc-format-nick-function 'erc-format-nick
4020 "*Function to format a nickname for message display." 4020 "Function to format a nickname for message display."
4021 :group 'erc-display 4021 :group 'erc-display
4022 :type 'function) 4022 :type 'function)
4023 4023
@@ -4575,7 +4575,7 @@ channel."
4575 (run-hooks 'erc-channel-members-changed-hook))) 4575 (run-hooks 'erc-channel-members-changed-hook)))
4576 4576
4577(defcustom erc-channel-members-changed-hook nil 4577(defcustom erc-channel-members-changed-hook nil
4578 "*This hook is called every time the variable `channel-members' changes. 4578 "This hook is called every time the variable `channel-members' changes.
4579The buffer where the change happened is current while this hook is called." 4579The buffer where the change happened is current while this hook is called."
4580 :group 'erc-hooks 4580 :group 'erc-hooks
4581 :type 'hook) 4581 :type 'hook)
@@ -6386,17 +6386,17 @@ See also `format-spec'."
6386(add-hook 'kill-buffer-hook 'erc-kill-buffer-function) 6386(add-hook 'kill-buffer-hook 'erc-kill-buffer-function)
6387 6387
6388(defcustom erc-kill-server-hook '(erc-kill-server) 6388(defcustom erc-kill-server-hook '(erc-kill-server)
6389 "*Invoked whenever a server-buffer is killed via `kill-buffer'." 6389 "Invoked whenever a server-buffer is killed via `kill-buffer'."
6390 :group 'erc-hooks 6390 :group 'erc-hooks
6391 :type 'hook) 6391 :type 'hook)
6392 6392
6393(defcustom erc-kill-channel-hook '(erc-kill-channel) 6393(defcustom erc-kill-channel-hook '(erc-kill-channel)
6394 "*Invoked whenever a channel-buffer is killed via `kill-buffer'." 6394 "Invoked whenever a channel-buffer is killed via `kill-buffer'."
6395 :group 'erc-hooks 6395 :group 'erc-hooks
6396 :type 'hook) 6396 :type 'hook)
6397 6397
6398(defcustom erc-kill-buffer-hook nil 6398(defcustom erc-kill-buffer-hook nil
6399 "*Hook run whenever a non-server or channel buffer is killed. 6399 "Hook run whenever a non-server or channel buffer is killed.
6400 6400
6401See also `kill-buffer'." 6401See also `kill-buffer'."
6402 :group 'erc-hooks 6402 :group 'erc-hooks
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 743115839b2..e76b61fdacb 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -132,7 +132,7 @@ just before \"Other\" at the end."
132 ,(purecopy "^font-lock-") ,(purecopy "^gnus-") ,(purecopy "^message-") 132 ,(purecopy "^font-lock-") ,(purecopy "^gnus-") ,(purecopy "^message-")
133 ,(purecopy "^ediff-") ,(purecopy "^term-") ,(purecopy "^vc-") 133 ,(purecopy "^ediff-") ,(purecopy "^term-") ,(purecopy "^vc-")
134 ,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-")) 134 ,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-"))
135 "*List of faces that are of no interest to the user.") 135 "List of faces that are of no interest to the user.")
136(make-obsolete-variable 'facemenu-unlisted-faces 'facemenu-listed-faces 136(make-obsolete-variable 'facemenu-unlisted-faces 'facemenu-listed-faces
137 "22.1,\n and has no effect on the Face menu") 137 "22.1,\n and has no effect on the Face menu")
138 138
diff --git a/lisp/faces.el b/lisp/faces.el
index 0256f8d951a..8eacf5bcfe2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1212,7 +1212,7 @@ Value is a list (FACE NEW-VALUE) where FACE is the face read
1212 1212
1213(defconst list-faces-sample-text 1213(defconst list-faces-sample-text
1214 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" 1214 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ"
1215 "*Text string to display as the sample text for `list-faces-display'.") 1215 "Text string to display as the sample text for `list-faces-display'.")
1216 1216
1217 1217
1218;; The name list-faces would be more consistent, but let's avoid a 1218;; The name list-faces would be more consistent, but let's avoid a
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 99017d27490..52ffc9905ed 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1472,7 +1472,7 @@ and the functions `ffap-file-at-point' and `ffap-url-at-point'."
1472;;; Menu support (`ffap-menu'): 1472;;; Menu support (`ffap-menu'):
1473 1473
1474(defvar ffap-menu-regexp nil 1474(defvar ffap-menu-regexp nil
1475 "*If non-nil, overrides `ffap-next-regexp' during `ffap-menu'. 1475 "If non-nil, overrides `ffap-next-regexp' during `ffap-menu'.
1476Make this more restrictive for faster menu building. 1476Make this more restrictive for faster menu building.
1477For example, try \":/\" for URL (and some ftp) references.") 1477For example, try \":/\" for URL (and some ftp) references.")
1478 1478
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 19fa8283b06..fe1ab96add9 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -190,7 +190,7 @@ To override this, give an argument to `ff-find-other-file'."
190 ) 190 )
191 ;; We include `ff-treat-as-special' documentation here so that autoload 191 ;; We include `ff-treat-as-special' documentation here so that autoload
192 ;; can make it available to be read prior to loading this file. 192 ;; can make it available to be read prior to loading this file.
193 "*List of special constructs for `ff-treat-as-special' to recognize. 193 "List of special constructs for `ff-treat-as-special' to recognize.
194Each element, tried in order, has the form (REGEXP . EXTRACT). 194Each element, tried in order, has the form (REGEXP . EXTRACT).
195If REGEXP matches the current line (from the beginning of the line), 195If REGEXP matches the current line (from the beginning of the line),
196`ff-treat-as-special' calls function EXTRACT with no args. 196`ff-treat-as-special' calls function EXTRACT with no args.
diff --git a/lisp/follow.el b/lisp/follow.el
index a29f733148c..850cb7b22db 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -393,7 +393,7 @@ are \" Fw\", or simply \"\"."
393 :group 'follow) 393 :group 'follow)
394 394
395(defvar follow-avoid-tail-recenter-p (not (featurep 'xemacs)) 395(defvar follow-avoid-tail-recenter-p (not (featurep 'xemacs))
396 "*When non-nil, patch Emacs so that tail windows won't be recentered. 396 "When non-nil, patch Emacs so that tail windows won't be recentered.
397 397
398A \"tail window\" is a window that displays only the end of 398A \"tail window\" is a window that displays only the end of
399the buffer. Normally it is practical for the user that empty 399the buffer. Normally it is practical for the user that empty
@@ -424,7 +424,7 @@ To mark other commands as suitable for caching, set the symbol
424property `follow-mode-use-cache' to non-nil.") 424property `follow-mode-use-cache' to non-nil.")
425 425
426(defvar follow-debug nil 426(defvar follow-debug nil
427 "*Non-nil when debugging Follow mode.") 427 "Non-nil when debugging Follow mode.")
428 428
429 429
430;; Internal variables: 430;; Internal variables:
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b65828ca1d7..910585f21f1 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -492,11 +492,11 @@ This is normally set via `font-lock-add-keywords' and
492`font-lock-remove-keywords'.") 492`font-lock-remove-keywords'.")
493 493
494(defvar font-lock-keywords-only nil 494(defvar font-lock-keywords-only nil
495 "*Non-nil means Font Lock should not fontify comments or strings. 495 "Non-nil means Font Lock should not fontify comments or strings.
496This is normally set via `font-lock-defaults'.") 496This is normally set via `font-lock-defaults'.")
497 497
498(defvar font-lock-keywords-case-fold-search nil 498(defvar font-lock-keywords-case-fold-search nil
499 "*Non-nil means the patterns in `font-lock-keywords' are case-insensitive. 499 "Non-nil means the patterns in `font-lock-keywords' are case-insensitive.
500This is set via the function `font-lock-set-defaults', based on 500This is set via the function `font-lock-set-defaults', based on
501the CASE-FOLD argument of `font-lock-defaults'.") 501the CASE-FOLD argument of `font-lock-defaults'.")
502(make-variable-buffer-local 'font-lock-keywords-case-fold-search) 502(make-variable-buffer-local 'font-lock-keywords-case-fold-search)
@@ -556,7 +556,7 @@ If this is nil, the major mode's syntax table is used.
556This is normally set via `font-lock-defaults'.") 556This is normally set via `font-lock-defaults'.")
557 557
558(defvar font-lock-beginning-of-syntax-function nil 558(defvar font-lock-beginning-of-syntax-function nil
559 "*Non-nil means use this function to move back outside all constructs. 559 "Non-nil means use this function to move back outside all constructs.
560When called with no args it should move point backward to a place which 560When called with no args it should move point backward to a place which
561is not in a string or comment and not within any bracket-pairs (or else, 561is not in a string or comment and not within any bracket-pairs (or else,
562a place such that any bracket-pairs outside it can be ignored for Emacs 562a place such that any bracket-pairs outside it can be ignored for Emacs
@@ -571,7 +571,7 @@ This is normally set via `font-lock-defaults'.")
571 'syntax-begin-function "23.3" 'set) 571 'syntax-begin-function "23.3" 'set)
572 572
573(defvar font-lock-mark-block-function nil 573(defvar font-lock-mark-block-function nil
574 "*Non-nil means use this function to mark a block of text. 574 "Non-nil means use this function to mark a block of text.
575When called with no args it should leave point at the beginning of any 575When called with no args it should leave point at the beginning of any
576enclosing textual block and mark at the end. 576enclosing textual block and mark at the end.
577This is normally set via `font-lock-defaults'.") 577This is normally set via `font-lock-defaults'.")
diff --git a/lisp/forms.el b/lisp/forms.el
index 007d85caacf..38670e42bdd 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -2031,7 +2031,7 @@ Usage: (setq forms-number-of-fields
2031;;; Debugging 2031;;; Debugging
2032 2032
2033(defvar forms--debug nil 2033(defvar forms--debug nil
2034 "*Enables forms-mode debugging if not nil.") 2034 "Enables forms-mode debugging if not nil.")
2035 2035
2036(defun forms--debug (&rest args) 2036(defun forms--debug (&rest args)
2037 "Internal debugging routine." 2037 "Internal debugging routine."
diff --git a/lisp/ido.el b/lisp/ido.el
index fe94c7f225e..bbf3fe2a1d0 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -872,7 +872,7 @@ The following variables are available, but should not be changed:
872 :group 'ido) 872 :group 'ido)
873 873
874(defvar ido-rewrite-file-prompt-rules nil 874(defvar ido-rewrite-file-prompt-rules nil
875 "*Alist of rewriting rules for directory names in ido prompts. 875 "Alist of rewriting rules for directory names in ido prompts.
876A list of elements of the form (FROM . TO) or (FROM . FUNC), each 876A list of elements of the form (FROM . TO) or (FROM . FUNC), each
877meaning to rewrite the directory name if matched by FROM by either 877meaning to rewrite the directory name if matched by FROM by either
878substituting the matched string by TO or calling the function FUNC 878substituting the matched string by TO or calling the function FUNC
@@ -894,7 +894,7 @@ Otherwise, only the current list of matches is shown."
894 :group 'ido) 894 :group 'ido)
895 895
896(defvar ido-all-frames 'visible 896(defvar ido-all-frames 'visible
897 "*Argument to pass to `walk-windows' when finding visible files. 897 "Argument to pass to `walk-windows' when finding visible files.
898See documentation of `walk-windows' for useful values.") 898See documentation of `walk-windows' for useful values.")
899 899
900(defcustom ido-minibuffer-setup-hook nil 900(defcustom ido-minibuffer-setup-hook nil
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 86cef14960e..9600bd1db2d 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -373,7 +373,7 @@ See also `iswitchb-newbuffer'."
373 :group 'iswitchb) 373 :group 'iswitchb)
374 374
375(defvar iswitchb-all-frames 'visible 375(defvar iswitchb-all-frames 'visible
376 "*Argument to pass to `walk-windows' when finding visible buffers. 376 "Argument to pass to `walk-windows' when finding visible buffers.
377See documentation of `walk-windows' for useful values.") 377See documentation of `walk-windows' for useful values.")
378 378
379(defcustom iswitchb-minibuffer-setup-hook nil 379(defcustom iswitchb-minibuffer-setup-hook nil
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index c8dd05f7c4d..b715e44387e 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -231,12 +231,12 @@ macro to be executed before appending to it."
231;;; Keyboard macro counter 231;;; Keyboard macro counter
232 232
233(defvar kmacro-counter 0 233(defvar kmacro-counter 0
234 "*Current keyboard macro counter.") 234 "Current keyboard macro counter.")
235 235
236(defvar kmacro-default-counter-format "%d") 236(defvar kmacro-default-counter-format "%d")
237 237
238(defvar kmacro-counter-format "%d" 238(defvar kmacro-counter-format "%d"
239 "*Current keyboard macro counter format.") 239 "Current keyboard macro counter format.")
240 240
241(defvar kmacro-counter-format-start kmacro-counter-format 241(defvar kmacro-counter-format-start kmacro-counter-format
242 "Macro format at start of macro execution.") 242 "Macro format at start of macro execution.")
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index e61645c10fc..90e649c574c 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -99,34 +99,34 @@
99;; 99;;
100 100
101(defvar ethio-primary-language 'tigrigna 101(defvar ethio-primary-language 'tigrigna
102 "*Symbol that defines the primary language in SERA --> FIDEL conversion. 102 "Symbol that defines the primary language in SERA --> FIDEL conversion.
103The value should be one of: `tigrigna', `amharic' or `english'.") 103The value should be one of: `tigrigna', `amharic' or `english'.")
104 104
105(defvar ethio-secondary-language 'english 105(defvar ethio-secondary-language 'english
106 "*Symbol that defines the secondary language in SERA --> FIDEL conversion. 106 "Symbol that defines the secondary language in SERA --> FIDEL conversion.
107The value should be one of: `tigrigna', `amharic' or `english'.") 107The value should be one of: `tigrigna', `amharic' or `english'.")
108 108
109(defvar ethio-use-colon-for-colon nil 109(defvar ethio-use-colon-for-colon nil
110 "*Non-nil means associate ASCII colon with Ethiopic colon. 110 "Non-nil means associate ASCII colon with Ethiopic colon.
111If nil, associate ASCII colon with Ethiopic word separator, i.e., two 111If nil, associate ASCII colon with Ethiopic word separator, i.e., two
112vertically stacked dots. All SERA <--> FIDEL converters refer this 112vertically stacked dots. All SERA <--> FIDEL converters refer this
113variable.") 113variable.")
114 114
115(defvar ethio-use-three-dot-question nil 115(defvar ethio-use-three-dot-question nil
116 "*Non-nil means associate ASCII question mark with Ethiopic old style question mark (three vertically stacked dots). 116 "Non-nil means associate ASCII question mark with Ethiopic old style question mark (three vertically stacked dots).
117If nil, associate ASCII question mark with Ethiopic stylized question 117If nil, associate ASCII question mark with Ethiopic stylized question
118mark. All SERA <--> FIDEL converters refer this variable.") 118mark. All SERA <--> FIDEL converters refer this variable.")
119 119
120(defvar ethio-quote-vowel-always nil 120(defvar ethio-quote-vowel-always nil
121 "*Non-nil means always put an apostrophe before an isolated vowel (except at word initial) in FIDEL --> SERA conversion. 121 "Non-nil means always put an apostrophe before an isolated vowel (except at word initial) in FIDEL --> SERA conversion.
122If nil, put an apostrophe only between a 6th-form consonant and an 122If nil, put an apostrophe only between a 6th-form consonant and an
123isolated vowel.") 123isolated vowel.")
124 124
125(defvar ethio-W-sixth-always nil 125(defvar ethio-W-sixth-always nil
126 "*Non-nil means convert the Wu-form of a 12-form consonant to \"W'\" instead of \"Wu\" in FIDEL --> SERA conversion.") 126 "Non-nil means convert the Wu-form of a 12-form consonant to \"W'\" instead of \"Wu\" in FIDEL --> SERA conversion.")
127 127
128(defvar ethio-numeric-reduction 0 128(defvar ethio-numeric-reduction 0
129 "*Degree of reduction in converting Ethiopic digits into Arabic digits. 129 "Degree of reduction in converting Ethiopic digits into Arabic digits.
130Should be 0, 1 or 2. 130Should be 0, 1 or 2.
131For example, ({10}{9}{100}{80}{7}) is converted into: 131For example, ({10}{9}{100}{80}{7}) is converted into:
132 `10`9`100`80`7 if `ethio-numeric-reduction' is 0, 132 `10`9`100`80`7 if `ethio-numeric-reduction' is 0,
@@ -134,7 +134,7 @@ For example, ({10}{9}{100}{80}{7}) is converted into:
134 `10900807 if `ethio-numeric-reduction' is 2.") 134 `10900807 if `ethio-numeric-reduction' is 2.")
135 135
136(defvar ethio-java-save-lowercase nil 136(defvar ethio-java-save-lowercase nil
137 "*Non-nil means save Ethiopic characters in lowercase hex numbers to Java files. 137 "Non-nil means save Ethiopic characters in lowercase hex numbers to Java files.
138If nil, use uppercases.") 138If nil, use uppercases.")
139 139
140(defun ethio-prefer-amharic-p () 140(defun ethio-prefer-amharic-p ()
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index f8dfdf45d00..ee8ebb7b2e7 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -32,7 +32,7 @@
32 (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) 32 (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") ""))
33 "3" 33 "3"
34 "")) 34 ""))
35 "*The kind of Korean keyboard for Korean input method. 35 "The kind of Korean keyboard for Korean input method.
36\"\" for 2, \"3\" for 3.") 36\"\" for 2, \"3\" for 3.")
37 37
38;; functions useful for Korean text input 38;; functions useful for Korean text input
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 66795201f7f..f6dd15bf222 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -398,7 +398,7 @@ See also docstring of the function tibetan-compose-region."
398 )))) 398 ))))
399 399
400(defvar tibetan-strict-unicode t 400(defvar tibetan-strict-unicode t
401 "*Flag to control Tibetan canonicalizing for Unicode. 401 "Flag to control Tibetan canonicalizing for Unicode.
402 402
403If non-nil, the vowel a is removed and composite vowels are decomposed 403If non-nil, the vowel a is removed and composite vowels are decomposed
404before writing buffer in Unicode. See also 404before writing buffer in Unicode. See also
diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
index dd76ce90809..40ea8fa4a82 100644
--- a/lisp/mail/binhex.el
+++ b/lisp/mail/binhex.el
@@ -43,20 +43,20 @@
43 :group 'news) 43 :group 'news)
44 44
45(defcustom binhex-decoder-program "hexbin" 45(defcustom binhex-decoder-program "hexbin"
46 "*Non-nil value should be a string that names a binhex decoder. 46 "Non-nil value should be a string that names a binhex decoder.
47The program should expect to read binhex data on its standard 47The program should expect to read binhex data on its standard
48input and write the converted data to its standard output." 48input and write the converted data to its standard output."
49 :type 'string 49 :type 'string
50 :group 'binhex) 50 :group 'binhex)
51 51
52(defcustom binhex-decoder-switches '("-d") 52(defcustom binhex-decoder-switches '("-d")
53 "*List of command line flags passed to the command `binhex-decoder-program'." 53 "List of command line flags passed to the command `binhex-decoder-program'."
54 :group 'binhex 54 :group 'binhex
55 :type '(repeat string)) 55 :type '(repeat string))
56 56
57(defcustom binhex-use-external 57(defcustom binhex-use-external
58 (executable-find binhex-decoder-program) 58 (executable-find binhex-decoder-program)
59 "*Use external binhex program." 59 "Use external binhex program."
60 :version "22.1" 60 :version "22.1"
61 :group 'binhex 61 :group 'binhex
62 :type 'boolean) 62 :type 'boolean)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 039f3dca4a2..4e76e5cdb64 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1340,7 +1340,7 @@ Example 'defadvice' for mail-send:
1340 1340
1341 1341
1342(defvar feedmail-queue-runner-is-active nil 1342(defvar feedmail-queue-runner-is-active nil
1343 "*Non-nil means we're inside the logic of the queue-running loop. 1343 "Non-nil means we're inside the logic of the queue-running loop.
1344That is, iterating over all messages in the queue to send them. In 1344That is, iterating over all messages in the queue to send them. In
1345that case, the value is the name of the queued message file currently 1345that case, the value is the name of the queued message file currently
1346being processed. This can be used for differentiating customized code 1346being processed. This can be used for differentiating customized code
@@ -1371,11 +1371,11 @@ call to `feedmail-run-the-queue'."
1371 1371
1372 1372
1373(defvar feedmail-mail-send-hook nil 1373(defvar feedmail-mail-send-hook nil
1374 "*See documentation for `feedmail-mail-send-hook-splitter'.") 1374 "See documentation for `feedmail-mail-send-hook-splitter'.")
1375 1375
1376 1376
1377(defvar feedmail-mail-send-hook-queued nil 1377(defvar feedmail-mail-send-hook-queued nil
1378 "*See documentation for `feedmail-mail-send-hook-splitter'.") 1378 "See documentation for `feedmail-mail-send-hook-splitter'.")
1379 1379
1380 1380
1381(defun feedmail-confirm-addresses-hook-example () 1381(defun feedmail-confirm-addresses-hook-example ()
@@ -1514,7 +1514,7 @@ function, for example, to archive all of your sent messages someplace
1514 1514
1515 1515
1516(defvar feedmail-is-a-resend nil 1516(defvar feedmail-is-a-resend nil
1517 "*Non-nil means the message is a Resend (in the RFC-822 sense). 1517 "Non-nil means the message is a Resend (in the RFC-822 sense).
1518This affects the composition of certain headers. feedmail sets this 1518This affects the composition of certain headers. feedmail sets this
1519variable as soon as it starts prepping the message text buffer, so any 1519variable as soon as it starts prepping the message text buffer, so any
1520user-supplied functions can rely on it. Users shouldn't set or change this 1520user-supplied functions can rely on it. Users shouldn't set or change this
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 05949d0eccf..c0a63ef197c 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -129,7 +129,7 @@ has no effect on buffers already displaying footnotes."
129(defvar footnote-signature-separator (if (boundp 'message-signature-separator) 129(defvar footnote-signature-separator (if (boundp 'message-signature-separator)
130 message-signature-separator 130 message-signature-separator
131 "^-- $") 131 "^-- $")
132 "*String used to recognize .signatures.") 132 "String used to recognize .signatures.")
133 133
134;;; Private variables 134;;; Private variables
135 135
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 279b5f7b460..fd8d2633818 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -58,14 +58,14 @@
58 :group 'mail) 58 :group 'mail)
59 59
60(defcustom hashcash-default-payment 20 60(defcustom hashcash-default-payment 20
61 "*The default number of bits to pay to unknown users. 61 "The default number of bits to pay to unknown users.
62If this is zero, no payment header will be generated. 62If this is zero, no payment header will be generated.
63See `hashcash-payment-alist'." 63See `hashcash-payment-alist'."
64 :type 'integer 64 :type 'integer
65 :group 'hashcash) 65 :group 'hashcash)
66 66
67(defcustom hashcash-payment-alist '() 67(defcustom hashcash-payment-alist '()
68 "*An association list mapping email addresses to payment amounts. 68 "An association list mapping email addresses to payment amounts.
69Elements may consist of (ADDR AMOUNT) or (ADDR STRING AMOUNT), where 69Elements may consist of (ADDR AMOUNT) or (ADDR STRING AMOUNT), where
70ADDR is the email address of the intended recipient and AMOUNT is 70ADDR is the email address of the intended recipient and AMOUNT is
71the value of hashcash payment to be made to that user. STRING, if 71the value of hashcash payment to be made to that user. STRING, if
@@ -80,33 +80,33 @@ present, is the string to be hashed; if not present ADDR will be used."
80 :group 'hashcash) 80 :group 'hashcash)
81 81
82(defcustom hashcash-default-accept-payment 20 82(defcustom hashcash-default-accept-payment 20
83 "*The default minimum number of bits to accept on incoming payments." 83 "The default minimum number of bits to accept on incoming payments."
84 :type 'integer 84 :type 'integer
85 :group 'hashcash) 85 :group 'hashcash)
86 86
87(defcustom hashcash-accept-resources `((,user-mail-address nil)) 87(defcustom hashcash-accept-resources `((,user-mail-address nil))
88 "*An association list mapping hashcash resources to payment amounts. 88 "An association list mapping hashcash resources to payment amounts.
89Resources named here are to be accepted in incoming payments. If the 89Resources named here are to be accepted in incoming payments. If the
90corresponding AMOUNT is NIL, the value of `hashcash-default-accept-payment' 90corresponding AMOUNT is NIL, the value of `hashcash-default-accept-payment'
91is used instead." 91is used instead."
92 :group 'hashcash) 92 :group 'hashcash)
93 93
94(defcustom hashcash-path (executable-find "hashcash") 94(defcustom hashcash-path (executable-find "hashcash")
95 "*The path to the hashcash binary." 95 "The path to the hashcash binary."
96 :group 'hashcash) 96 :group 'hashcash)
97 97
98(defcustom hashcash-extra-generate-parameters nil 98(defcustom hashcash-extra-generate-parameters nil
99 "*A list of parameter strings passed to `hashcash-path' when minting. 99 "A list of parameter strings passed to `hashcash-path' when minting.
100For example, you may want to set this to '(\"-Z2\") to reduce header length." 100For example, you may want to set this to '(\"-Z2\") to reduce header length."
101 :type '(repeat string) 101 :type '(repeat string)
102 :group 'hashcash) 102 :group 'hashcash)
103 103
104(defcustom hashcash-double-spend-database "hashcash.db" 104(defcustom hashcash-double-spend-database "hashcash.db"
105 "*The path to the double-spending database." 105 "The path to the double-spending database."
106 :group 'hashcash) 106 :group 'hashcash)
107 107
108(defcustom hashcash-in-news nil 108(defcustom hashcash-in-news nil
109 "*Specifies whether or not hashcash payments should be made to newsgroups." 109 "Specifies whether or not hashcash payments should be made to newsgroups."
110 :type 'boolean 110 :type 'boolean
111 :group 'hashcash) 111 :group 'hashcash)
112 112
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 6af9c2478fc..32f99ac1465 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -218,14 +218,14 @@
218;; 218;;
219 219
220(defcustom mail-extr-guess-middle-initial nil 220(defcustom mail-extr-guess-middle-initial nil
221 "*Whether to try to guess middle initial from mail address. 221 "Whether to try to guess middle initial from mail address.
222If true, then when we see an address like \"John Smith <jqs@host.com>\" 222If true, then when we see an address like \"John Smith <jqs@host.com>\"
223we will assume that \"John Q. Smith\" is the fellow's name." 223we will assume that \"John Q. Smith\" is the fellow's name."
224 :type 'boolean 224 :type 'boolean
225 :group 'mail-extr) 225 :group 'mail-extr)
226 226
227(defcustom mail-extr-ignore-single-names nil 227(defcustom mail-extr-ignore-single-names nil
228 "*Whether to ignore a name that is just a single word. 228 "Whether to ignore a name that is just a single word.
229If true, then when we see an address like \"Idiot <dumb@stupid.com>\" 229If true, then when we see an address like \"Idiot <dumb@stupid.com>\"
230we will act as though we couldn't find a full name in the address." 230we will act as though we couldn't find a full name in the address."
231 :type 'boolean 231 :type 'boolean
@@ -244,19 +244,19 @@ we will act as though we couldn't find a full name in the address."
244(defcustom mail-extr-full-name-prefixes 244(defcustom mail-extr-full-name-prefixes
245 (purecopy 245 (purecopy
246 "\\(Prof\\|D[Rr]\\|Mrs?\\|Rev\\|Rabbi\\|SysOp\\|LCDR\\)\\.?[ \t\n]") 246 "\\(Prof\\|D[Rr]\\|Mrs?\\|Rev\\|Rabbi\\|SysOp\\|LCDR\\)\\.?[ \t\n]")
247 "*Matches prefixes to the full name that identify a person's position. 247 "Matches prefixes to the full name that identify a person's position.
248These are stripped from the full name because they do not contribute to 248These are stripped from the full name because they do not contribute to
249uniquely identifying the person." 249uniquely identifying the person."
250 :type 'regexp 250 :type 'regexp
251 :group 'mail-extr) 251 :group 'mail-extr)
252 252
253(defcustom mail-extr-@-binds-tighter-than-! nil 253(defcustom mail-extr-@-binds-tighter-than-! nil
254 "*Whether the local mail transport agent looks at ! before @." 254 "Whether the local mail transport agent looks at ! before @."
255 :type 'boolean 255 :type 'boolean
256 :group 'mail-extr) 256 :group 'mail-extr)
257 257
258(defcustom mail-extr-mangle-uucp nil 258(defcustom mail-extr-mangle-uucp nil
259 "*Whether to throw away information in UUCP addresses 259 "Whether to throw away information in UUCP addresses
260by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"." 260by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
261 :type 'boolean 261 :type 'boolean
262 :group 'mail-extr) 262 :group 'mail-extr)
@@ -1454,7 +1454,7 @@ consing a string.)"
1454 )) 1454 ))
1455 1455
1456(defcustom mail-extr-disable-voodoo "\\cj" 1456(defcustom mail-extr-disable-voodoo "\\cj"
1457 "*If it is a regexp, names matching it will never be modified. 1457 "If it is a regexp, names matching it will never be modified.
1458If it is neither nil nor a string, modifying of names will never take 1458If it is neither nil nor a string, modifying of names will never take
1459place. It affects how `mail-extract-address-components' works." 1459place. It affects how `mail-extract-address-components' works."
1460 :type '(choice (regexp :size 0) 1460 :type '(choice (regexp :size 0)
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index 0e79992aebe..dd489e3c6a9 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -78,14 +78,14 @@ Used for knowing which history list to look in when the user asks for
78previous/next input.") 78previous/next input.")
79 79
80(defcustom mail-hist-history-size (or kill-ring-max 1729) 80(defcustom mail-hist-history-size (or kill-ring-max 1729)
81 "*The maximum number of elements in a mail field's history. 81 "The maximum number of elements in a mail field's history.
82Oldest elements are dumped first." 82Oldest elements are dumped first."
83 :type 'integer 83 :type 'integer
84 :group 'mail-hist) 84 :group 'mail-hist)
85 85
86;;;###autoload 86;;;###autoload
87(defcustom mail-hist-keep-history t 87(defcustom mail-hist-keep-history t
88 "*Non-nil means keep a history for headers and text of outgoing mail." 88 "Non-nil means keep a history for headers and text of outgoing mail."
89 :type 'boolean 89 :type 'boolean
90 :group 'mail-hist) 90 :group 'mail-hist)
91 91
@@ -182,7 +182,7 @@ HEADER is a string without the colon."
182 (cdr (assoc header mail-hist-header-ring-alist))) 182 (cdr (assoc header mail-hist-header-ring-alist)))
183 183
184(defcustom mail-hist-text-size-limit nil 184(defcustom mail-hist-text-size-limit nil
185 "*Don't store any header or body with more than this many characters. 185 "Don't store any header or body with more than this many characters.
186If the value is nil, that means no limit on text size." 186If the value is nil, that means no limit on text size."
187 :type '(choice (const nil) integer) 187 :type '(choice (const nil) integer)
188 :group 'mail-hist) 188 :group 'mail-hist)
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 51a4c6506be..fb8e1502f91 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -255,7 +255,7 @@ By default this is the file specified by `mail-personal-alias-file'."
255 (message "Parsing %s... done" file)) 255 (message "Parsing %s... done" file))
256 256
257(defvar mail-alias-separator-string ", " 257(defvar mail-alias-separator-string ", "
258 "*A string inserted between addresses in multi-address mail aliases. 258 "A string inserted between addresses in multi-address mail aliases.
259This has to contain a comma, so \", \" is a reasonable value. You might 259This has to contain a comma, so \", \" is a reasonable value. You might
260also want something like \",\\n \" to get each address on its own line.") 260also want something like \",\\n \" to get each address on its own line.")
261 261
@@ -423,7 +423,7 @@ fill-column, break the line at the previous comma, and indent the next line."
423 423
424(defvar mail-abbrev-mode-regexp 424(defvar mail-abbrev-mode-regexp
425 "^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):" 425 "^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):"
426 "*Regexp to select mail-headers in which mail abbrevs should be expanded. 426 "Regexp to select mail-headers in which mail abbrevs should be expanded.
427This string will be handed to `looking-at' with point at the beginning 427This string will be handed to `looking-at' with point at the beginning
428of the current line; if it matches, abbrev mode will be turned on, otherwise 428of the current line; if it matches, abbrev mode will be turned on, otherwise
429it will be turned off. (You don't need to worry about continuation lines.) 429it will be turned off. (You don't need to worry about continuation lines.)
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index ed2c4a66b7a..60dcd5210e1 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -42,23 +42,23 @@
42 :group 'processes) 42 :group 'processes)
43 43
44(defcustom metamail-program-name "metamail" 44(defcustom metamail-program-name "metamail"
45 "*Metamail program name." 45 "Metamail program name."
46 :type 'string 46 :type 'string
47 :group 'metamail) 47 :group 'metamail)
48 48
49(defcustom metamail-mailer-name "emacs" 49(defcustom metamail-mailer-name "emacs"
50 "*Mailer name set to MM_MAILER environment variable." 50 "Mailer name set to MM_MAILER environment variable."
51 :type 'string 51 :type 'string
52 :group 'metamail) 52 :group 'metamail)
53 53
54(defvar metamail-environment '("KEYHEADS=*" "MM_QUIET=1") 54(defvar metamail-environment '("KEYHEADS=*" "MM_QUIET=1")
55 "*Environment variables passed to `metamail'. 55 "Environment variables passed to `metamail'.
56It must be a list of strings that have the format ENVVARNAME=VALUE. 56It must be a list of strings that have the format ENVVARNAME=VALUE.
57It is not expected to be altered globally by `set' or `setq'. 57It is not expected to be altered globally by `set' or `setq'.
58Instead, change its value temporary using `let' or `let*' form.") 58Instead, change its value temporary using `let' or `let*' form.")
59 59
60(defcustom metamail-switches '("-x" "-d" "-z") 60(defcustom metamail-switches '("-x" "-d" "-z")
61 "*Switches for `metamail' program. 61 "Switches for `metamail' program.
62`-z' is required to remove zap file. 62`-z' is required to remove zap file.
63It is not expected to be altered globally by `set' or `setq'. 63It is not expected to be altered globally by `set' or `setq'.
64Instead, change its value temporary using `let' or `let*' form. 64Instead, change its value temporary using `let' or `let*' form.
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index d52d9633ee7..9f9c9c68285 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -125,17 +125,17 @@
125) 125)
126 126
127(defcustom mspools-update nil 127(defcustom mspools-update nil
128 "*Non-nil means update *spools* buffer after visiting any folder." 128 "Non-nil means update *spools* buffer after visiting any folder."
129 :type 'boolean 129 :type 'boolean
130 :group 'mspools) 130 :group 'mspools)
131 131
132(defcustom mspools-suffix "spool" 132(defcustom mspools-suffix "spool"
133 "*Extension used for spool files (not including full stop)." 133 "Extension used for spool files (not including full stop)."
134 :type 'string 134 :type 'string
135 :group 'mspools) 135 :group 'mspools)
136 136
137(defcustom mspools-using-vm (fboundp 'vm) 137(defcustom mspools-using-vm (fboundp 'vm)
138 "*Non-nil if VM is used as mail reader, otherwise RMAIL is used." 138 "Non-nil if VM is used as mail reader, otherwise RMAIL is used."
139 :type 'boolean 139 :type 'boolean
140 :group 'mspools) 140 :group 'mspools)
141 141
@@ -143,7 +143,7 @@
143 (if (boundp 'vm-folder-directory) 143 (if (boundp 'vm-folder-directory)
144 vm-folder-directory 144 vm-folder-directory
145 "~/MAIL/") 145 "~/MAIL/")
146 "*Directory where mail folders are kept. Ensure it has a trailing /. 146 "Directory where mail folders are kept. Ensure it has a trailing /.
147Defaults to `vm-folder-directory' if bound else to ~/MAIL/." 147Defaults to `vm-folder-directory' if bound else to ~/MAIL/."
148 :type 'directory 148 :type 'directory
149 :group 'mspools) 149 :group 'mspools)
@@ -151,7 +151,7 @@ Defaults to `vm-folder-directory' if bound else to ~/MAIL/."
151(defcustom mspools-vm-system-mail (or (getenv "MAIL") 151(defcustom mspools-vm-system-mail (or (getenv "MAIL")
152 (concat rmail-spool-directory 152 (concat rmail-spool-directory
153 (user-login-name))) 153 (user-login-name)))
154 "*Spool file for main mailbox. Only used by VM. 154 "Spool file for main mailbox. Only used by VM.
155This needs to be set to your primary mail spool - mspools will not run 155This needs to be set to your primary mail spool - mspools will not run
156without it. By default this will be set to the environment variable 156without it. By default this will be set to the environment variable
157$MAIL. Otherwise it will use `rmail-spool-directory' to guess where 157$MAIL. Otherwise it will use `rmail-spool-directory' to guess where
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 3a9ba8122ab..093050229c4 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -712,7 +712,7 @@ to an appropriate value, and optionally also set
712 712
713;; FIXME this is unused since 23.1. 713;; FIXME this is unused since 23.1.
714(defvar rmail-decode-mime-charset t 714(defvar rmail-decode-mime-charset t
715 "*Non-nil means a message is decoded by MIME's charset specification. 715 "Non-nil means a message is decoded by MIME's charset specification.
716If this variable is nil, or the message has not MIME specification, 716If this variable is nil, or the message has not MIME specification,
717the message is decoded as normal way. 717the message is decoded as normal way.
718 718
@@ -4211,7 +4211,7 @@ This has an effect only if a summary buffer exists."
4211(eval-when-compile (require 'speedbar)) 4211(eval-when-compile (require 'speedbar))
4212 4212
4213(defvar rmail-speedbar-match-folder-regexp "^[A-Z0-9]+\\(\\.[A-Z0-9]+\\)?$" 4213(defvar rmail-speedbar-match-folder-regexp "^[A-Z0-9]+\\(\\.[A-Z0-9]+\\)?$"
4214 "*This regex is used to match folder names to be displayed in speedbar. 4214 "This regex is used to match folder names to be displayed in speedbar.
4215Enabling this will permit speedbar to display your folders for easy 4215Enabling this will permit speedbar to display your folders for easy
4216browsing, and moving of messages.") 4216browsing, and moving of messages.")
4217 4217
@@ -4704,7 +4704,7 @@ SENDERS is a string of regexps separated by commas.
4704;;;*** 4704;;;***
4705 4705
4706;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) 4706;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
4707;;;;;; "undigest" "undigest.el" "a31a35802a2adbc51be42959c3043dbd") 4707;;;;;; "undigest" "undigest.el" "9f270a2571bbbbfabc27498a8d4089c7")
4708;;; Generated autoloads from undigest.el 4708;;; Generated autoloads from undigest.el
4709 4709
4710(autoload 'undigestify-rmail-message "undigest" "\ 4710(autoload 'undigestify-rmail-message "undigest" "\
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 933eaef8119..f8958a691b2 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -989,7 +989,7 @@ This function uses `mail-envelope-from'."
989 989
990;;;###autoload 990;;;###autoload
991(defvar sendmail-coding-system nil 991(defvar sendmail-coding-system nil
992 "*Coding system for encoding the outgoing mail. 992 "Coding system for encoding the outgoing mail.
993This has higher priority than the default `buffer-file-coding-system' 993This has higher priority than the default `buffer-file-coding-system'
994and `default-sendmail-coding-system', 994and `default-sendmail-coding-system',
995but lower priority than the local value of `buffer-file-coding-system'. 995but lower priority than the local value of `buffer-file-coding-system'.
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index e34a3a4d71e..916a977c546 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -32,7 +32,7 @@
32 32
33(defcustom rmail-forward-separator-regex 33(defcustom rmail-forward-separator-regex
34 "^----.*\\([Ff]orwarded\\|[Oo]riginal\\).*[Mm]essage" 34 "^----.*\\([Ff]orwarded\\|[Oo]riginal\\).*[Mm]essage"
35 "*Regexp to match the string that introduces forwarded messages. 35 "Regexp to match the string that introduces forwarded messages.
36This is not a header, but a string contained in the body of the message. 36This is not a header, but a string contained in the body of the message.
37You may need to customize it for local needs." 37You may need to customize it for local needs."
38 :type 'regexp 38 :type 'regexp
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index d4bf89ffaa1..f415c143473 100644
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -38,20 +38,20 @@
38 :group 'news) 38 :group 'news)
39 39
40(defcustom uudecode-decoder-program "uudecode" 40(defcustom uudecode-decoder-program "uudecode"
41 "*Non-nil value should be a string that names a uu decoder. 41 "Non-nil value should be a string that names a uu decoder.
42The program should expect to read uu data on its standard 42The program should expect to read uu data on its standard
43input and write the converted data to its standard output." 43input and write the converted data to its standard output."
44 :type 'string 44 :type 'string
45 :group 'uudecode) 45 :group 'uudecode)
46 46
47(defcustom uudecode-decoder-switches nil 47(defcustom uudecode-decoder-switches nil
48 "*List of command line flags passed to `uudecode-decoder-program'." 48 "List of command line flags passed to `uudecode-decoder-program'."
49 :group 'uudecode 49 :group 'uudecode
50 :type '(repeat string)) 50 :type '(repeat string))
51 51
52(defcustom uudecode-use-external 52(defcustom uudecode-use-external
53 (executable-find uudecode-decoder-program) 53 (executable-find uudecode-decoder-program)
54 "*Use external uudecode program." 54 "Use external uudecode program."
55 :version "22.1" 55 :version "22.1"
56 :group 'uudecode 56 :group 'uudecode
57 :type 'boolean) 57 :type 'boolean)
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index ef1bb115a23..4387fc625c6 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -35,7 +35,7 @@
35 35
36(defvar minibuffer-default-in-prompt-regexps 36(defvar minibuffer-default-in-prompt-regexps
37 '(("\\( (default\\>.*)\\):? \\'" . 1) ("\\( \\[.*\\]\\):? *\\'" . 1)) 37 '(("\\( (default\\>.*)\\):? \\'" . 1) ("\\( \\[.*\\]\\):? *\\'" . 1))
38 "*A list of regexps matching the parts of minibuffer prompts showing defaults. 38 "A list of regexps matching the parts of minibuffer prompts showing defaults.
39When `minibuffer-electric-default-mode' is active, these regexps are 39When `minibuffer-electric-default-mode' is active, these regexps are
40used to identify the portions of prompts to elide. 40used to identify the portions of prompts to elide.
41 41
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 17591ef12dd..7fb10505355 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -169,7 +169,7 @@ Basically, we check for existing horizontal scrolling."
169 nil)))))) 169 nil))))))
170 170
171(defvar mouse-throw-with-scroll-bar nil 171(defvar mouse-throw-with-scroll-bar nil
172 "*Set direction of mouse-throwing. 172 "Set direction of mouse-throwing.
173If nil, the text moves in the direction the mouse moves. 173If nil, the text moves in the direction the mouse moves.
174If t, the scroll bar moves in the direction the mouse moves.") 174If t, the scroll bar moves in the direction the mouse moves.")
175(defconst mouse-throw-magnifier-min -6) 175(defconst mouse-throw-magnifier-min -6)
diff --git a/lisp/msb.el b/lisp/msb.el
index 2c759b1c89d..760ff61a876 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -271,7 +271,7 @@ that differs by this value or more."
271 :group 'msb) 271 :group 'msb)
272 272
273(defvar msb-files-by-directory-sort-key 0 273(defvar msb-files-by-directory-sort-key 0
274 "*The sort key for files sorted by directory.") 274 "The sort key for files sorted by directory.")
275 275
276(defcustom msb-max-menu-items 15 276(defcustom msb-max-menu-items 15
277 "The maximum number of items in a menu. 277 "The maximum number of items in a menu.
@@ -316,7 +316,7 @@ No buffers at all if less than 1 or nil (or any non-number)."
316 :group 'msb) 316 :group 'msb)
317 317
318(defvar msb-horizontal-shift-function (lambda () 0) 318(defvar msb-horizontal-shift-function (lambda () 0)
319 "*Function that specifies how many pixels to shift the top menu leftwards.") 319 "Function that specifies how many pixels to shift the top menu leftwards.")
320 320
321(defcustom msb-display-invisible-buffers-p nil 321(defcustom msb-display-invisible-buffers-p nil
322 "Show invisible buffers or not. 322 "Show invisible buffers or not.
@@ -327,7 +327,7 @@ names that starts with a space character."
327 :group 'msb) 327 :group 'msb)
328 328
329(defvar msb-item-handling-function 'msb-item-handler 329(defvar msb-item-handling-function 'msb-item-handler
330 "*The appearance of a buffer menu. 330 "The appearance of a buffer menu.
331 331
332The default function to call for handling the appearance of a menu 332The default function to call for handling the appearance of a menu
333item. It should take two arguments, BUFFER and MAX-BUFFER-NAME-LENGTH, 333item. It should take two arguments, BUFFER and MAX-BUFFER-NAME-LENGTH,
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 2a44148e4ce..455836fdae1 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -697,11 +697,11 @@ parenthesized expressions in REGEXP for the components (in that order)."
697 697
698(defvar ange-ftp-multi-msgs 698(defvar ange-ftp-multi-msgs
699 "^150-\\|^220-\\|^230-\\|^226\\|^25.-\\|^221-\\|^200-\\|^331-\\|^4[25]1-\\|^530-" 699 "^150-\\|^220-\\|^230-\\|^226\\|^25.-\\|^221-\\|^200-\\|^331-\\|^4[25]1-\\|^530-"
700 "*Regular expression matching the start of a multiline FTP reply.") 700 "Regular expression matching the start of a multiline FTP reply.")
701 701
702(defvar ange-ftp-good-msgs 702(defvar ange-ftp-good-msgs
703 "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark" 703 "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark"
704 "*Regular expression matching FTP \"success\" messages.") 704 "Regular expression matching FTP \"success\" messages.")
705 705
706;; CMS and the odd VMS machine say 200 Port rather than 200 PORT. 706;; CMS and the odd VMS machine say 200 Port rather than 200 PORT.
707;; Also CMS machines use a multiline 550- reply to say that you 707;; Also CMS machines use a multiline 550- reply to say that you
@@ -908,7 +908,7 @@ matches the login banner."
908 (if (eq system-type 'hpux) 908 (if (eq system-type 'hpux)
909 "stty -onlcr -echo\n" 909 "stty -onlcr -echo\n"
910 "stty -echo nl\n") 910 "stty -echo nl\n")
911 "*Set up terminal after logging in to the gateway machine. 911 "Set up terminal after logging in to the gateway machine.
912This command should stop the terminal from echoing each command, and 912This command should stop the terminal from echoing each command, and
913arrange to strip out trailing ^M characters.") 913arrange to strip out trailing ^M characters.")
914 914
@@ -2098,7 +2098,7 @@ suffix of the form #PORT to specify a non-default port."
2098;; ange@hplb.hpl.hp.com says this should not be changed. 2098;; ange@hplb.hpl.hp.com says this should not be changed.
2099(defvar ange-ftp-hash-mark-msgs 2099(defvar ange-ftp-hash-mark-msgs
2100 "[hH]ash mark [^0-9]*\\([0-9]+\\)" 2100 "[hH]ash mark [^0-9]*\\([0-9]+\\)"
2101 "*Regexp matching the FTP client's output upon doing a HASH command.") 2101 "Regexp matching the FTP client's output upon doing a HASH command.")
2102 2102
2103(defun ange-ftp-guess-hash-mark-size (proc) 2103(defun ange-ftp-guess-hash-mark-size (proc)
2104 (if ange-ftp-send-hash 2104 (if ange-ftp-send-hash
@@ -6079,7 +6079,7 @@ Other orders of $ and _ seem to all work just fine.")
6079 6079
6080(defcustom ange-ftp-bs2000-additional-pubsets 6080(defcustom ange-ftp-bs2000-additional-pubsets
6081 nil 6081 nil
6082 "*List of additional pubsets available to all users." 6082 "List of additional pubsets available to all users."
6083 :group 'ange-ftp 6083 :group 'ange-ftp
6084 :type '(repeat string)) 6084 :type '(repeat string))
6085 6085
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index e5fe45b5bf0..6a9d80f9672 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -80,18 +80,18 @@
80 80
81;; I don't expect users to want fontify'ing without highlighting. 81;; I don't expect users to want fontify'ing without highlighting.
82(defcustom goto-address-fontify-p t 82(defcustom goto-address-fontify-p t
83 "*Non-nil means URLs and e-mail addresses in buffer are fontified. 83 "Non-nil means URLs and e-mail addresses in buffer are fontified.
84But only if `goto-address-highlight-p' is also non-nil." 84But only if `goto-address-highlight-p' is also non-nil."
85 :type 'boolean 85 :type 'boolean
86 :group 'goto-address) 86 :group 'goto-address)
87 87
88(defcustom goto-address-highlight-p t 88(defcustom goto-address-highlight-p t
89 "*Non-nil means URLs and e-mail addresses in buffer are highlighted." 89 "Non-nil means URLs and e-mail addresses in buffer are highlighted."
90 :type 'boolean 90 :type 'boolean
91 :group 'goto-address) 91 :group 'goto-address)
92 92
93(defcustom goto-address-fontify-maximum-size 30000 93(defcustom goto-address-fontify-maximum-size 30000
94 "*Maximum size of file in which to fontify and/or highlight URLs. 94 "Maximum size of file in which to fontify and/or highlight URLs.
95A value of t means there is no limit--fontify regardless of the size." 95A value of t means there is no limit--fontify regardless of the size."
96 :type '(choice (integer :tag "Maximum size") (const :tag "No limit" t)) 96 :type '(choice (integer :tag "Maximum size") (const :tag "No limit" t))
97 :group 'goto-address) 97 :group 'goto-address)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 6a25be73615..853839c2061 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -211,7 +211,7 @@ until a successful connection is made."
211 :type '(repeat string)) 211 :type '(repeat string))
212 212
213(defcustom imap-process-connection-type nil 213(defcustom imap-process-connection-type nil
214 "*Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL. 214 "Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL.
215The `process-connection-type' variable controls the type of device 215The `process-connection-type' variable controls the type of device
216used to communicate with subprocesses. Values are nil to use a 216used to communicate with subprocesses. Values are nil to use a
217pipe, or t or `pty' to use a pty. The value has no effect if the 217pipe, or t or `pty' to use a pty. The value has no effect if the
@@ -271,7 +271,7 @@ See also `imap-log'."
271 (symbol-name system-type)) 271 (symbol-name system-type))
272 1.0 272 1.0
273 0.1) 273 0.1)
274 "*How long to wait between checking for the end of output. 274 "How long to wait between checking for the end of output.
275Shorter values mean quicker response, but is more CPU intensive." 275Shorter values mean quicker response, but is more CPU intensive."
276 :type 'number 276 :type 'number
277 :group 'imap) 277 :group 'imap)
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 8d6aedff562..b0bfe5b271c 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -96,12 +96,12 @@
96 :prefix "quickurl-") 96 :prefix "quickurl-")
97 97
98(defcustom quickurl-url-file (convert-standard-filename "~/.quickurls") 98(defcustom quickurl-url-file (convert-standard-filename "~/.quickurls")
99 "*File that contains the URL list." 99 "File that contains the URL list."
100 :type 'file 100 :type 'file
101 :group 'quickurl) 101 :group 'quickurl)
102 102
103(defcustom quickurl-format-function (lambda (url) (format "<URL:%s>" (quickurl-url-url url))) 103(defcustom quickurl-format-function (lambda (url) (format "<URL:%s>" (quickurl-url-url url)))
104 "*Function to format the URL before insertion into the current buffer." 104 "Function to format the URL before insertion into the current buffer."
105 :type 'function 105 :type 'function
106 :group 'quickurl) 106 :group 'quickurl)
107 107
@@ -111,32 +111,32 @@
111 (string< 111 (string<
112 (downcase (quickurl-url-description x)) 112 (downcase (quickurl-url-description x))
113 (downcase (quickurl-url-description y)))))) 113 (downcase (quickurl-url-description y))))))
114 "*Function to sort the URL list." 114 "Function to sort the URL list."
115 :type 'function 115 :type 'function
116 :group 'quickurl) 116 :group 'quickurl)
117 117
118(defcustom quickurl-grab-lookup-function #'current-word 118(defcustom quickurl-grab-lookup-function #'current-word
119 "*Function to grab the thing to lookup." 119 "Function to grab the thing to lookup."
120 :type 'function 120 :type 'function
121 :group 'quickurl) 121 :group 'quickurl)
122 122
123(defcustom quickurl-assoc-function #'assoc-ignore-case 123(defcustom quickurl-assoc-function #'assoc-ignore-case
124 "*Function to use for alist lookup into `quickurl-urls'." 124 "Function to use for alist lookup into `quickurl-urls'."
125 :type 'function 125 :type 'function
126 :group 'quickurl) 126 :group 'quickurl)
127 127
128(defcustom quickurl-completion-ignore-case t 128(defcustom quickurl-completion-ignore-case t
129 "*Should `quickurl-ask' ignore case when doing the input lookup?" 129 "Should `quickurl-ask' ignore case when doing the input lookup?"
130 :type 'boolean 130 :type 'boolean
131 :group 'quickurl) 131 :group 'quickurl)
132 132
133(defcustom quickurl-prefix ";; -*- lisp -*-\n\n" 133(defcustom quickurl-prefix ";; -*- lisp -*-\n\n"
134 "*Text to write to `quickurl-url-file' before writing the URL list." 134 "Text to write to `quickurl-url-file' before writing the URL list."
135 :type 'string 135 :type 'string
136 :group 'quickurl) 136 :group 'quickurl)
137 137
138(defcustom quickurl-postfix "" 138(defcustom quickurl-postfix ""
139 "*Text to write to `quickurl-url-file' after writing the URL list. 139 "Text to write to `quickurl-url-file' after writing the URL list.
140 140
141See the constant `quickurl-reread-hook-postfix' for some example text that 141See the constant `quickurl-reread-hook-postfix' for some example text that
142could be used here." 142could be used here."
@@ -144,7 +144,7 @@ could be used here."
144 :group 'quickurl) 144 :group 'quickurl)
145 145
146(defcustom quickurl-list-mode-hook nil 146(defcustom quickurl-list-mode-hook nil
147 "*Hooks for `quickurl-list-mode'." 147 "Hooks for `quickurl-list-mode'."
148 :type 'hook 148 :type 'hook
149 :group 'quickurl) 149 :group 'quickurl)
150 150
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index d09b6aa831f..9d7e8664542 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -139,12 +139,12 @@ for connections using SSL/TLS."
139 :group 'rcirc) 139 :group 'rcirc)
140 140
141(defcustom rcirc-fill-flag t 141(defcustom rcirc-fill-flag t
142 "*Non-nil means line-wrap messages printed in channel buffers." 142 "Non-nil means line-wrap messages printed in channel buffers."
143 :type 'boolean 143 :type 'boolean
144 :group 'rcirc) 144 :group 'rcirc)
145 145
146(defcustom rcirc-fill-column nil 146(defcustom rcirc-fill-column nil
147 "*Column beyond which automatic line-wrapping should happen. 147 "Column beyond which automatic line-wrapping should happen.
148If nil, use value of `fill-column'. If 'frame-width, use the 148If nil, use value of `fill-column'. If 'frame-width, use the
149maximum frame width." 149maximum frame width."
150 :type '(choice (const :tag "Value of `fill-column'") 150 :type '(choice (const :tag "Value of `fill-column'")
@@ -153,7 +153,7 @@ maximum frame width."
153 :group 'rcirc) 153 :group 'rcirc)
154 154
155(defcustom rcirc-fill-prefix nil 155(defcustom rcirc-fill-prefix nil
156 "*Text to insert before filled lines. 156 "Text to insert before filled lines.
157If nil, calculate the prefix dynamically to line up text 157If nil, calculate the prefix dynamically to line up text
158underneath each nick." 158underneath each nick."
159 :type '(choice (const :tag "Dynamic" nil) 159 :type '(choice (const :tag "Dynamic" nil)
@@ -174,23 +174,23 @@ Use the command `rcirc-omit-mode' to change this variable.")
174(make-variable-buffer-local 'rcirc-omit-mode) 174(make-variable-buffer-local 'rcirc-omit-mode)
175 175
176(defcustom rcirc-time-format "%H:%M " 176(defcustom rcirc-time-format "%H:%M "
177 "*Describes how timestamps are printed. 177 "Describes how timestamps are printed.
178Used as the first arg to `format-time-string'." 178Used as the first arg to `format-time-string'."
179 :type 'string 179 :type 'string
180 :group 'rcirc) 180 :group 'rcirc)
181 181
182(defcustom rcirc-input-ring-size 1024 182(defcustom rcirc-input-ring-size 1024
183 "*Size of input history ring." 183 "Size of input history ring."
184 :type 'integer 184 :type 'integer
185 :group 'rcirc) 185 :group 'rcirc)
186 186
187(defcustom rcirc-read-only-flag t 187(defcustom rcirc-read-only-flag t
188 "*Non-nil means make text in IRC buffers read-only." 188 "Non-nil means make text in IRC buffers read-only."
189 :type 'boolean 189 :type 'boolean
190 :group 'rcirc) 190 :group 'rcirc)
191 191
192(defcustom rcirc-buffer-maximum-lines nil 192(defcustom rcirc-buffer-maximum-lines nil
193 "*The maximum size in lines for rcirc buffers. 193 "The maximum size in lines for rcirc buffers.
194Channel buffers are truncated from the top to be no greater than this 194Channel buffers are truncated from the top to be no greater than this
195number. If zero or nil, no truncating is done." 195number. If zero or nil, no truncating is done."
196 :type '(choice (const :tag "No truncation" nil) 196 :type '(choice (const :tag "No truncation" nil)
@@ -198,7 +198,7 @@ number. If zero or nil, no truncating is done."
198 :group 'rcirc) 198 :group 'rcirc)
199 199
200(defcustom rcirc-scroll-show-maximum-output t 200(defcustom rcirc-scroll-show-maximum-output t
201 "*If non-nil, scroll buffer to keep the point at the bottom of 201 "If non-nil, scroll buffer to keep the point at the bottom of
202the window." 202the window."
203 :type 'boolean 203 :type 'boolean
204 :group 'rcirc) 204 :group 'rcirc)
@@ -244,13 +244,13 @@ Examples:
244 :group 'rcirc) 244 :group 'rcirc)
245 245
246(defcustom rcirc-auto-authenticate-flag t 246(defcustom rcirc-auto-authenticate-flag t
247 "*Non-nil means automatically send authentication string to server. 247 "Non-nil means automatically send authentication string to server.
248See also `rcirc-authinfo'." 248See also `rcirc-authinfo'."
249 :type 'boolean 249 :type 'boolean
250 :group 'rcirc) 250 :group 'rcirc)
251 251
252(defcustom rcirc-authenticate-before-join t 252(defcustom rcirc-authenticate-before-join t
253 "*Non-nil means authenticate to services before joining channels. 253 "Non-nil means authenticate to services before joining channels.
254Currently only works with NickServ on some networks." 254Currently only works with NickServ on some networks."
255 :version "24.1" 255 :version "24.1"
256 :type 'boolean 256 :type 'boolean
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 42b6f482665..d3e5759d2fb 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -141,10 +141,10 @@ This is used during Tempo template completion."
141 :group 'snmp) 141 :group 'snmp)
142 142
143(defvar snmp-tempo-tags nil 143(defvar snmp-tempo-tags nil
144 "*Tempo tags for SNMP mode.") 144 "Tempo tags for SNMP mode.")
145 145
146(defvar snmpv2-tempo-tags nil 146(defvar snmpv2-tempo-tags nil
147 "*Tempo tags for SNMPv2 mode.") 147 "Tempo tags for SNMPv2 mode.")
148 148
149 149
150;; Enable fontification for SNMP MIBs 150;; Enable fontification for SNMP MIBs
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 3c94e7d1b22..306376f8af2 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -343,7 +343,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
343;; could get a wrapper hook, or defer to open-network-stream-function. 343;; could get a wrapper hook, or defer to open-network-stream-function.
344 344
345(defvar socks-override-functions nil 345(defvar socks-override-functions nil
346 "*Whether to overwrite the open-network-stream function with the SOCKSified 346 "Whether to overwrite the open-network-stream function with the SOCKSified
347version.") 347version.")
348 348
349(require 'network-stream) 349(require 'network-stream)
@@ -480,7 +480,7 @@ version.")
480 480
481;; Replacement functions for open-network-stream, etc. 481;; Replacement functions for open-network-stream, etc.
482(defvar socks-noproxy nil 482(defvar socks-noproxy nil
483 "*List of regexps matching hosts that we should not socksify connections to") 483 "List of regexps matching hosts that we should not socksify connections to")
484 484
485(defun socks-find-route (host service) 485(defun socks-find-route (host service)
486 (let ((route socks-server) 486 (let ((route socks-server)
@@ -626,7 +626,7 @@ version.")
626 626
627 627
628(defcustom socks-nslookup-program "nslookup" 628(defcustom socks-nslookup-program "nslookup"
629 "*If non-NIL then a string naming the nslookup program." 629 "If non-NIL then a string naming the nslookup program."
630 :type '(choice (const :tag "None" :value nil) string) 630 :type '(choice (const :tag "None" :value nil) string)
631 :group 'socks) 631 :group 'socks)
632 632
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 4b5b08cf7e1..73bc6878115 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -99,7 +99,7 @@ present for backward compatibility."
99;; Define FTP method ... 99;; Define FTP method ...
100;;;###tramp-autoload 100;;;###tramp-autoload
101(defconst tramp-ftp-method "ftp" 101(defconst tramp-ftp-method "ftp"
102 "*When this method name is used, forward all calls to Ange-FTP.") 102 "When this method name is used, forward all calls to Ange-FTP.")
103 103
104;; ... and add it to the method list. 104;; ... and add it to the method list.
105;;;###tramp-autoload 105;;;###tramp-autoload
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 6f3c5e04236..983b29dcb5e 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -111,7 +111,7 @@
111 111
112;;;###tramp-autoload 112;;;###tramp-autoload
113(defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce") 113(defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce")
114 "*List of methods for remote files, accessed with GVFS." 114 "List of methods for remote files, accessed with GVFS."
115 :group 'tramp 115 :group 'tramp
116 :version "23.2" 116 :version "23.2"
117 :type '(repeat (choice (const "dav") 117 :type '(repeat (choice (const "dav")
@@ -128,7 +128,7 @@
128(add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil)) 128(add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil))
129 129
130(defcustom tramp-gvfs-zeroconf-domain "local" 130(defcustom tramp-gvfs-zeroconf-domain "local"
131 "*Zeroconf domain to be used for discovering services, like host names." 131 "Zeroconf domain to be used for discovering services, like host names."
132 :group 'tramp 132 :group 'tramp
133 :version "23.2" 133 :version "23.2"
134 :type 'string) 134 :type 'string)
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el
index de42c402a63..328d094dfa4 100644
--- a/lisp/net/tramp-gw.el
+++ b/lisp/net/tramp-gw.el
@@ -50,20 +50,20 @@
50;; Define HTTP tunnel method ... 50;; Define HTTP tunnel method ...
51;;;###tramp-autoload 51;;;###tramp-autoload
52(defconst tramp-gw-tunnel-method "tunnel" 52(defconst tramp-gw-tunnel-method "tunnel"
53 "*Method to connect HTTP gateways.") 53 "Method to connect HTTP gateways.")
54 54
55;; ... and port. 55;; ... and port.
56(defconst tramp-gw-default-tunnel-port 8080 56(defconst tramp-gw-default-tunnel-port 8080
57 "*Default port for HTTP gateways.") 57 "Default port for HTTP gateways.")
58 58
59;; Define SOCKS method ... 59;; Define SOCKS method ...
60;;;###tramp-autoload 60;;;###tramp-autoload
61(defconst tramp-gw-socks-method "socks" 61(defconst tramp-gw-socks-method "socks"
62 "*Method to connect SOCKS servers.") 62 "Method to connect SOCKS servers.")
63 63
64;; ... and port. 64;; ... and port.
65(defconst tramp-gw-default-socks-port 1080 65(defconst tramp-gw-default-socks-port 1080
66 "*Default port for SOCKS servers.") 66 "Default port for SOCKS servers.")
67 67
68;; Autoload the socks library. It is used only when we access a SOCKS server. 68;; Autoload the socks library. It is used only when we access a SOCKS server.
69(autoload 'socks-open-network-stream "socks") 69(autoload 'socks-open-network-stream "socks")
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 1c23a6f20f3..b3a5341b3a6 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -43,7 +43,7 @@
43;; `dired-insert-set-properties'. 43;; `dired-insert-set-properties'.
44 44
45(defcustom tramp-inline-compress-start-size 4096 45(defcustom tramp-inline-compress-start-size 4096
46 "*The minimum size of compressing where inline transfer. 46 "The minimum size of compressing where inline transfer.
47When inline transfer, compress transferred data of file 47When inline transfer, compress transferred data of file
48whose size is this value or above (up to `tramp-copy-size-limit'). 48whose size is this value or above (up to `tramp-copy-size-limit').
49If it is nil, no compression at all will be applied." 49If it is nil, no compression at all will be applied."
@@ -51,14 +51,14 @@ If it is nil, no compression at all will be applied."
51 :type '(choice (const nil) integer)) 51 :type '(choice (const nil) integer))
52 52
53(defcustom tramp-copy-size-limit 10240 53(defcustom tramp-copy-size-limit 10240
54 "*The maximum file size where inline copying is preferred over an out-of-the-band copy. 54 "The maximum file size where inline copying is preferred over an out-of-the-band copy.
55If it is nil, inline out-of-the-band copy will be used without a check." 55If it is nil, inline out-of-the-band copy will be used without a check."
56 :group 'tramp 56 :group 'tramp
57 :type '(choice (const nil) integer)) 57 :type '(choice (const nil) integer))
58 58
59;;;###tramp-autoload 59;;;###tramp-autoload
60(defcustom tramp-terminal-type "dumb" 60(defcustom tramp-terminal-type "dumb"
61 "*Value of TERM environment variable for logging in to remote host. 61 "Value of TERM environment variable for logging in to remote host.
62Because Tramp wants to parse the output of the remote shell, it is easily 62Because Tramp wants to parse the output of the remote shell, it is easily
63confused by ANSI color escape sequences and suchlike. Often, shell init 63confused by ANSI color escape sequences and suchlike. Often, shell init
64files conditionalize this setup based on the TERM environment variable." 64files conditionalize this setup based on the TERM environment variable."
@@ -516,7 +516,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
516 '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin" 516 '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin"
517 "/local/bin" "/local/freeware/bin" "/local/gnu/bin" 517 "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
518 "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin") 518 "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin")
519 "*List of directories to search for executables on remote host. 519 "List of directories to search for executables on remote host.
520For every remote host, this variable will be set buffer local, 520For every remote host, this variable will be set buffer local,
521keeping the list of existing directories on that host. 521keeping the list of existing directories on that host.
522 522
@@ -546,7 +546,7 @@ as given in your `~/.profile'."
546 "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" 546 "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\""
547 "autocorrect=" "correct=") 547 "autocorrect=" "correct=")
548 548
549 "*List of environment variables to be set on the remote host. 549 "List of environment variables to be set on the remote host.
550 550
551Each element should be a string of the form ENVVARNAME=VALUE. An 551Each element should be a string of the form ENVVARNAME=VALUE. An
552entry ENVVARNAME= disables the corresponding environment variable, 552entry ENVVARNAME= disables the corresponding environment variable,
@@ -558,7 +558,7 @@ not be set here. Instead, it should be set via `tramp-remote-path'."
558 :type '(repeat string)) 558 :type '(repeat string))
559 559
560(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) 560(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
561 "*Alist specifying extra arguments to pass to the remote shell. 561 "Alist specifying extra arguments to pass to the remote shell.
562Entries are (REGEXP . ARGS) where REGEXP is a regular expression 562Entries are (REGEXP . ARGS) where REGEXP is a regular expression
563matching the shell file name and ARGS is a string specifying the 563matching the shell file name and ARGS is a string specifying the
564arguments. 564arguments.
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index d3f0d8afb12..f1535ae64c0 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -33,7 +33,7 @@
33;; Define SMB method ... 33;; Define SMB method ...
34;;;###tramp-autoload 34;;;###tramp-autoload
35(defconst tramp-smb-method "smb" 35(defconst tramp-smb-method "smb"
36 "*Method to connect SAMBA and M$ SMB servers.") 36 "Method to connect SAMBA and M$ SMB servers.")
37 37
38;; ... and add it to the method list. 38;; ... and add it to the method list.
39;;;###tramp-autoload 39;;;###tramp-autoload
@@ -68,19 +68,19 @@
68 '((tramp-parse-netrc "~/.netrc")))) 68 '((tramp-parse-netrc "~/.netrc"))))
69 69
70(defcustom tramp-smb-program "smbclient" 70(defcustom tramp-smb-program "smbclient"
71 "*Name of SMB client to run." 71 "Name of SMB client to run."
72 :group 'tramp 72 :group 'tramp
73 :type 'string) 73 :type 'string)
74 74
75(defcustom tramp-smb-conf "/dev/null" 75(defcustom tramp-smb-conf "/dev/null"
76 "*Path of the smb.conf file. 76 "Path of the smb.conf file.
77If it is nil, no smb.conf will be added to the `tramp-smb-program' 77If it is nil, no smb.conf will be added to the `tramp-smb-program'
78call, letting the SMB client use the default one." 78call, letting the SMB client use the default one."
79 :group 'tramp 79 :group 'tramp
80 :type '(choice (const nil) (file :must-match t))) 80 :type '(choice (const nil) (file :must-match t)))
81 81
82(defvar tramp-smb-version nil 82(defvar tramp-smb-version nil
83 "*Version string of the SMB client.") 83 "Version string of the SMB client.")
84 84
85(defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$" 85(defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$"
86 "Regexp used as prompt in smbclient.") 86 "Regexp used as prompt in smbclient.")
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c092202b10a..5b4ea1e6f17 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -70,13 +70,13 @@
70;; Maybe we need once a real Tramp mode, with key bindings etc. 70;; Maybe we need once a real Tramp mode, with key bindings etc.
71;;;###autoload 71;;;###autoload
72(defcustom tramp-mode t 72(defcustom tramp-mode t
73 "*Whether Tramp is enabled. 73 "Whether Tramp is enabled.
74If it is set to nil, all remote file names are used literally." 74If it is set to nil, all remote file names are used literally."
75 :group 'tramp 75 :group 'tramp
76 :type 'boolean) 76 :type 'boolean)
77 77
78(defcustom tramp-verbose 3 78(defcustom tramp-verbose 3
79 "*Verbosity level for Tramp messages. 79 "Verbosity level for Tramp messages.
80Any level x includes messages for all levels 1 .. x-1. The levels are 80Any level x includes messages for all levels 1 .. x-1. The levels are
81 81
82 0 silent (no tramp messages at all) 82 0 silent (no tramp messages at all)
@@ -137,7 +137,7 @@ policy for local files."
137 :group 'tramp))) 137 :group 'tramp)))
138 138
139(defcustom tramp-auto-save-directory nil 139(defcustom tramp-auto-save-directory nil
140 "*Put auto-save files in this directory, if set. 140 "Put auto-save files in this directory, if set.
141The idea is to use a local directory so that auto-saving is faster." 141The idea is to use a local directory so that auto-saving is faster."
142 :group 'tramp 142 :group 'tramp
143 :type '(choice (const nil) string)) 143 :type '(choice (const nil) string))
@@ -146,7 +146,7 @@ The idea is to use a local directory so that auto-saving is faster."
146 (if (memq system-type '(windows-nt)) 146 (if (memq system-type '(windows-nt))
147 (getenv "COMSPEC") 147 (getenv "COMSPEC")
148 "/bin/sh") 148 "/bin/sh")
149 "*Use this program for encoding and decoding commands on the local host. 149 "Use this program for encoding and decoding commands on the local host.
150This shell is used to execute the encoding and decoding command on the 150This shell is used to execute the encoding and decoding command on the
151local host, so if you want to use `~' in those commands, you should 151local host, so if you want to use `~' in those commands, you should
152choose a shell here which groks tilde expansion. `/bin/sh' normally 152choose a shell here which groks tilde expansion. `/bin/sh' normally
@@ -172,14 +172,14 @@ use for the remote host."
172 (if (string-match "cmd\\.exe" tramp-encoding-shell) 172 (if (string-match "cmd\\.exe" tramp-encoding-shell)
173 "/c" 173 "/c"
174 "-c") 174 "-c")
175 "*Use this switch together with `tramp-encoding-shell' for local commands. 175 "Use this switch together with `tramp-encoding-shell' for local commands.
176See the variable `tramp-encoding-shell' for more information." 176See the variable `tramp-encoding-shell' for more information."
177 :group 'tramp 177 :group 'tramp
178 :type 'string) 178 :type 'string)
179 179
180(defcustom tramp-encoding-command-interactive 180(defcustom tramp-encoding-command-interactive
181 (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i") 181 (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i")
182 "*Use this switch together with `tramp-encoding-shell' for interactive shells. 182 "Use this switch together with `tramp-encoding-shell' for interactive shells.
183See the variable `tramp-encoding-shell' for more information." 183See the variable `tramp-encoding-shell' for more information."
184 :version "24.1" 184 :version "24.1"
185 :group 'tramp 185 :group 'tramp
@@ -187,7 +187,7 @@ See the variable `tramp-encoding-shell' for more information."
187 187
188;;;###tramp-autoload 188;;;###tramp-autoload
189(defvar tramp-methods nil 189(defvar tramp-methods nil
190 "*Alist of methods for remote files. 190 "Alist of methods for remote files.
191This is a list of entries of the form (NAME PARAM1 PARAM2 ...). 191This is a list of entries of the form (NAME PARAM1 PARAM2 ...).
192Each NAME stands for a remote access method. Each PARAM is a 192Each NAME stands for a remote access method. Each PARAM is a
193pair of the form (KEY VALUE). The following KEYs are defined: 193pair of the form (KEY VALUE). The following KEYs are defined:
@@ -334,7 +334,7 @@ shouldn't return t when it isn't."
334 (t "ssh"))) 334 (t "ssh")))
335 ;; Fallback. 335 ;; Fallback.
336 (t "ftp")) 336 (t "ftp"))
337 "*Default method to use for transferring files. 337 "Default method to use for transferring files.
338See `tramp-methods' for possibilities. 338See `tramp-methods' for possibilities.
339Also see `tramp-default-method-alist'." 339Also see `tramp-default-method-alist'."
340 :group 'tramp 340 :group 'tramp
@@ -342,7 +342,7 @@ Also see `tramp-default-method-alist'."
342 342
343;;;###tramp-autoload 343;;;###tramp-autoload
344(defcustom tramp-default-method-alist nil 344(defcustom tramp-default-method-alist nil
345 "*Default method to use for specific host/user pairs. 345 "Default method to use for specific host/user pairs.
346This is an alist of items (HOST USER METHOD). The first matching item 346This is an alist of items (HOST USER METHOD). The first matching item
347specifies the method to use for a file name which does not specify a 347specifies the method to use for a file name which does not specify a
348method. HOST and USER are regular expressions or nil, which is 348method. HOST and USER are regular expressions or nil, which is
@@ -359,7 +359,7 @@ See `tramp-methods' for a list of possibilities for METHOD."
359 (choice :tag "Method name" string (const nil))))) 359 (choice :tag "Method name" string (const nil)))))
360 360
361(defcustom tramp-default-user nil 361(defcustom tramp-default-user nil
362 "*Default user to use for transferring files. 362 "Default user to use for transferring files.
363It is nil by default; otherwise settings in configuration files like 363It is nil by default; otherwise settings in configuration files like
364\"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'. 364\"~/.ssh/config\" would be overwritten. Also see `tramp-default-user-alist'.
365 365
@@ -369,7 +369,7 @@ This variable is regarded as obsolete, and will be removed soon."
369 369
370;;;###tramp-autoload 370;;;###tramp-autoload
371(defcustom tramp-default-user-alist nil 371(defcustom tramp-default-user-alist nil
372 "*Default user to use for specific method/host pairs. 372 "Default user to use for specific method/host pairs.
373This is an alist of items (METHOD HOST USER). The first matching item 373This is an alist of items (METHOD HOST USER). The first matching item
374specifies the user to use for a file name which does not specify a 374specifies the user to use for a file name which does not specify a
375user. METHOD and USER are regular expressions or nil, which is 375user. METHOD and USER are regular expressions or nil, which is
@@ -384,13 +384,13 @@ empty string for the method name."
384 (choice :tag " User name" string (const nil))))) 384 (choice :tag " User name" string (const nil)))))
385 385
386(defcustom tramp-default-host (system-name) 386(defcustom tramp-default-host (system-name)
387 "*Default host to use for transferring files. 387 "Default host to use for transferring files.
388Useful for su and sudo methods mostly." 388Useful for su and sudo methods mostly."
389 :group 'tramp 389 :group 'tramp
390 :type 'string) 390 :type 'string)
391 391
392(defcustom tramp-default-proxies-alist nil 392(defcustom tramp-default-proxies-alist nil
393 "*Route to be followed for specific host/user pairs. 393 "Route to be followed for specific host/user pairs.
394This is an alist of items (HOST USER PROXY). The first matching 394This is an alist of items (HOST USER PROXY). The first matching
395item specifies the proxy to be passed for a file name located on 395item specifies the proxy to be passed for a file name located on
396a remote target matching USER@HOST. HOST and USER are regular 396a remote target matching USER@HOST. HOST and USER are regular
@@ -415,10 +415,10 @@ interpreted as a regular expression which always matches."
415 (regexp-opt 415 (regexp-opt
416 (list "localhost" "localhost6" (system-name) "127\.0\.0\.1" "::1") t) 416 (list "localhost" "localhost6" (system-name) "127\.0\.0\.1" "::1") t)
417 "\\'") 417 "\\'")
418 "*Host names which are regarded as local host.") 418 "Host names which are regarded as local host.")
419 419
420(defvar tramp-completion-function-alist nil 420(defvar tramp-completion-function-alist nil
421 "*Alist of methods for remote files. 421 "Alist of methods for remote files.
422This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\). 422This is a list of entries of the form \(NAME PAIR1 PAIR2 ...\).
423Each NAME stands for a remote access method. Each PAIR is of the form 423Each NAME stands for a remote access method. Each PAIR is of the form
424\(FUNCTION FILE\). FUNCTION is responsible to extract user names and host 424\(FUNCTION FILE\). FUNCTION is responsible to extract user names and host
@@ -463,13 +463,13 @@ the remote shell.")
463 463
464(defcustom tramp-local-end-of-line 464(defcustom tramp-local-end-of-line
465 (if (memq system-type '(windows-nt)) "\r\n" "\n") 465 (if (memq system-type '(windows-nt)) "\r\n" "\n")
466 "*String used for end of line in local processes." 466 "String used for end of line in local processes."
467 :version "24.1" 467 :version "24.1"
468 :group 'tramp 468 :group 'tramp
469 :type 'string) 469 :type 'string)
470 470
471(defcustom tramp-rsh-end-of-line "\n" 471(defcustom tramp-rsh-end-of-line "\n"
472 "*String used for end of line in rsh connections. 472 "String used for end of line in rsh connections.
473I don't think this ever needs to be changed, so please tell me about it 473I don't think this ever needs to be changed, so please tell me about it
474if you need to change this. 474if you need to change this.
475Also see the method parameter `tramp-password-end-of-line' and the normal 475Also see the method parameter `tramp-password-end-of-line' and the normal
@@ -479,7 +479,7 @@ variable `tramp-default-password-end-of-line'."
479 479
480(defcustom tramp-default-password-end-of-line 480(defcustom tramp-default-password-end-of-line
481 tramp-rsh-end-of-line 481 tramp-rsh-end-of-line
482 "*String used for end of line after sending a password. 482 "String used for end of line after sending a password.
483This variable provides the default value for the method parameter 483This variable provides the default value for the method parameter
484`tramp-password-end-of-line', see `tramp-methods' for more details. 484`tramp-password-end-of-line', see `tramp-methods' for more details.
485 485
@@ -494,7 +494,7 @@ The default value is to use the same value as `tramp-rsh-end-of-line'."
494 494
495(defcustom tramp-login-prompt-regexp 495(defcustom tramp-login-prompt-regexp
496 ".*ogin\\( .*\\)?: *" 496 ".*ogin\\( .*\\)?: *"
497 "*Regexp matching login-like prompts. 497 "Regexp matching login-like prompts.
498The regexp should match at end of buffer. 498The regexp should match at end of buffer.
499 499
500Sometimes the prompt is reported to look like \"login as:\"." 500Sometimes the prompt is reported to look like \"login as:\"."
@@ -523,7 +523,7 @@ This regexp must match both `tramp-initial-end-of-output' and
523 523
524(defcustom tramp-password-prompt-regexp 524(defcustom tramp-password-prompt-regexp
525 "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *" 525 "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *"
526 "*Regexp matching password-like prompts. 526 "Regexp matching password-like prompts.
527The regexp should match at end of buffer. 527The regexp should match at end of buffer.
528 528
529The `sudo' program appears to insert a `^@' character into the prompt." 529The `sudo' program appears to insert a `^@' character into the prompt."
@@ -549,7 +549,7 @@ The `sudo' program appears to insert a `^@' character into the prompt."
549 ;; Here comes a list of regexes, separated by \\| 549 ;; Here comes a list of regexes, separated by \\|
550 "Received signal [0-9]+" 550 "Received signal [0-9]+"
551 "\\).*") 551 "\\).*")
552 "*Regexp matching a `login failed' message. 552 "Regexp matching a `login failed' message.
553The regexp should match at end of buffer." 553The regexp should match at end of buffer."
554 :group 'tramp 554 :group 'tramp
555 :type 'regexp) 555 :type 'regexp)
@@ -620,7 +620,7 @@ The answer will be provided by `tramp-action-process-alive',
620 :type 'regexp) 620 :type 'regexp)
621 621
622(defconst tramp-temp-name-prefix "tramp." 622(defconst tramp-temp-name-prefix "tramp."
623 "*Prefix to use for temporary files. 623 "Prefix to use for temporary files.
624If this is a relative file name (such as \"tramp.\"), it is considered 624If this is a relative file name (such as \"tramp.\"), it is considered
625relative to the directory name returned by the function 625relative to the directory name returned by the function
626`tramp-compat-temporary-file-directory' (which see). It may also be an 626`tramp-compat-temporary-file-directory' (which see). It may also be an
@@ -670,76 +670,76 @@ It can have the following values:
670 ((equal tramp-syntax 'sep) "/[") 670 ((equal tramp-syntax 'sep) "/[")
671 ((equal tramp-syntax 'url) "/") 671 ((equal tramp-syntax 'url) "/")
672 (t (error "Wrong `tramp-syntax' defined"))) 672 (t (error "Wrong `tramp-syntax' defined")))
673 "*String matching the very beginning of Tramp file names. 673 "String matching the very beginning of Tramp file names.
674Used in `tramp-make-tramp-file-name'.") 674Used in `tramp-make-tramp-file-name'.")
675 675
676(defconst tramp-prefix-regexp 676(defconst tramp-prefix-regexp
677 (concat "^" (regexp-quote tramp-prefix-format)) 677 (concat "^" (regexp-quote tramp-prefix-format))
678 "*Regexp matching the very beginning of Tramp file names. 678 "Regexp matching the very beginning of Tramp file names.
679Should always start with \"^\". Derived from `tramp-prefix-format'.") 679Should always start with \"^\". Derived from `tramp-prefix-format'.")
680 680
681(defconst tramp-method-regexp 681(defconst tramp-method-regexp
682 "[a-zA-Z_0-9-]+" 682 "[a-zA-Z_0-9-]+"
683 "*Regexp matching methods identifiers.") 683 "Regexp matching methods identifiers.")
684 684
685(defconst tramp-postfix-method-format 685(defconst tramp-postfix-method-format
686 (cond ((equal tramp-syntax 'ftp) ":") 686 (cond ((equal tramp-syntax 'ftp) ":")
687 ((equal tramp-syntax 'sep) "/") 687 ((equal tramp-syntax 'sep) "/")
688 ((equal tramp-syntax 'url) "://") 688 ((equal tramp-syntax 'url) "://")
689 (t (error "Wrong `tramp-syntax' defined"))) 689 (t (error "Wrong `tramp-syntax' defined")))
690 "*String matching delimiter between method and user or host names. 690 "String matching delimiter between method and user or host names.
691Used in `tramp-make-tramp-file-name'.") 691Used in `tramp-make-tramp-file-name'.")
692 692
693(defconst tramp-postfix-method-regexp 693(defconst tramp-postfix-method-regexp
694 (regexp-quote tramp-postfix-method-format) 694 (regexp-quote tramp-postfix-method-format)
695 "*Regexp matching delimiter between method and user or host names. 695 "Regexp matching delimiter between method and user or host names.
696Derived from `tramp-postfix-method-format'.") 696Derived from `tramp-postfix-method-format'.")
697 697
698(defconst tramp-user-regexp "[^:/ \t]+" 698(defconst tramp-user-regexp "[^:/ \t]+"
699 "*Regexp matching user names.") 699 "Regexp matching user names.")
700 700
701;;;###tramp-autoload 701;;;###tramp-autoload
702(defconst tramp-prefix-domain-format "%" 702(defconst tramp-prefix-domain-format "%"
703 "*String matching delimiter between user and domain names.") 703 "String matching delimiter between user and domain names.")
704 704
705;;;###tramp-autoload 705;;;###tramp-autoload
706(defconst tramp-prefix-domain-regexp 706(defconst tramp-prefix-domain-regexp
707 (regexp-quote tramp-prefix-domain-format) 707 (regexp-quote tramp-prefix-domain-format)
708 "*Regexp matching delimiter between user and domain names. 708 "Regexp matching delimiter between user and domain names.
709Derived from `tramp-prefix-domain-format'.") 709Derived from `tramp-prefix-domain-format'.")
710 710
711(defconst tramp-domain-regexp "[-a-zA-Z0-9_.]+" 711(defconst tramp-domain-regexp "[-a-zA-Z0-9_.]+"
712 "*Regexp matching domain names.") 712 "Regexp matching domain names.")
713 713
714(defconst tramp-user-with-domain-regexp 714(defconst tramp-user-with-domain-regexp
715 (concat "\\(" tramp-user-regexp "\\)" 715 (concat "\\(" tramp-user-regexp "\\)"
716 tramp-prefix-domain-regexp 716 tramp-prefix-domain-regexp
717 "\\(" tramp-domain-regexp "\\)") 717 "\\(" tramp-domain-regexp "\\)")
718 "*Regexp matching user names with domain names.") 718 "Regexp matching user names with domain names.")
719 719
720(defconst tramp-postfix-user-format "@" 720(defconst tramp-postfix-user-format "@"
721 "*String matching delimiter between user and host names. 721 "String matching delimiter between user and host names.
722Used in `tramp-make-tramp-file-name'.") 722Used in `tramp-make-tramp-file-name'.")
723 723
724(defconst tramp-postfix-user-regexp 724(defconst tramp-postfix-user-regexp
725 (regexp-quote tramp-postfix-user-format) 725 (regexp-quote tramp-postfix-user-format)
726 "*Regexp matching delimiter between user and host names. 726 "Regexp matching delimiter between user and host names.
727Derived from `tramp-postfix-user-format'.") 727Derived from `tramp-postfix-user-format'.")
728 728
729(defconst tramp-host-regexp "[a-zA-Z0-9_.-]+" 729(defconst tramp-host-regexp "[a-zA-Z0-9_.-]+"
730 "*Regexp matching host names.") 730 "Regexp matching host names.")
731 731
732(defconst tramp-prefix-ipv6-format 732(defconst tramp-prefix-ipv6-format
733 (cond ((equal tramp-syntax 'ftp) "[") 733 (cond ((equal tramp-syntax 'ftp) "[")
734 ((equal tramp-syntax 'sep) "") 734 ((equal tramp-syntax 'sep) "")
735 ((equal tramp-syntax 'url) "[") 735 ((equal tramp-syntax 'url) "[")
736 (t (error "Wrong `tramp-syntax' defined"))) 736 (t (error "Wrong `tramp-syntax' defined")))
737 "*String matching left hand side of IPv6 addresses. 737 "String matching left hand side of IPv6 addresses.
738Used in `tramp-make-tramp-file-name'.") 738Used in `tramp-make-tramp-file-name'.")
739 739
740(defconst tramp-prefix-ipv6-regexp 740(defconst tramp-prefix-ipv6-regexp
741 (regexp-quote tramp-prefix-ipv6-format) 741 (regexp-quote tramp-prefix-ipv6-format)
742 "*Regexp matching left hand side of IPv6 addresses. 742 "Regexp matching left hand side of IPv6 addresses.
743Derived from `tramp-prefix-ipv6-format'.") 743Derived from `tramp-prefix-ipv6-format'.")
744 744
745;; The following regexp is a bit sloppy. But it shall serve our 745;; The following regexp is a bit sloppy. But it shall serve our
@@ -747,19 +747,19 @@ Derived from `tramp-prefix-ipv6-format'.")
747;; "::ffff:192.168.0.1". 747;; "::ffff:192.168.0.1".
748(defconst tramp-ipv6-regexp 748(defconst tramp-ipv6-regexp
749 "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+" 749 "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+"
750 "*Regexp matching IPv6 addresses.") 750 "Regexp matching IPv6 addresses.")
751 751
752(defconst tramp-postfix-ipv6-format 752(defconst tramp-postfix-ipv6-format
753 (cond ((equal tramp-syntax 'ftp) "]") 753 (cond ((equal tramp-syntax 'ftp) "]")
754 ((equal tramp-syntax 'sep) "") 754 ((equal tramp-syntax 'sep) "")
755 ((equal tramp-syntax 'url) "]") 755 ((equal tramp-syntax 'url) "]")
756 (t (error "Wrong `tramp-syntax' defined"))) 756 (t (error "Wrong `tramp-syntax' defined")))
757 "*String matching right hand side of IPv6 addresses. 757 "String matching right hand side of IPv6 addresses.
758Used in `tramp-make-tramp-file-name'.") 758Used in `tramp-make-tramp-file-name'.")
759 759
760(defconst tramp-postfix-ipv6-regexp 760(defconst tramp-postfix-ipv6-regexp
761 (regexp-quote tramp-postfix-ipv6-format) 761 (regexp-quote tramp-postfix-ipv6-format)
762 "*Regexp matching right hand side of IPv6 addresses. 762 "Regexp matching right hand side of IPv6 addresses.
763Derived from `tramp-postfix-ipv6-format'.") 763Derived from `tramp-postfix-ipv6-format'.")
764 764
765(defconst tramp-prefix-port-format 765(defconst tramp-prefix-port-format
@@ -767,37 +767,37 @@ Derived from `tramp-postfix-ipv6-format'.")
767 ((equal tramp-syntax 'sep) "#") 767 ((equal tramp-syntax 'sep) "#")
768 ((equal tramp-syntax 'url) ":") 768 ((equal tramp-syntax 'url) ":")
769 (t (error "Wrong `tramp-syntax' defined"))) 769 (t (error "Wrong `tramp-syntax' defined")))
770 "*String matching delimiter between host names and port numbers.") 770 "String matching delimiter between host names and port numbers.")
771 771
772(defconst tramp-prefix-port-regexp 772(defconst tramp-prefix-port-regexp
773 (regexp-quote tramp-prefix-port-format) 773 (regexp-quote tramp-prefix-port-format)
774 "*Regexp matching delimiter between host names and port numbers. 774 "Regexp matching delimiter between host names and port numbers.
775Derived from `tramp-prefix-port-format'.") 775Derived from `tramp-prefix-port-format'.")
776 776
777(defconst tramp-port-regexp "[0-9]+" 777(defconst tramp-port-regexp "[0-9]+"
778 "*Regexp matching port numbers.") 778 "Regexp matching port numbers.")
779 779
780(defconst tramp-host-with-port-regexp 780(defconst tramp-host-with-port-regexp
781 (concat "\\(" tramp-host-regexp "\\)" 781 (concat "\\(" tramp-host-regexp "\\)"
782 tramp-prefix-port-regexp 782 tramp-prefix-port-regexp
783 "\\(" tramp-port-regexp "\\)") 783 "\\(" tramp-port-regexp "\\)")
784 "*Regexp matching host names with port numbers.") 784 "Regexp matching host names with port numbers.")
785 785
786(defconst tramp-postfix-host-format 786(defconst tramp-postfix-host-format
787 (cond ((equal tramp-syntax 'ftp) ":") 787 (cond ((equal tramp-syntax 'ftp) ":")
788 ((equal tramp-syntax 'sep) "]") 788 ((equal tramp-syntax 'sep) "]")
789 ((equal tramp-syntax 'url) "") 789 ((equal tramp-syntax 'url) "")
790 (t (error "Wrong `tramp-syntax' defined"))) 790 (t (error "Wrong `tramp-syntax' defined")))
791 "*String matching delimiter between host names and localnames. 791 "String matching delimiter between host names and localnames.
792Used in `tramp-make-tramp-file-name'.") 792Used in `tramp-make-tramp-file-name'.")
793 793
794(defconst tramp-postfix-host-regexp 794(defconst tramp-postfix-host-regexp
795 (regexp-quote tramp-postfix-host-format) 795 (regexp-quote tramp-postfix-host-format)
796 "*Regexp matching delimiter between host names and localnames. 796 "Regexp matching delimiter between host names and localnames.
797Derived from `tramp-postfix-host-format'.") 797Derived from `tramp-postfix-host-format'.")
798 798
799(defconst tramp-localname-regexp ".*$" 799(defconst tramp-localname-regexp ".*$"
800 "*Regexp matching localnames.") 800 "Regexp matching localnames.")
801 801
802;;; File name format: 802;;; File name format:
803 803
@@ -816,7 +816,7 @@ Derived from `tramp-postfix-host-format'.")
816 "\\(" tramp-localname-regexp "\\)") 816 "\\(" tramp-localname-regexp "\\)")
817 2 4 5 8) 817 2 4 5 8)
818 818
819 "*List of five elements (REGEXP METHOD USER HOST FILE), detailing \ 819 "List of five elements (REGEXP METHOD USER HOST FILE), detailing \
820the Tramp file name structure. 820the Tramp file name structure.
821 821
822The first element REGEXP is a regular expression matching a Tramp file 822The first element REGEXP is a regular expression matching a Tramp file
@@ -860,7 +860,7 @@ See `tramp-file-name-structure' for more explanations.")
860 ((equal tramp-syntax 'sep) tramp-file-name-regexp-separate) 860 ((equal tramp-syntax 'sep) tramp-file-name-regexp-separate)
861 ((equal tramp-syntax 'url) tramp-file-name-regexp-url) 861 ((equal tramp-syntax 'url) tramp-file-name-regexp-url)
862 (t (error "Wrong `tramp-syntax' defined"))) 862 (t (error "Wrong `tramp-syntax' defined")))
863 "*Regular expression matching file names handled by Tramp. 863 "Regular expression matching file names handled by Tramp.
864This regexp should match Tramp file names but no other file names. 864This regexp should match Tramp file names but no other file names.
865When tramp.el is loaded, this regular expression is prepended to 865When tramp.el is loaded, this regular expression is prepended to
866`file-name-handler-alist', and that is searched sequentially. Thus, 866`file-name-handler-alist', and that is searched sequentially. Thus,
@@ -904,7 +904,7 @@ See `tramp-file-name-structure' for more explanations.")
904 ((equal tramp-syntax 'sep) tramp-completion-file-name-regexp-separate) 904 ((equal tramp-syntax 'sep) tramp-completion-file-name-regexp-separate)
905 ((equal tramp-syntax 'url) tramp-completion-file-name-regexp-url) 905 ((equal tramp-syntax 'url) tramp-completion-file-name-regexp-url)
906 (t (error "Wrong `tramp-syntax' defined"))) 906 (t (error "Wrong `tramp-syntax' defined")))
907 "*Regular expression matching file names handled by Tramp completion. 907 "Regular expression matching file names handled by Tramp completion.
908This regexp should match partial Tramp file names only. 908This regexp should match partial Tramp file names only.
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
@@ -926,7 +926,7 @@ Also see `tramp-file-name-structure'.")
926;; Parentheses in docstring starting at beginning of line are escaped. 926;; Parentheses in docstring starting at beginning of line are escaped.
927;; Fontification is messed up when 927;; Fontification is messed up when
928;; `open-paren-in-column-0-is-defun-start' set to t. 928;; `open-paren-in-column-0-is-defun-start' set to t.
929 "*If non-nil, chunksize for sending input to local process. 929 "If non-nil, chunksize for sending input to local process.
930It is necessary only on systems which have a buggy `process-send-string' 930It is necessary only on systems which have a buggy `process-send-string'
931implementation. The necessity, whether this variable must be set, can be 931implementation. The necessity, whether this variable must be set, can be
932checked via the following code: 932checked via the following code:
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 4b8fbe1e2cf..232e5ca581a 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -276,7 +276,7 @@ function and the `webjump-sites' variable.")
276 276
277(defvar webjump-sites 277(defvar webjump-sites
278 webjump-sample-sites 278 webjump-sample-sites
279 "*Hotlist for WebJump. 279 "Hotlist for WebJump.
280 280
281The hotlist is represented as an association list, with the CAR of each cell 281The hotlist is represented as an association list, with the CAR of each cell
282being the name of the Web site, and the CDR being the definition for the URL of 282being the name of the Web site, and the CDR being the definition for the URL of
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 40bb36daf45..37a76e0309c 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -106,12 +106,12 @@ Comments might be indented to a different value in order not to go beyond
106 106
107;;;###autoload 107;;;###autoload
108(defvar comment-start nil 108(defvar comment-start nil
109 "*String to insert to start a new comment, or nil if no comment syntax.") 109 "String to insert to start a new comment, or nil if no comment syntax.")
110;;;###autoload(put 'comment-start 'safe-local-variable 'string-or-null-p) 110;;;###autoload(put 'comment-start 'safe-local-variable 'string-or-null-p)
111 111
112;;;###autoload 112;;;###autoload
113(defvar comment-start-skip nil 113(defvar comment-start-skip nil
114 "*Regexp to match the start of a comment plus everything up to its body. 114 "Regexp to match the start of a comment plus everything up to its body.
115If there are any \\(...\\) pairs, the comment delimiter text is held to begin 115If there are any \\(...\\) pairs, the comment delimiter text is held to begin
116at the place matched by the close of the first pair.") 116at the place matched by the close of the first pair.")
117;;;###autoload(put 'comment-start-skip 'safe-local-variable 'string-or-null-p) 117;;;###autoload(put 'comment-start-skip 'safe-local-variable 'string-or-null-p)
@@ -123,7 +123,7 @@ at the place matched by the close of the first pair.")
123 123
124;;;###autoload 124;;;###autoload
125(defvar comment-end (purecopy "") 125(defvar comment-end (purecopy "")
126 "*String to insert to end a new comment. 126 "String to insert to end a new comment.
127Should be an empty string if comments are terminated by end-of-line.") 127Should be an empty string if comments are terminated by end-of-line.")
128;;;###autoload(put 'comment-end 'safe-local-variable 'string-or-null-p) 128;;;###autoload(put 'comment-end 'safe-local-variable 'string-or-null-p)
129 129
diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index ba940cd513e..6e15e5d4ce0 100644
--- a/lisp/nxml/nxml-glyph.el
+++ b/lisp/nxml/nxml-glyph.el
@@ -333,7 +333,7 @@ This repertoire is supported for the following fonts:
333 "Glyph set corresponding to Windows Glyph List 4.") 333 "Glyph set corresponding to Windows Glyph List 4.")
334 334
335(defvar nxml-glyph-set-hook nil 335(defvar nxml-glyph-set-hook nil
336 "*Hook for determining the set of glyphs in a face. 336 "Hook for determining the set of glyphs in a face.
337The hook will receive a single argument FACE. If it can determine 337The hook will receive a single argument FACE. If it can determine
338the set of glyphs representable by FACE, it must set the variable 338the set of glyphs representable by FACE, it must set the variable
339`nxml-glyph-set' and return non-nil. Otherwise, it must return nil. 339`nxml-glyph-set' and return non-nil. Otherwise, it must return nil.
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index 1047ead1b13..a587c14e01a 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -54,7 +54,7 @@
54 :group 'relax-ng) 54 :group 'relax-ng)
55 55
56(defvar rng-complete-end-tags-after-< t 56(defvar rng-complete-end-tags-after-< t
57 "*Non-nil means immediately after < complete on end-tag names. 57 "Non-nil means immediately after < complete on end-tag names.
58Complete on start-tag names regardless.") 58Complete on start-tag names regardless.")
59 59
60(defvar rng-nxml-easy-menu 60(defvar rng-nxml-easy-menu
diff --git a/lisp/obsolete/erc-hecomplete.el b/lisp/obsolete/erc-hecomplete.el
index 6cc45c21727..8e939169a60 100644
--- a/lisp/obsolete/erc-hecomplete.el
+++ b/lisp/obsolete/erc-hecomplete.el
@@ -73,7 +73,7 @@ or you may use an arbitrary lisp expression."
73 :group 'erc-hecomplete) 73 :group 'erc-hecomplete)
74 74
75(defcustom erc-nick-completion-ignore-case t 75(defcustom erc-nick-completion-ignore-case t
76 "*Non-nil means don't consider case significant in nick completion. 76 "Non-nil means don't consider case significant in nick completion.
77Case will be automatically corrected when non-nil. 77Case will be automatically corrected when non-nil.
78For instance if you type \"dely TAB\" the word completes and changes to 78For instance if you type \"dely TAB\" the word completes and changes to
79\"delYsid\"." 79\"delYsid\"."
@@ -92,7 +92,7 @@ typing \"f o TAB\" will directly give you foobar. Use this with
92 (erc-get-channel-nickname-list))) 92 (erc-get-channel-nickname-list)))
93 93
94(defcustom erc-nick-completion-postfix ": " 94(defcustom erc-nick-completion-postfix ": "
95 "*When `erc-complete' is used in the first word after the prompt, 95 "When `erc-complete' is used in the first word after the prompt,
96add this string when a unique expansion was found." 96add this string when a unique expansion was found."
97 :group 'erc-hecomplete 97 :group 'erc-hecomplete
98 :type 'string) 98 :type 'string)
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 9eb1d0569f0..125a5dbf6e0 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -247,7 +247,7 @@
247;; User Variables: 247;; User Variables:
248 248
249(defcustom fast-lock-minimum-size 25600 249(defcustom fast-lock-minimum-size 25600
250 "*Minimum size of a buffer for cached fontification. 250 "Minimum size of a buffer for cached fontification.
251Only buffers more than this can have associated Font Lock cache files saved. 251Only buffers more than this can have associated Font Lock cache files saved.
252If nil, means cache files are never created. 252If nil, means cache files are never created.
253If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE), 253If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE),
@@ -271,7 +271,7 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
271(defcustom fast-lock-cache-directories '("~/.emacs-flc") 271(defcustom fast-lock-cache-directories '("~/.emacs-flc")
272; - `internal', keep each file's Font Lock cache file in the same file. 272; - `internal', keep each file's Font Lock cache file in the same file.
273; - `external', keep each file's Font Lock cache file in the same directory. 273; - `external', keep each file's Font Lock cache file in the same directory.
274 "*Directories in which Font Lock cache files are saved and read. 274 "Directories in which Font Lock cache files are saved and read.
275Each item should be either DIR or a cons pair of the form (REGEXP . DIR) where 275Each item should be either DIR or a cons pair of the form (REGEXP . DIR) where
276DIR is a directory name (relative or absolute) and REGEXP is a regexp. 276DIR is a directory name (relative or absolute) and REGEXP is a regexp.
277 277
@@ -297,7 +297,7 @@ to avoid the possibility of using the cache of another user."
297(put 'fast-lock-cache-directories 'risky-local-variable t) 297(put 'fast-lock-cache-directories 'risky-local-variable t)
298 298
299(defcustom fast-lock-save-events '(kill-buffer kill-emacs) 299(defcustom fast-lock-save-events '(kill-buffer kill-emacs)
300 "*Events under which caches will be saved. 300 "Events under which caches will be saved.
301Valid events are `save-buffer', `kill-buffer' and `kill-emacs'. 301Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.
302If concurrent editing sessions use the same associated cache file for a file's 302If concurrent editing sessions use the same associated cache file for a file's
303buffer, then you should add `save-buffer' to this list." 303buffer, then you should add `save-buffer' to this list."
@@ -307,14 +307,14 @@ buffer, then you should add `save-buffer' to this list."
307 :group 'fast-lock) 307 :group 'fast-lock)
308 308
309(defcustom fast-lock-save-others t 309(defcustom fast-lock-save-others t
310 "*If non-nil, save Font Lock cache files irrespective of file owner. 310 "If non-nil, save Font Lock cache files irrespective of file owner.
311If nil, means only buffer files known to be owned by you can have associated 311If nil, means only buffer files known to be owned by you can have associated
312Font Lock cache files saved. Ownership may be unknown for networked files." 312Font Lock cache files saved. Ownership may be unknown for networked files."
313 :type 'boolean 313 :type 'boolean
314 :group 'fast-lock) 314 :group 'fast-lock)
315 315
316(defcustom fast-lock-verbose font-lock-verbose 316(defcustom fast-lock-verbose font-lock-verbose
317 "*If non-nil, means show status messages for cache processing. 317 "If non-nil, means show status messages for cache processing.
318If a number, only buffers greater than this size have processing messages." 318If a number, only buffers greater than this size have processing messages."
319 :type '(choice (const :tag "never" nil) 319 :type '(choice (const :tag "never" nil)
320 (other :tag "always" t) 320 (other :tag "always" t)
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index 5a7e99197b8..7e81c4bfb9d 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -73,7 +73,7 @@
73 :group 'i18n) 73 :group 'i18n)
74 74
75(defcustom iso-accents-insert-offset nonascii-insert-offset 75(defcustom iso-accents-insert-offset nonascii-insert-offset
76 "*Offset added by ISO Accents mode to character codes 0200 and above." 76 "Offset added by ISO Accents mode to character codes 0200 and above."
77 :type 'integer 77 :type 'integer
78 :group 'iso-acc) 78 :group 'iso-acc)
79 79
@@ -262,7 +262,7 @@ Change it with the `iso-accents-customize' function.")
262 "Association list for ISO accent combinations, for the chosen language.") 262 "Association list for ISO accent combinations, for the chosen language.")
263 263
264(defcustom iso-accents-mode nil 264(defcustom iso-accents-mode nil
265 "*Non-nil enables ISO Accents mode. 265 "Non-nil enables ISO Accents mode.
266Setting this variable makes it local to the current buffer. 266Setting this variable makes it local to the current buffer.
267See the function `iso-accents-mode'." 267See the function `iso-accents-mode'."
268 :type 'boolean 268 :type 'boolean
@@ -270,7 +270,7 @@ See the function `iso-accents-mode'."
270(make-variable-buffer-local 'iso-accents-mode) 270(make-variable-buffer-local 'iso-accents-mode)
271 271
272(defcustom iso-accents-enable '(?' ?` ?^ ?\" ?~ ?/) 272(defcustom iso-accents-enable '(?' ?` ?^ ?\" ?~ ?/)
273 "*List of accent keys that become prefixes in ISO Accents mode. 273 "List of accent keys that become prefixes in ISO Accents mode.
274The default is (?' ?` ?^ ?\" ?~ ?/), which contains all the supported 274The default is (?' ?` ?^ ?\" ?~ ?/), which contains all the supported
275accent keys. If you set this variable to a list in which some of those 275accent keys. If you set this variable to a list in which some of those
276characters are missing, the missing ones do not act as accents. 276characters are missing, the missing ones do not act as accents.
diff --git a/lisp/obsolete/resume.el b/lisp/obsolete/resume.el
index 905ea07459a..0d4c815722e 100644
--- a/lisp/obsolete/resume.el
+++ b/lisp/obsolete/resume.el
@@ -47,7 +47,7 @@
47;;; Code: 47;;; Code:
48 48
49(defvar resume-emacs-args-file (expand-file-name "~/.emacs_args") 49(defvar resume-emacs-args-file (expand-file-name "~/.emacs_args")
50 "*This file is where arguments are placed for a suspended Emacs job.") 50 "This file is where arguments are placed for a suspended Emacs job.")
51 51
52(defvar resume-emacs-args-buffer " *Command Line Args*" 52(defvar resume-emacs-args-buffer " *Command Line Args*"
53 "Buffer that is used by `resume-process-args'.") 53 "Buffer that is used by `resume-process-args'.")
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index c46c834338f..7ff944c14df 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -45,17 +45,17 @@
45 "Abbrev table used while in scribe mode.") 45 "Abbrev table used while in scribe mode.")
46 46
47(defcustom scribe-fancy-paragraphs nil 47(defcustom scribe-fancy-paragraphs nil
48 "*Non-nil makes Scribe mode use a different style of paragraph separation." 48 "Non-nil makes Scribe mode use a different style of paragraph separation."
49 :type 'boolean 49 :type 'boolean
50 :group 'scribe) 50 :group 'scribe)
51 51
52(defcustom scribe-electric-quote nil 52(defcustom scribe-electric-quote nil
53 "*Non-nil makes insert of double quote use `` or '' depending on context." 53 "Non-nil makes insert of double quote use `` or '' depending on context."
54 :type 'boolean 54 :type 'boolean
55 :group 'scribe) 55 :group 'scribe)
56 56
57(defcustom scribe-electric-parenthesis nil 57(defcustom scribe-electric-parenthesis nil
58 "*Non-nil makes parenthesis char ( (]}> ) automatically insert its close 58 "Non-nil makes parenthesis char ( (]}> ) automatically insert its close
59if typed after an @Command form." 59if typed after an @Command form."
60 :type 'boolean 60 :type 'boolean
61 :group 'scribe) 61 :group 'scribe)
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 48656190a0c..8b5bc6ecdf6 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -188,7 +188,7 @@ See the ctags documentation for more information.")
188Created as a local variable in each buffer.") 188Created as a local variable in each buffer.")
189 189
190(defcustom org-ctags-new-topic-template 190(defcustom org-ctags-new-topic-template
191 "* <<%t>>\n\n\n\n\n\n" 191 " <<%t>>\n\n\n\n\n\n"
192 "Text to insert when creating a new org file via opening a hyperlink. 192 "Text to insert when creating a new org file via opening a hyperlink.
193The following patterns are replaced in the string: 193The following patterns are replaced in the string:
194 `%t' - replaced with the capitalized title of the hyperlink" 194 `%t' - replaced with the capitalized title of the hyperlink"
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 775f60990d0..419a1ffcaa4 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -225,7 +225,7 @@ Consider using the interactive functions `org-protocol-create' and
225 :type 'alist) 225 :type 'alist)
226 226
227(defcustom org-protocol-protocol-alist nil 227(defcustom org-protocol-protocol-alist nil
228 "* Register custom handlers for org-protocol. 228 " Register custom handlers for org-protocol.
229 229
230Each element of this list must be of the form: 230Each element of this list must be of the form:
231 231
diff --git a/lisp/outline.el b/lisp/outline.el
index da5519f95eb..40974a2c829 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -284,10 +284,10 @@ in the file it applies to."
284 "Normal hook to be run after outline visibility changes.") 284 "Normal hook to be run after outline visibility changes.")
285 285
286(defvar outline-mode-hook nil 286(defvar outline-mode-hook nil
287 "*This hook is run when outline mode starts.") 287 "This hook is run when outline mode starts.")
288 288
289(defvar outline-blank-line nil 289(defvar outline-blank-line nil
290 "*Non-nil means to leave unhidden blank line before heading.") 290 "Non-nil means to leave unhidden blank line before heading.")
291 291
292;;;###autoload 292;;;###autoload
293(define-derived-mode outline-mode text-mode "Outline" 293(define-derived-mode outline-mode text-mode "Outline"
@@ -380,7 +380,7 @@ See the command `outline-mode' for more information on this mode."
380 (show-all))) 380 (show-all)))
381 381
382(defvar outline-level 'outline-level 382(defvar outline-level 'outline-level
383 "*Function of no args to compute a header's nesting level in an outline. 383 "Function of no args to compute a header's nesting level in an outline.
384It can assume point is at the beginning of a header line and that the match 384It can assume point is at the beginning of a header line and that the match
385data reflects the `outline-regexp'.") 385data reflects the `outline-regexp'.")
386;;;###autoload(put 'outline-level 'risky-local-variable t) 386;;;###autoload(put 'outline-level 'risky-local-variable t)
diff --git a/lisp/paren.el b/lisp/paren.el
index 49d2777fd0b..2d6c42478e1 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -96,7 +96,7 @@ otherwise)."
96 'show-paren-mismatch "22.1") 96 'show-paren-mismatch "22.1")
97 97
98(defvar show-paren-highlight-openparen t 98(defvar show-paren-highlight-openparen t
99 "*Non-nil turns on openparen highlighting when matching forward.") 99 "Non-nil turns on openparen highlighting when matching forward.")
100 100
101(defvar show-paren-idle-timer nil) 101(defvar show-paren-idle-timer nil)
102 102
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index a1420e62f02..9919600202f 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -92,7 +92,7 @@
92"*Number of steps `animate-string' will place a char before its last position.") 92"*Number of steps `animate-string' will place a char before its last position.")
93 93
94(defvar animation-buffer-name nil 94(defvar animation-buffer-name nil
95 "*String naming the default buffer for animations. 95 "String naming the default buffer for animations.
96When nil animations displayed in the buffer named *Animation*.") 96When nil animations displayed in the buffer named *Animation*.")
97 97
98;;;###autoload 98;;;###autoload
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 6b6e81dfaba..6d73e2ccb65 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -89,16 +89,16 @@ One useful value to include is `turn-on-font-lock' to highlight the pieces."
89;; look rectangular, but spacings SHOULD be at least 2 (MUST BE at least 1). 89;; look rectangular, but spacings SHOULD be at least 2 (MUST BE at least 1).
90 90
91(defconst gomoku-square-width 4 91(defconst gomoku-square-width 4
92 "*Horizontal spacing between squares on the Gomoku board.") 92 "Horizontal spacing between squares on the Gomoku board.")
93 93
94(defconst gomoku-square-height 2 94(defconst gomoku-square-height 2
95 "*Vertical spacing between squares on the Gomoku board.") 95 "Vertical spacing between squares on the Gomoku board.")
96 96
97(defconst gomoku-x-offset 3 97(defconst gomoku-x-offset 3
98 "*Number of columns between the Gomoku board and the side of the window.") 98 "Number of columns between the Gomoku board and the side of the window.")
99 99
100(defconst gomoku-y-offset 1 100(defconst gomoku-y-offset 1
101 "*Number of lines between the Gomoku board and the top of the window.") 101 "Number of lines between the Gomoku board and the top of the window.")
102 102
103 103
104(defvar gomoku-mode-map 104(defvar gomoku-mode-map
@@ -173,7 +173,7 @@ One useful value to include is `turn-on-font-lock' to highlight the pieces."
173 '(("O" . 'gomoku-O) 173 '(("O" . 'gomoku-O)
174 ("X" . 'gomoku-X) 174 ("X" . 'gomoku-X)
175 ("[-|/\\]" 0 (if gomoku-emacs-won 'gomoku-O 'gomoku-X))) 175 ("[-|/\\]" 0 (if gomoku-emacs-won 'gomoku-O 'gomoku-X)))
176 "*Font lock rules for Gomoku.") 176 "Font lock rules for Gomoku.")
177 177
178(put 'gomoku-mode 'front-sticky 178(put 'gomoku-mode 'front-sticky
179 (put 'gomoku-mode 'rear-nonsticky '(intangible))) 179 (put 'gomoku-mode 'rear-nonsticky '(intangible)))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 29bb8a40e8f..9ffc308928a 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -139,16 +139,16 @@
139;; look rectangular, but spacings SHOULD be at least 2 (MUST BE at least 1). 139;; look rectangular, but spacings SHOULD be at least 2 (MUST BE at least 1).
140 140
141(defconst landmark-square-width 2 141(defconst landmark-square-width 2
142 "*Horizontal spacing between squares on the Landmark board.") 142 "Horizontal spacing between squares on the Landmark board.")
143 143
144(defconst landmark-square-height 1 144(defconst landmark-square-height 1
145 "*Vertical spacing between squares on the Landmark board.") 145 "Vertical spacing between squares on the Landmark board.")
146 146
147(defconst landmark-x-offset 3 147(defconst landmark-x-offset 3
148 "*Number of columns between the Landmark board and the side of the window.") 148 "Number of columns between the Landmark board and the side of the window.")
149 149
150(defconst landmark-y-offset 1 150(defconst landmark-y-offset 1
151 "*Number of lines between the Landmark board and the top of the window.") 151 "Number of lines between the Landmark board and the top of the window.")
152 152
153 153
154;;;_ + LANDMARK MODE AND KEYMAP. 154;;;_ + LANDMARK MODE AND KEYMAP.
@@ -206,7 +206,7 @@
206 206
207 207
208(defvar landmark-emacs-won () 208(defvar landmark-emacs-won ()
209 "*For making font-lock use the winner's face for the line.") 209 "For making font-lock use the winner's face for the line.")
210 210
211(defface landmark-font-lock-face-O '((((class color)) :foreground "red") 211(defface landmark-font-lock-face-O '((((class color)) :foreground "red")
212 (t :weight bold)) 212 (t :weight bold))
@@ -226,7 +226,7 @@
226 ("[-|/\\]" 0 (if landmark-emacs-won 226 ("[-|/\\]" 0 (if landmark-emacs-won
227 'landmark-font-lock-face-O 227 'landmark-font-lock-face-O
228 'landmark-font-lock-face-X))) 228 'landmark-font-lock-face-X)))
229 "*Font lock rules for Landmark.") 229 "Font lock rules for Landmark.")
230 230
231(put 'landmark-mode 'front-sticky 231(put 'landmark-mode 'front-sticky
232 (put 'landmark-mode 'rear-nonsticky '(intangible))) 232 (put 'landmark-mode 'rear-nonsticky '(intangible)))
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index f1d42aafb9c..f47e273d612 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -43,7 +43,7 @@
43 "The timer we use to decide when to zone out, or nil if none.") 43 "The timer we use to decide when to zone out, or nil if none.")
44 44
45(defvar zone-timeout nil 45(defvar zone-timeout nil
46 "*Seconds to timeout the zoning. 46 "Seconds to timeout the zoning.
47If nil, don't interrupt for about 1^26 seconds.") 47If nil, don't interrupt for about 1^26 seconds.")
48 48
49;; Vector of functions that zone out. `zone' will execute one of 49;; Vector of functions that zone out. `zone' will execute one of
@@ -623,7 +623,7 @@ If the element is a function or a list of a function and a number,
623;;;; the lyfe so short the craft so long to lerne --chaucer 623;;;; the lyfe so short the craft so long to lerne --chaucer
624 624
625(defvar zone-pgm-random-life-wait nil 625(defvar zone-pgm-random-life-wait nil
626 "*Seconds to wait between successive `life' generations. 626 "Seconds to wait between successive `life' generations.
627If nil, `zone-pgm-random-life' chooses a value from 0-3 (inclusive).") 627If nil, `zone-pgm-random-life' chooses a value from 0-3 (inclusive).")
628 628
629(defvar life-patterns) ; from life.el 629(defvar life-patterns) ; from life.el
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index d8768dd5986..33ff4645a77 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -139,7 +139,7 @@
139 version-string))) 139 version-string)))
140 140
141(defvar ada-mode-hook nil 141(defvar ada-mode-hook nil
142 "*List of functions to call when Ada mode is invoked. 142 "List of functions to call when Ada mode is invoked.
143This hook is automatically executed after the `ada-mode' is 143This hook is automatically executed after the `ada-mode' is
144fully loaded. 144fully loaded.
145This is a good place to add Ada environment specific bindings.") 145This is a good place to add Ada environment specific bindings.")
@@ -150,13 +150,13 @@ This is a good place to add Ada environment specific bindings.")
150 :group 'languages) 150 :group 'languages)
151 151
152(defcustom ada-auto-case t 152(defcustom ada-auto-case t
153 "*Non-nil means automatically change case of preceding word while typing. 153 "Non-nil means automatically change case of preceding word while typing.
154Casing is done according to `ada-case-keyword', `ada-case-identifier' 154Casing is done according to `ada-case-keyword', `ada-case-identifier'
155and `ada-case-attribute'." 155and `ada-case-attribute'."
156 :type 'boolean :group 'ada) 156 :type 'boolean :group 'ada)
157 157
158(defcustom ada-broken-decl-indent 0 158(defcustom ada-broken-decl-indent 0
159 "*Number of columns to indent a broken declaration. 159 "Number of columns to indent a broken declaration.
160 160
161An example is : 161An example is :
162 declare 162 declare
@@ -165,7 +165,7 @@ An example is :
165 :type 'integer :group 'ada) 165 :type 'integer :group 'ada)
166 166
167(defcustom ada-broken-indent 2 167(defcustom ada-broken-indent 2
168 "*Number of columns to indent the continuation of a broken line. 168 "Number of columns to indent the continuation of a broken line.
169 169
170An example is : 170An example is :
171 My_Var : My_Type := (Field1 => 171 My_Var : My_Type := (Field1 =>
@@ -173,7 +173,7 @@ An example is :
173 :type 'integer :group 'ada) 173 :type 'integer :group 'ada)
174 174
175(defcustom ada-continuation-indent ada-broken-indent 175(defcustom ada-continuation-indent ada-broken-indent
176 "*Number of columns to indent the continuation of broken lines in parenthesis. 176 "Number of columns to indent the continuation of broken lines in parenthesis.
177 177
178An example is : 178An example is :
179 Func (Param1, 179 Func (Param1,
@@ -181,7 +181,7 @@ An example is :
181 :type 'integer :group 'ada) 181 :type 'integer :group 'ada)
182 182
183(defcustom ada-case-attribute 'ada-capitalize-word 183(defcustom ada-case-attribute 'ada-capitalize-word
184 "*Function to call to adjust the case of Ada attributes. 184 "Function to call to adjust the case of Ada attributes.
185It may be `downcase-word', `upcase-word', `ada-loose-case-word', 185It may be `downcase-word', `upcase-word', `ada-loose-case-word',
186`ada-capitalize-word' or `ada-no-auto-case'." 186`ada-capitalize-word' or `ada-no-auto-case'."
187 :type '(choice (const downcase-word) 187 :type '(choice (const downcase-word)
@@ -193,7 +193,7 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word',
193 193
194(defcustom ada-case-exception-file 194(defcustom ada-case-exception-file
195 (list (convert-standard-filename' "~/.emacs_case_exceptions")) 195 (list (convert-standard-filename' "~/.emacs_case_exceptions"))
196 "*List of special casing exceptions dictionaries for identifiers. 196 "List of special casing exceptions dictionaries for identifiers.
197The first file is the one where new exceptions will be saved by Emacs 197The first file is the one where new exceptions will be saved by Emacs
198when you call `ada-create-case-exception'. 198when you call `ada-create-case-exception'.
199 199
@@ -207,7 +207,7 @@ by a comment."
207 :group 'ada) 207 :group 'ada)
208 208
209(defcustom ada-case-keyword 'downcase-word 209(defcustom ada-case-keyword 'downcase-word
210 "*Function to call to adjust the case of an Ada keywords. 210 "Function to call to adjust the case of an Ada keywords.
211It may be `downcase-word', `upcase-word', `ada-loose-case-word' or 211It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
212`ada-capitalize-word'." 212`ada-capitalize-word'."
213 :type '(choice (const downcase-word) 213 :type '(choice (const downcase-word)
@@ -218,7 +218,7 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
218 :group 'ada) 218 :group 'ada)
219 219
220(defcustom ada-case-identifier 'ada-loose-case-word 220(defcustom ada-case-identifier 'ada-loose-case-word
221 "*Function to call to adjust the case of an Ada identifier. 221 "Function to call to adjust the case of an Ada identifier.
222It may be `downcase-word', `upcase-word', `ada-loose-case-word' or 222It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
223`ada-capitalize-word'." 223`ada-capitalize-word'."
224 :type '(choice (const downcase-word) 224 :type '(choice (const downcase-word)
@@ -229,7 +229,7 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
229 :group 'ada) 229 :group 'ada)
230 230
231(defcustom ada-clean-buffer-before-saving t 231(defcustom ada-clean-buffer-before-saving t
232 "*Non-nil means remove trailing spaces and untabify the buffer before saving." 232 "Non-nil means remove trailing spaces and untabify the buffer before saving."
233 :type 'boolean :group 'ada) 233 :type 'boolean :group 'ada)
234(make-obsolete-variable 'ada-clean-buffer-before-saving 234(make-obsolete-variable 'ada-clean-buffer-before-saving
235 "use the `write-file-functions' hook." 235 "use the `write-file-functions' hook."
@@ -237,7 +237,7 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
237 237
238 238
239(defcustom ada-indent 3 239(defcustom ada-indent 3
240 "*Size of Ada indentation. 240 "Size of Ada indentation.
241 241
242An example is : 242An example is :
243procedure Foo is 243procedure Foo is
@@ -246,11 +246,11 @@ begin
246 :type 'integer :group 'ada) 246 :type 'integer :group 'ada)
247 247
248(defcustom ada-indent-after-return t 248(defcustom ada-indent-after-return t
249 "*Non-nil means automatically indent after RET or LFD." 249 "Non-nil means automatically indent after RET or LFD."
250 :type 'boolean :group 'ada) 250 :type 'boolean :group 'ada)
251 251
252(defcustom ada-indent-align-comments t 252(defcustom ada-indent-align-comments t
253 "*Non-nil means align comments on previous line comments, if any. 253 "Non-nil means align comments on previous line comments, if any.
254If nil, indentation is calculated as usual. 254If nil, indentation is calculated as usual.
255Note that indentation is calculated only if `ada-indent-comment-as-code' is t. 255Note that indentation is calculated only if `ada-indent-comment-as-code' is t.
256 256
@@ -260,12 +260,12 @@ For instance:
260 :type 'boolean :group 'ada) 260 :type 'boolean :group 'ada)
261 261
262(defcustom ada-indent-comment-as-code t 262(defcustom ada-indent-comment-as-code t
263 "*Non-nil means indent comment lines as code. 263 "Non-nil means indent comment lines as code.
264A nil value means do not auto-indent comments." 264A nil value means do not auto-indent comments."
265 :type 'boolean :group 'ada) 265 :type 'boolean :group 'ada)
266 266
267(defcustom ada-indent-handle-comment-special nil 267(defcustom ada-indent-handle-comment-special nil
268 "*Non-nil if comment lines should be handled specially inside parenthesis. 268 "Non-nil if comment lines should be handled specially inside parenthesis.
269By default, if the line that contains the open parenthesis has some 269By default, if the line that contains the open parenthesis has some
270text following it, then the following lines will be indented in the 270text following it, then the following lines will be indented in the
271same column as this text. This will not be true if the first line is 271same column as this text. This will not be true if the first line is
@@ -287,11 +287,11 @@ type A is
287 :type 'boolean :group 'ada) 287 :type 'boolean :group 'ada)
288 288
289(defcustom ada-indent-is-separate t 289(defcustom ada-indent-is-separate t
290 "*Non-nil means indent 'is separate' or 'is abstract' if on a single line." 290 "Non-nil means indent 'is separate' or 'is abstract' if on a single line."
291 :type 'boolean :group 'ada) 291 :type 'boolean :group 'ada)
292 292
293(defcustom ada-indent-record-rel-type 3 293(defcustom ada-indent-record-rel-type 3
294 "*Indentation for 'record' relative to 'type' or 'use'. 294 "Indentation for 'record' relative to 'type' or 'use'.
295 295
296An example is: 296An example is:
297 type A is 297 type A is
@@ -299,7 +299,7 @@ An example is:
299 :type 'integer :group 'ada) 299 :type 'integer :group 'ada)
300 300
301(defcustom ada-indent-renames ada-broken-indent 301(defcustom ada-indent-renames ada-broken-indent
302 "*Indentation for renames relative to the matching function statement. 302 "Indentation for renames relative to the matching function statement.
303If `ada-indent-return' is null or negative, the indentation is done relative to 303If `ada-indent-return' is null or negative, the indentation is done relative to
304the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used). 304the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used).
305 305
@@ -310,7 +310,7 @@ An example is:
310 :type 'integer :group 'ada) 310 :type 'integer :group 'ada)
311 311
312(defcustom ada-indent-return 0 312(defcustom ada-indent-return 0
313 "*Indentation for 'return' relative to the matching 'function' statement. 313 "Indentation for 'return' relative to the matching 'function' statement.
314If `ada-indent-return' is null or negative, the indentation is done relative to 314If `ada-indent-return' is null or negative, the indentation is done relative to
315the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used). 315the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used).
316 316
@@ -320,22 +320,22 @@ An example is:
320 :type 'integer :group 'ada) 320 :type 'integer :group 'ada)
321 321
322(defcustom ada-indent-to-open-paren t 322(defcustom ada-indent-to-open-paren t
323 "*Non-nil means indent according to the innermost open parenthesis." 323 "Non-nil means indent according to the innermost open parenthesis."
324 :type 'boolean :group 'ada) 324 :type 'boolean :group 'ada)
325 325
326(defcustom ada-fill-comment-prefix "-- " 326(defcustom ada-fill-comment-prefix "-- "
327 "*Text inserted in the first columns when filling a comment paragraph. 327 "Text inserted in the first columns when filling a comment paragraph.
328Note: if you modify this variable, you will have to invoke `ada-mode' 328Note: if you modify this variable, you will have to invoke `ada-mode'
329again to take account of the new value." 329again to take account of the new value."
330 :type 'string :group 'ada) 330 :type 'string :group 'ada)
331 331
332(defcustom ada-fill-comment-postfix " --" 332(defcustom ada-fill-comment-postfix " --"
333 "*Text inserted at the end of each line when filling a comment paragraph. 333 "Text inserted at the end of each line when filling a comment paragraph.
334Used by `ada-fill-comment-paragraph-postfix'." 334Used by `ada-fill-comment-paragraph-postfix'."
335 :type 'string :group 'ada) 335 :type 'string :group 'ada)
336 336
337(defcustom ada-label-indent -4 337(defcustom ada-label-indent -4
338 "*Number of columns to indent a label. 338 "Number of columns to indent a label.
339 339
340An example is: 340An example is:
341procedure Foo is 341procedure Foo is
@@ -346,15 +346,15 @@ This is also used for <<..>> labels"
346 :type 'integer :group 'ada) 346 :type 'integer :group 'ada)
347 347
348(defcustom ada-language-version 'ada95 348(defcustom ada-language-version 'ada95
349 "*Ada language version; one of `ada83', `ada95', `ada2005'." 349 "Ada language version; one of `ada83', `ada95', `ada2005'."
350 :type '(choice (const ada83) (const ada95) (const ada2005)) :group 'ada) 350 :type '(choice (const ada83) (const ada95) (const ada2005)) :group 'ada)
351 351
352(defcustom ada-move-to-declaration nil 352(defcustom ada-move-to-declaration nil
353 "*Non-nil means `ada-move-to-start' moves to the subprogram declaration, not to 'begin'." 353 "Non-nil means `ada-move-to-start' moves to the subprogram declaration, not to 'begin'."
354 :type 'boolean :group 'ada) 354 :type 'boolean :group 'ada)
355 355
356(defcustom ada-popup-key '[down-mouse-3] 356(defcustom ada-popup-key '[down-mouse-3]
357 "*Key used for binding the contextual menu. 357 "Key used for binding the contextual menu.
358If nil, no contextual menu is available." 358If nil, no contextual menu is available."
359 :type '(restricted-sexp :match-alternatives (stringp vectorp)) 359 :type '(restricted-sexp :match-alternatives (stringp vectorp))
360 :group 'ada) 360 :group 'ada)
@@ -364,7 +364,7 @@ If nil, no contextual menu is available."
364 (split-string (or (getenv "ADA_INCLUDE_PATH") "") ":") 364 (split-string (or (getenv "ADA_INCLUDE_PATH") "") ":")
365 '("/usr/adainclude" "/usr/local/adainclude" 365 '("/usr/adainclude" "/usr/local/adainclude"
366 "/opt/gnu/adainclude")) 366 "/opt/gnu/adainclude"))
367 "*Default list of directories to search for Ada files. 367 "Default list of directories to search for Ada files.
368See the description for the `ff-search-directories' variable. This variable 368See the description for the `ff-search-directories' variable. This variable
369is the initial value of `ada-search-directories-internal'." 369is the initial value of `ada-search-directories-internal'."
370 :type '(repeat (choice :tag "Directory" 370 :type '(repeat (choice :tag "Directory"
@@ -379,7 +379,7 @@ and the standard runtime location, and the value of the user-defined
379`ada-search-directories'.") 379`ada-search-directories'.")
380 380
381(defcustom ada-stmt-end-indent 0 381(defcustom ada-stmt-end-indent 0
382 "*Number of columns to indent the end of a statement on a separate line. 382 "Number of columns to indent the end of a statement on a separate line.
383 383
384An example is: 384An example is:
385 if A = B 385 if A = B
@@ -387,7 +387,7 @@ An example is:
387 :type 'integer :group 'ada) 387 :type 'integer :group 'ada)
388 388
389(defcustom ada-tab-policy 'indent-auto 389(defcustom ada-tab-policy 'indent-auto
390 "*Control the behavior of the TAB key. 390 "Control the behavior of the TAB key.
391Must be one of : 391Must be one of :
392`indent-rigidly' : always adds `ada-indent' blanks at the beginning of the line. 392`indent-rigidly' : always adds `ada-indent' blanks at the beginning of the line.
393`indent-auto' : use indentation functions in this file. 393`indent-auto' : use indentation functions in this file.
@@ -398,7 +398,7 @@ Must be one of :
398 :group 'ada) 398 :group 'ada)
399 399
400(defcustom ada-use-indent ada-broken-indent 400(defcustom ada-use-indent ada-broken-indent
401 "*Indentation for the lines in a 'use' statement. 401 "Indentation for the lines in a 'use' statement.
402 402
403An example is: 403An example is:
404 use Ada.Text_IO, 404 use Ada.Text_IO,
@@ -406,7 +406,7 @@ An example is:
406 :type 'integer :group 'ada) 406 :type 'integer :group 'ada)
407 407
408(defcustom ada-when-indent 3 408(defcustom ada-when-indent 3
409 "*Indentation for 'when' relative to 'exception' or 'case'. 409 "Indentation for 'when' relative to 'exception' or 'case'.
410 410
411An example is: 411An example is:
412 case A is 412 case A is
@@ -414,7 +414,7 @@ An example is:
414 :type 'integer :group 'ada) 414 :type 'integer :group 'ada)
415 415
416(defcustom ada-with-indent ada-broken-indent 416(defcustom ada-with-indent ada-broken-indent
417 "*Indentation for the lines in a 'with' statement. 417 "Indentation for the lines in a 'with' statement.
418 418
419An example is: 419An example is:
420 with Ada.Text_IO, 420 with Ada.Text_IO,
@@ -422,7 +422,7 @@ An example is:
422 :type 'integer :group 'ada) 422 :type 'integer :group 'ada)
423 423
424(defcustom ada-which-compiler 'gnat 424(defcustom ada-which-compiler 'gnat
425 "*Name of the compiler to use. 425 "Name of the compiler to use.
426This will determine what features are made available through the Ada mode. 426This will determine what features are made available through the Ada mode.
427The possible choices are: 427The possible choices are:
428`gnat': Use Ada Core Technologies' GNAT compiler. Add some cross-referencing 428`gnat': Use Ada Core Technologies' GNAT compiler. Add some cross-referencing
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 1e07ac4cf09..146cc703e1a 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -50,21 +50,21 @@
50 50
51;; ------ User variables 51;; ------ User variables
52(defcustom ada-xref-other-buffer t 52(defcustom ada-xref-other-buffer t
53 "*If nil, always display the cross-references in the same buffer. 53 "If nil, always display the cross-references in the same buffer.
54Otherwise create either a new buffer or a new frame." 54Otherwise create either a new buffer or a new frame."
55 :type 'boolean :group 'ada) 55 :type 'boolean :group 'ada)
56 56
57(defcustom ada-xref-create-ali nil 57(defcustom ada-xref-create-ali nil
58 "*If non-nil, run gcc whenever the cross-references are not up-to-date. 58 "If non-nil, run gcc whenever the cross-references are not up-to-date.
59If nil, the cross-reference mode never runs gcc." 59If nil, the cross-reference mode never runs gcc."
60 :type 'boolean :group 'ada) 60 :type 'boolean :group 'ada)
61 61
62(defcustom ada-xref-confirm-compile nil 62(defcustom ada-xref-confirm-compile nil
63 "*If non-nil, ask for confirmation before compiling or running the application." 63 "If non-nil, ask for confirmation before compiling or running the application."
64 :type 'boolean :group 'ada) 64 :type 'boolean :group 'ada)
65 65
66(defcustom ada-krunch-args "0" 66(defcustom ada-krunch-args "0"
67 "*Maximum number of characters for filenames created by `gnatkr'. 67 "Maximum number of characters for filenames created by `gnatkr'.
68Set to 0, if you don't use crunched filenames. This should be a string." 68Set to 0, if you don't use crunched filenames. This should be a string."
69 :type 'string :group 'ada) 69 :type 'string :group 'ada)
70 70
@@ -76,7 +76,7 @@ is faster, available from Ada mode web site."
76 :type 'string :group 'ada) 76 :type 'string :group 'ada)
77 77
78(defcustom ada-gnatls-args '("-v") 78(defcustom ada-gnatls-args '("-v")
79 "*Arguments to pass to `gnatls' to find location of the runtime. 79 "Arguments to pass to `gnatls' to find location of the runtime.
80Typical use is to pass `--RTS=soft-floats' on some systems that support it. 80Typical use is to pass `--RTS=soft-floats' on some systems that support it.
81 81
82You can also add `-I-' if you do not want the current directory to be included. 82You can also add `-I-' if you do not want the current directory to be included.
@@ -125,7 +125,7 @@ The command `gnatfind' is used every time you choose the menu
125(defcustom ada-prj-default-check-cmd 125(defcustom ada-prj-default-check-cmd
126 (concat "${cross_prefix}gnatmake -u -c -gnatc ${gnatmake_opt} ${full_current}" 126 (concat "${cross_prefix}gnatmake -u -c -gnatc ${gnatmake_opt} ${full_current}"
127 " -cargs ${comp_opt}") 127 " -cargs ${comp_opt}")
128 "*Default command to be used to compile a single file. 128 "Default command to be used to compile a single file.
129Emacs will substitute the current filename for ${full_current}, or add 129Emacs will substitute the current filename for ${full_current}, or add
130the filename at the end. This is the same syntax as in the project file." 130the filename at the end. This is the same syntax as in the project file."
131 :type 'string :group 'ada) 131 :type 'string :group 'ada)
@@ -133,35 +133,35 @@ the filename at the end. This is the same syntax as in the project file."
133(defcustom ada-prj-default-comp-cmd 133(defcustom ada-prj-default-comp-cmd
134 (concat "${cross_prefix}gnatmake -u -c ${gnatmake_opt} ${full_current} -cargs" 134 (concat "${cross_prefix}gnatmake -u -c ${gnatmake_opt} ${full_current} -cargs"
135 " ${comp_opt}") 135 " ${comp_opt}")
136 "*Default command to be used to compile a single file. 136 "Default command to be used to compile a single file.
137Emacs will substitute the current filename for ${full_current}, or add 137Emacs will substitute the current filename for ${full_current}, or add
138the filename at the end. This is the same syntax as in the project file." 138the filename at the end. This is the same syntax as in the project file."
139 :type 'string :group 'ada) 139 :type 'string :group 'ada)
140 140
141(defcustom ada-prj-default-debugger "${cross_prefix}gdb" 141(defcustom ada-prj-default-debugger "${cross_prefix}gdb"
142 "*Default name of the debugger." 142 "Default name of the debugger."
143 :type 'string :group 'ada) 143 :type 'string :group 'ada)
144 144
145(defcustom ada-prj-default-make-cmd 145(defcustom ada-prj-default-make-cmd
146 (concat "${cross_prefix}gnatmake -o ${main} ${main} ${gnatmake_opt} " 146 (concat "${cross_prefix}gnatmake -o ${main} ${main} ${gnatmake_opt} "
147 "-cargs ${comp_opt} -bargs ${bind_opt} -largs ${link_opt}") 147 "-cargs ${comp_opt} -bargs ${bind_opt} -largs ${link_opt}")
148 "*Default command to be used to compile the application. 148 "Default command to be used to compile the application.
149This is the same syntax as in the project file." 149This is the same syntax as in the project file."
150 :type 'string :group 'ada) 150 :type 'string :group 'ada)
151 151
152(defcustom ada-prj-default-project-file "" 152(defcustom ada-prj-default-project-file ""
153 "*Name of the current project file. 153 "Name of the current project file.
154Emacs will not try to use the search algorithm to find the project file if 154Emacs will not try to use the search algorithm to find the project file if
155this string is not empty. It is set whenever a project file is found." 155this string is not empty. It is set whenever a project file is found."
156 :type '(file :must-match t) :group 'ada) 156 :type '(file :must-match t) :group 'ada)
157 157
158(defcustom ada-gnatstub-opts "-q -I${src_dir}" 158(defcustom ada-gnatstub-opts "-q -I${src_dir}"
159 "*Options to pass to `gnatsub' to generate the body of a package. 159 "Options to pass to `gnatsub' to generate the body of a package.
160This has the same syntax as in the project file (with variable substitution)." 160This has the same syntax as in the project file (with variable substitution)."
161 :type 'string :group 'ada) 161 :type 'string :group 'ada)
162 162
163(defcustom ada-always-ask-project nil 163(defcustom ada-always-ask-project nil
164 "*If nil, use default values when no project file was found. 164 "If nil, use default values when no project file was found.
165Otherwise, ask the user for the name of the project file to use." 165Otherwise, ask the user for the name of the project file to use."
166 :type 'boolean :group 'ada) 166 :type 'boolean :group 'ada)
167 167
@@ -169,12 +169,12 @@ Otherwise, ask the user for the name of the project file to use."
169 "True if we are running on Windows.") 169 "True if we are running on Windows.")
170 170
171(defcustom ada-tight-gvd-integration nil 171(defcustom ada-tight-gvd-integration nil
172 "*If non-nil, a new Emacs frame will be swallowed in GVD when debugging. 172 "If non-nil, a new Emacs frame will be swallowed in GVD when debugging.
173If GVD is not the debugger used, nothing happens." 173If GVD is not the debugger used, nothing happens."
174 :type 'boolean :group 'ada) 174 :type 'boolean :group 'ada)
175 175
176(defcustom ada-xref-search-with-egrep t 176(defcustom ada-xref-search-with-egrep t
177 "*If non-nil, use egrep to find the possible declarations for an entity. 177 "If non-nil, use egrep to find the possible declarations for an entity.
178This alternate method is used when the exact location was not found in the 178This alternate method is used when the exact location was not found in the
179information provided by GNAT. However, it might be expensive if you have a lot 179information provided by GNAT. However, it might be expensive if you have a lot
180of sources, since it will search in all the files in your project." 180of sources, since it will search in all the files in your project."
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 9c9a8e09d49..345ca563906 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -269,7 +269,7 @@ greater than this number."
269 (integer :tag "Hidden if longer than" :value 3))) 269 (integer :tag "Hidden if longer than" :value 3)))
270 270
271(defcustom antlr-indent-comment 'tab 271(defcustom antlr-indent-comment 'tab
272 "*Non-nil, if the indentation should touch lines in block comments. 272 "Non-nil, if the indentation should touch lines in block comments.
273If nil, no continuation line of a block comment is changed. If t, they 273If nil, no continuation line of a block comment is changed. If t, they
274are changed according to `c-indentation-line'. When not nil and not t, 274are changed according to `c-indentation-line'. When not nil and not t,
275they are only changed by \\[antlr-indent-command]." 275they are only changed by \\[antlr-indent-command]."
@@ -296,7 +296,7 @@ ANTLR's and Java's indentation styles. Used by `antlr-set-tabs'."
296 (boolean :tag "Indent-tabs-mode")))) 296 (boolean :tag "Indent-tabs-mode"))))
297 297
298(defcustom antlr-indent-style "java" 298(defcustom antlr-indent-style "java"
299 "*If non-nil, cc-mode indentation style used for `antlr-mode'. 299 "If non-nil, cc-mode indentation style used for `antlr-mode'.
300See `c-set-style' and for details, where the most interesting part in 300See `c-set-style' and for details, where the most interesting part in
301`c-style-alist' is the value of `c-basic-offset'." 301`c-style-alist' is the value of `c-basic-offset'."
302 :group 'antlr 302 :group 'antlr
@@ -339,14 +339,14 @@ to the normal rules of `antlr-indent-line'."
339;;;=========================================================================== 339;;;===========================================================================
340 340
341(defcustom antlr-options-use-submenus t 341(defcustom antlr-options-use-submenus t
342 "*Non-nil, if the major mode menu should include option submenus. 342 "Non-nil, if the major mode menu should include option submenus.
343If nil, the menu just includes a command to insert options. Otherwise, 343If nil, the menu just includes a command to insert options. Otherwise,
344it includes four submenus to insert file/grammar/rule/subrule options." 344it includes four submenus to insert file/grammar/rule/subrule options."
345 :group 'antlr 345 :group 'antlr
346 :type 'boolean) 346 :type 'boolean)
347 347
348(defcustom antlr-tool-version 20701 348(defcustom antlr-tool-version 20701
349 "*The version number of the Antlr tool. 349 "The version number of the Antlr tool.
350The value is an integer of the form XYYZZ which stands for vX.YY.ZZ. 350The value is an integer of the form XYYZZ which stands for vX.YY.ZZ.
351This variable is used to warn about non-supported options and to supply 351This variable is used to warn about non-supported options and to supply
352version correct option values when using \\[antlr-insert-option]. 352version correct option values when using \\[antlr-insert-option].
@@ -358,7 +358,7 @@ can make this variable buffer-local."
358 :type 'integer) 358 :type 'integer)
359 359
360(defcustom antlr-options-auto-colon t 360(defcustom antlr-options-auto-colon t
361 "*Non-nil, if `:' is inserted with a rule or subrule options section. 361 "Non-nil, if `:' is inserted with a rule or subrule options section.
362A `:' is only inserted if this value is non-nil, if a rule or subrule 362A `:' is only inserted if this value is non-nil, if a rule or subrule
363option is inserted with \\[antlr-insert-option], if there was no rule or 363option is inserted with \\[antlr-insert-option], if there was no rule or
364subrule options section before, and if a `:' is not already present 364subrule options section before, and if a `:' is not already present
@@ -378,7 +378,7 @@ is `language-as-string'. See also `antlr-read-value'."
378 :type '(repeat (symbol :tag "Style symbol"))) 378 :type '(repeat (symbol :tag "Style symbol")))
379 379
380(defcustom antlr-options-push-mark t 380(defcustom antlr-options-push-mark t
381 "*Non-nil, if inserting an option should set & push mark. 381 "Non-nil, if inserting an option should set & push mark.
382If nil, never set mark when inserting an option with command 382If nil, never set mark when inserting an option with command
383\\[antlr-insert-option]. If t, always set mark via `push-mark'. If a 383\\[antlr-insert-option]. If t, always set mark via `push-mark'. If a
384number, only set mark if point was outside the options area before and 384number, only set mark if point was outside the options area before and
@@ -392,7 +392,7 @@ options area before."
392 (sexp :tag "If outside options" :format "%t" :value outside))) 392 (sexp :tag "If outside options" :format "%t" :value outside)))
393 393
394(defcustom antlr-options-assign-string " = " 394(defcustom antlr-options-assign-string " = "
395 "*String containing `=' to use between option name and value. 395 "String containing `=' to use between option name and value.
396This string is only used if the option to insert did not exist before 396This string is only used if the option to insert did not exist before
397or if there was no `=' after it. In other words, the spacing around an 397or if there was no `=' after it. In other words, the spacing around an
398existing `=' won't be changed when changing an option value." 398existing `=' won't be changed when changing an option value."
@@ -578,21 +578,21 @@ AS-STRING is non-nil and is either t or a symbol which is a member of
578;;;=========================================================================== 578;;;===========================================================================
579 579
580(defcustom antlr-tool-command "java antlr.Tool" 580(defcustom antlr-tool-command "java antlr.Tool"
581 "*Command used in \\[antlr-run-tool] to run the Antlr tool. 581 "Command used in \\[antlr-run-tool] to run the Antlr tool.
582This variable should include all options passed to Antlr except the 582This variable should include all options passed to Antlr except the
583option \"-glib\" which is automatically suggested if necessary." 583option \"-glib\" which is automatically suggested if necessary."
584 :group 'antlr 584 :group 'antlr
585 :type 'string) 585 :type 'string)
586 586
587(defcustom antlr-ask-about-save t 587(defcustom antlr-ask-about-save t
588 "*If not nil, \\[antlr-run-tool] asks which buffers to save. 588 "If not nil, \\[antlr-run-tool] asks which buffers to save.
589Otherwise, it saves all modified buffers before running without asking." 589Otherwise, it saves all modified buffers before running without asking."
590 :group 'antlr 590 :group 'antlr
591 :type 'boolean) 591 :type 'boolean)
592 592
593(defcustom antlr-makefile-specification 593(defcustom antlr-makefile-specification
594 '("\n" ("GENS" "GENS%d" " \\\n\t") "$(ANTLR)") 594 '("\n" ("GENS" "GENS%d" " \\\n\t") "$(ANTLR)")
595 "*Variable to specify the appearance of the generated makefile rules. 595 "Variable to specify the appearance of the generated makefile rules.
596This variable influences the output of \\[antlr-show-makefile-rules]. 596This variable influences the output of \\[antlr-show-makefile-rules].
597It looks like \(RULE-SEP GEN-VAR-SPEC COMMAND). 597It looks like \(RULE-SEP GEN-VAR-SPEC COMMAND).
598 598
@@ -650,7 +650,7 @@ See variable `antlr-file-formats-alist' for language dependent
650formats.") 650formats.")
651 651
652(defvar antlr-unknown-file-formats '("?%s?.g" "?%s?") 652(defvar antlr-unknown-file-formats '("?%s?.g" "?%s?")
653 "*Formats which specify the names of unknown files. 653 "Formats which specify the names of unknown files.
654The value looks like \(SUPER-GRAMMAR-FILE-FORMAT SUPER-EVOCAB-FORMAT). 654The value looks like \(SUPER-GRAMMAR-FILE-FORMAT SUPER-EVOCAB-FORMAT).
655 655
656SUPER-GRAMMAR-FORMAT is a format string, it specifies with substitution 656SUPER-GRAMMAR-FORMAT is a format string, it specifies with substitution
@@ -685,7 +685,7 @@ DIRECTORY is the name of the current directory.")
685;;;=========================================================================== 685;;;===========================================================================
686 686
687(defcustom antlr-imenu-name t ; (featurep 'xemacs) ; TODO: Emacs-21 bug? 687(defcustom antlr-imenu-name t ; (featurep 'xemacs) ; TODO: Emacs-21 bug?
688 "*Non-nil, if a \"Index\" menu should be added to the menubar. 688 "Non-nil, if a \"Index\" menu should be added to the menubar.
689If it is a string, it is used instead \"Index\". Requires package 689If it is a string, it is used instead \"Index\". Requires package
690imenu." 690imenu."
691 :group 'antlr 691 :group 'antlr
@@ -774,7 +774,7 @@ imenu."
774;;;=========================================================================== 774;;;===========================================================================
775 775
776(defcustom antlr-font-lock-maximum-decoration 'inherit 776(defcustom antlr-font-lock-maximum-decoration 'inherit
777 "*The maximum decoration level for fontifying actions. 777 "The maximum decoration level for fontifying actions.
778Value `none' means, do not fontify actions, just normal grammar code 778Value `none' means, do not fontify actions, just normal grammar code
779according to `antlr-font-lock-additional-keywords'. Value `inherit' 779according to `antlr-font-lock-additional-keywords'. Value `inherit'
780means, use value of `font-lock-maximum-decoration'. Any other value is 780means, use value of `font-lock-maximum-decoration'. Any other value is
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index cfa977d9022..5e15371b406 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -53,7 +53,7 @@
53 :group 'languages) 53 :group 'languages)
54 54
55(defcustom asm-comment-char ?\; 55(defcustom asm-comment-char ?\;
56 "*The comment-start character assumed by Asm mode." 56 "The comment-start character assumed by Asm mode."
57 :type 'character 57 :type 'character
58 :group 'asm) 58 :group 'asm)
59 59
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 4e9a10e3ceb..64e99fb1f3d 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -54,7 +54,7 @@
54 :group 'languages) 54 :group 'languages)
55 55
56(defcustom cfengine-indent 2 56(defcustom cfengine-indent 2
57 "*Size of a CFEngine indentation step in columns." 57 "Size of a CFEngine indentation step in columns."
58 :group 'cfengine 58 :group 'cfengine
59 :type 'integer) 59 :type 'integer)
60 60
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 88c36e8c452..0feefd99715 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -106,12 +106,12 @@
106 106
107 107
108(defcustom c-macro-shrink-window-flag nil 108(defcustom c-macro-shrink-window-flag nil
109 "*Non-nil means shrink the *Macroexpansion* window to fit its contents." 109 "Non-nil means shrink the *Macroexpansion* window to fit its contents."
110 :type 'boolean 110 :type 'boolean
111 :group 'c-macro) 111 :group 'c-macro)
112 112
113(defcustom c-macro-prompt-flag nil 113(defcustom c-macro-prompt-flag nil
114 "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments." 114 "Non-nil makes `c-macro-expand' prompt for preprocessor arguments."
115 :type 'boolean 115 :type 'boolean
116 :group 'c-macro) 116 :group 'c-macro)
117 117
@@ -141,7 +141,7 @@ option, or to set an equivalent one."
141 :group 'c-macro) 141 :group 'c-macro)
142 142
143(defcustom c-macro-cppflags "" 143(defcustom c-macro-cppflags ""
144 "*Preprocessor flags used by `c-macro-expand'." 144 "Preprocessor flags used by `c-macro-expand'."
145 :type 'string 145 :type 'string
146 :group 'c-macro) 146 :group 'c-macro)
147 147
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index c1d8f9db23f..2608ba0b0c3 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -78,7 +78,7 @@ after `call-process' inserts the grep output into the buffer.")
78This is bound before running `compilation-filter-hook'.") 78This is bound before running `compilation-filter-hook'.")
79 79
80(defvar compilation-first-column 1 80(defvar compilation-first-column 1
81 "*This is how compilers number the first column, usually 1 or 0. 81 "This is how compilers number the first column, usually 1 or 0.
82If this is buffer-local in the destination buffer, Emacs obeys 82If this is buffer-local in the destination buffer, Emacs obeys
83that value, otherwise it uses the value in the *compilation* 83that value, otherwise it uses the value in the *compilation*
84buffer. This enables a major-mode to specify its own value.") 84buffer. This enables a major-mode to specify its own value.")
@@ -90,7 +90,7 @@ in the compilation output, and should return a transformed file name.")
90 90
91;;;###autoload 91;;;###autoload
92(defvar compilation-process-setup-function nil 92(defvar compilation-process-setup-function nil
93 "*Function to call to customize the compilation process. 93 "Function to call to customize the compilation process.
94This function is called immediately before the compilation process is 94This function is called immediately before the compilation process is
95started. It can be used to set any variables or functions that are used 95started. It can be used to set any variables or functions that are used
96while processing the output of the compilation process.") 96while processing the output of the compilation process.")
@@ -633,7 +633,7 @@ This only affects platforms that support asynchronous processes (see
633(defvar compilation-locs ()) 633(defvar compilation-locs ())
634 634
635(defvar compilation-debug nil 635(defvar compilation-debug nil
636 "*Set this to t before creating a *compilation* buffer. 636 "Set this to t before creating a *compilation* buffer.
637Then every error line will have a debug text property with the matcher that 637Then every error line will have a debug text property with the matcher that
638fit this line and the match data. Use `describe-text-properties'.") 638fit this line and the match data. Use `describe-text-properties'.")
639 639
@@ -739,7 +739,7 @@ Faces `compilation-error-face', `compilation-warning-face',
739;; (make-variable-buffer-local 'compilation-buffer-modtime) 739;; (make-variable-buffer-local 'compilation-buffer-modtime)
740 740
741(defvar compilation-skip-to-next-location t 741(defvar compilation-skip-to-next-location t
742 "*If non-nil, skip multiple error messages for the same source location.") 742 "If non-nil, skip multiple error messages for the same source location.")
743 743
744(defcustom compilation-skip-threshold 1 744(defcustom compilation-skip-threshold 1
745 "Compilation motion commands skip less important messages. 745 "Compilation motion commands skip less important messages.
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 8ecfe79de3b..1b36fe2800d 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -52,7 +52,7 @@
52 :prefix "cpp-") 52 :prefix "cpp-")
53 53
54(defcustom cpp-config-file (convert-standard-filename ".cpp.el") 54(defcustom cpp-config-file (convert-standard-filename ".cpp.el")
55 "*File name to save cpp configuration." 55 "File name to save cpp configuration."
56 :type 'file 56 :type 'file
57 :group 'cpp) 57 :group 'cpp)
58 58
@@ -61,17 +61,17 @@
61 :type '(choice (const invisible) (face))) 61 :type '(choice (const invisible) (face)))
62 62
63(defcustom cpp-known-face 'invisible 63(defcustom cpp-known-face 'invisible
64 "*Face used for known cpp symbols." 64 "Face used for known cpp symbols."
65 :type 'cpp-face 65 :type 'cpp-face
66 :group 'cpp) 66 :group 'cpp)
67 67
68(defcustom cpp-unknown-face 'highlight 68(defcustom cpp-unknown-face 'highlight
69 "*Face used for unknown cpp symbols." 69 "Face used for unknown cpp symbols."
70 :type 'cpp-face 70 :type 'cpp-face
71 :group 'cpp) 71 :group 'cpp)
72 72
73(defcustom cpp-face-type 'light 73(defcustom cpp-face-type 'light
74 "*Indicate what background face type you prefer. 74 "Indicate what background face type you prefer.
75Can be either light or dark for color screens, mono for monochrome 75Can be either light or dark for color screens, mono for monochrome
76screens, and none if you don't use a window system and don't have 76screens, and none if you don't use a window system and don't have
77a color-capable display." 77a color-capable display."
@@ -80,12 +80,12 @@ a color-capable display."
80 :group 'cpp) 80 :group 'cpp)
81 81
82(defcustom cpp-known-writable t 82(defcustom cpp-known-writable t
83 "*Non-nil means you are allowed to modify the known conditionals." 83 "Non-nil means you are allowed to modify the known conditionals."
84 :type 'boolean 84 :type 'boolean
85 :group 'cpp) 85 :group 'cpp)
86 86
87(defcustom cpp-unknown-writable t 87(defcustom cpp-unknown-writable t
88 "*Non-nil means you are allowed to modify the unknown conditionals." 88 "Non-nil means you are allowed to modify the unknown conditionals."
89 :type 'boolean 89 :type 'boolean
90 :group 'cpp) 90 :group 'cpp)
91 91
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 74ca5a6d76f..3e99f3c9176 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -120,7 +120,7 @@
120 :group 'faces) 120 :group 'faces)
121 121
122(defvar cwarn-mode nil 122(defvar cwarn-mode nil
123 "*Non-nil when Cwarn mode is active. 123 "Non-nil when Cwarn mode is active.
124 124
125Never set this variable directly, use the command `cwarn-mode' 125Never set this variable directly, use the command `cwarn-mode'
126instead.") 126instead.")
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 166065131b2..af0ae9d1123 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -98,7 +98,7 @@ Presently this includes some syntax, .OP.erators, and \"f$\" lexicals.")
98 :group 'languages) 98 :group 'languages)
99 99
100(defcustom dcl-basic-offset 4 100(defcustom dcl-basic-offset 4
101 "*Number of columns to indent a block in DCL. 101 "Number of columns to indent a block in DCL.
102A block is the commands between THEN-ELSE-ENDIF and between the commands 102A block is the commands between THEN-ELSE-ENDIF and between the commands
103dcl-block-begin-regexp and dcl-block-end-regexp. 103dcl-block-begin-regexp and dcl-block-end-regexp.
104 104
@@ -109,7 +109,7 @@ dcl-calc-command-indent-function is set to a function."
109 109
110 110
111(defcustom dcl-continuation-offset 6 111(defcustom dcl-continuation-offset 6
112 "*Number of columns to indent a continuation line in DCL. 112 "Number of columns to indent a continuation line in DCL.
113A continuation line is a line that follows a line ending with `-'. 113A continuation line is a line that follows a line ending with `-'.
114 114
115The meaning of this variable may be changed if 115The meaning of this variable may be changed if
@@ -119,7 +119,7 @@ dcl-calc-cont-indent-function is set to a function."
119 119
120 120
121(defcustom dcl-margin-offset 8 121(defcustom dcl-margin-offset 8
122 "*Indentation for the first command line in DCL. 122 "Indentation for the first command line in DCL.
123The first command line in a file or after a SUBROUTINE statement is indented 123The first command line in a file or after a SUBROUTINE statement is indented
124this much. Other command lines are indented the same number of columns as 124this much. Other command lines are indented the same number of columns as
125the preceding command line. 125the preceding command line.
@@ -129,7 +129,7 @@ A command line is a line that starts with `$'."
129 129
130 130
131(defcustom dcl-margin-label-offset 2 131(defcustom dcl-margin-label-offset 2
132 "*Number of columns to indent a margin label in DCL. 132 "Number of columns to indent a margin label in DCL.
133A margin label is a label that doesn't begin or end a block, i.e. it 133A margin label is a label that doesn't begin or end a block, i.e. it
134doesn't match dcl-block-begin-regexp or dcl-block-end-regexp." 134doesn't match dcl-block-begin-regexp or dcl-block-end-regexp."
135 :type 'integer 135 :type 'integer
@@ -137,28 +137,28 @@ doesn't match dcl-block-begin-regexp or dcl-block-end-regexp."
137 137
138 138
139(defcustom dcl-comment-line-regexp "^\\$!" 139(defcustom dcl-comment-line-regexp "^\\$!"
140 "*Regexp describing the start of a comment line in DCL. 140 "Regexp describing the start of a comment line in DCL.
141Comment lines are not indented." 141Comment lines are not indented."
142 :type 'regexp 142 :type 'regexp
143 :group 'dcl) 143 :group 'dcl)
144 144
145 145
146(defcustom dcl-block-begin-regexp "loop[0-9]*:" 146(defcustom dcl-block-begin-regexp "loop[0-9]*:"
147 "*Regexp describing a command that begins an indented block in DCL. 147 "Regexp describing a command that begins an indented block in DCL.
148Set to nil to only indent at THEN-ELSE-ENDIF." 148Set to nil to only indent at THEN-ELSE-ENDIF."
149 :type 'regexp 149 :type 'regexp
150 :group 'dcl) 150 :group 'dcl)
151 151
152 152
153(defcustom dcl-block-end-regexp "endloop[0-9]*:" 153(defcustom dcl-block-end-regexp "endloop[0-9]*:"
154 "*Regexp describing a command that ends an indented block in DCL. 154 "Regexp describing a command that ends an indented block in DCL.
155Set to nil to only indent at THEN-ELSE-ENDIF." 155Set to nil to only indent at THEN-ELSE-ENDIF."
156 :type 'regexp 156 :type 'regexp
157 :group 'dcl) 157 :group 'dcl)
158 158
159 159
160(defcustom dcl-calc-command-indent-function nil 160(defcustom dcl-calc-command-indent-function nil
161 "*Function to calculate indentation for a command line in DCL. 161 "Function to calculate indentation for a command line in DCL.
162If this variable is non-nil it is called as a function: 162If this variable is non-nil it is called as a function:
163 163
164\(func INDENT-TYPE CUR-INDENT EXTRA-INDENT LAST-POINT THIS-POINT) 164\(func INDENT-TYPE CUR-INDENT EXTRA-INDENT LAST-POINT THIS-POINT)
@@ -190,7 +190,7 @@ This package includes two functions suitable for this:
190 190
191 191
192(defcustom dcl-calc-cont-indent-function 'dcl-calc-cont-indent-relative 192(defcustom dcl-calc-cont-indent-function 'dcl-calc-cont-indent-relative
193 "*Function to calculate indentation for a continuation line. 193 "Function to calculate indentation for a continuation line.
194If this variable is non-nil it is called as a function: 194If this variable is non-nil it is called as a function:
195 195
196\(func CUR-INDENT EXTRA-INDENT) 196\(func CUR-INDENT EXTRA-INDENT)
@@ -208,7 +208,7 @@ This package includes one function suitable for this:
208 208
209 209
210(defcustom dcl-tab-always-indent t 210(defcustom dcl-tab-always-indent t
211 "*Controls the operation of the TAB key in DCL mode. 211 "Controls the operation of the TAB key in DCL mode.
212If t, pressing TAB always indents the current line. 212If t, pressing TAB always indents the current line.
213If nil, pressing TAB indents the current line if point is at the left margin. 213If nil, pressing TAB indents the current line if point is at the left margin.
214Data lines (i.e. lines not part of a command line or continuation line) are 214Data lines (i.e. lines not part of a command line or continuation line) are
@@ -218,43 +218,43 @@ never indented."
218 218
219 219
220(defcustom dcl-electric-characters t 220(defcustom dcl-electric-characters t
221 "*Non-nil means reindent immediately when a label, ELSE or ENDIF is inserted." 221 "Non-nil means reindent immediately when a label, ELSE or ENDIF is inserted."
222 :type 'boolean 222 :type 'boolean
223 :group 'dcl) 223 :group 'dcl)
224 224
225 225
226(defcustom dcl-tempo-comma ", " 226(defcustom dcl-tempo-comma ", "
227 "*Text to insert when a comma is needed in a template, in DCL mode." 227 "Text to insert when a comma is needed in a template, in DCL mode."
228 :type 'string 228 :type 'string
229 :group 'dcl) 229 :group 'dcl)
230 230
231(defcustom dcl-tempo-left-paren "(" 231(defcustom dcl-tempo-left-paren "("
232 "*Text to insert when a left parenthesis is needed in a template in DCL." 232 "Text to insert when a left parenthesis is needed in a template in DCL."
233 :type 'string 233 :type 'string
234 :group 'dcl) 234 :group 'dcl)
235 235
236 236
237(defcustom dcl-tempo-right-paren ")" 237(defcustom dcl-tempo-right-paren ")"
238 "*Text to insert when a right parenthesis is needed in a template in DCL." 238 "Text to insert when a right parenthesis is needed in a template in DCL."
239 :type 'string 239 :type 'string
240 :group 'dcl) 240 :group 'dcl)
241 241
242; I couldn't decide what looked best, so I'll let you decide... 242; I couldn't decide what looked best, so I'll let you decide...
243; Remember, you can also customize this with imenu-submenu-name-format. 243; Remember, you can also customize this with imenu-submenu-name-format.
244(defcustom dcl-imenu-label-labels "Labels" 244(defcustom dcl-imenu-label-labels "Labels"
245 "*Imenu menu title for sub-listing with label names." 245 "Imenu menu title for sub-listing with label names."
246 :type 'string 246 :type 'string
247 :group 'dcl) 247 :group 'dcl)
248(defcustom dcl-imenu-label-goto "GOTO" 248(defcustom dcl-imenu-label-goto "GOTO"
249 "*Imenu menu title for sub-listing with GOTO statements." 249 "Imenu menu title for sub-listing with GOTO statements."
250 :type 'string 250 :type 'string
251 :group 'dcl) 251 :group 'dcl)
252(defcustom dcl-imenu-label-gosub "GOSUB" 252(defcustom dcl-imenu-label-gosub "GOSUB"
253 "*Imenu menu title for sub-listing with GOSUB statements." 253 "Imenu menu title for sub-listing with GOSUB statements."
254 :type 'string 254 :type 'string
255 :group 'dcl) 255 :group 'dcl)
256(defcustom dcl-imenu-label-call "CALL" 256(defcustom dcl-imenu-label-call "CALL"
257 "*Imenu menu title for sub-listing with CALL statements." 257 "Imenu menu title for sub-listing with CALL statements."
258 :type 'string 258 :type 'string
259 :group 'dcl) 259 :group 'dcl)
260 260
@@ -265,7 +265,7 @@ never indented."
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
271sub-listings for other labels, CALL, GOTO and GOSUB statements. 271sub-listings for other labels, CALL, GOTO and GOSUB statements.
@@ -275,7 +275,7 @@ See `imenu-generic-expression' for details."
275 275
276 276
277(defcustom dcl-mode-hook nil 277(defcustom dcl-mode-hook nil
278 "*Hook called by `dcl-mode'." 278 "Hook called by `dcl-mode'."
279 :type 'hook 279 :type 'hook
280 :group 'dcl) 280 :group 'dcl)
281 281
@@ -400,7 +400,7 @@ optionally followed by a comment, followed by a newline."
400 400
401(defcustom dcl-electric-reindent-regexps 401(defcustom dcl-electric-reindent-regexps
402 (list "endif" "else" dcl-label-r) 402 (list "endif" "else" dcl-label-r)
403 "*Regexps that can trigger an electric reindent. 403 "Regexps that can trigger an electric reindent.
404A list of regexps that will trigger a reindent if the last letter 404A list of regexps that will trigger a reindent if the last letter
405is defined as dcl-electric-character. 405is defined as dcl-electric-character.
406 406
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index dd8d267683c..d533135c70d 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -74,7 +74,7 @@
74 "True if in debug mode.") 74 "True if in debug mode.")
75 75
76(defcustom delphi-search-path "." 76(defcustom delphi-search-path "."
77 "*Directories to search when finding external units. 77 "Directories to search when finding external units.
78It is a list of directory strings. If only a single directory, 78It is a list of directory strings. If only a single directory,
79it can be a single string instead of a list. If a directory 79it can be a single string instead of a list. If a directory
80ends in \"...\" then that directory is recursively searched." 80ends in \"...\" then that directory is recursively searched."
@@ -82,7 +82,7 @@ ends in \"...\" then that directory is recursively searched."
82 :group 'delphi) 82 :group 'delphi)
83 83
84(defcustom delphi-indent-level 3 84(defcustom delphi-indent-level 3
85 "*Indentation of Delphi statements with respect to containing block. 85 "Indentation of Delphi statements with respect to containing block.
86E.g. 86E.g.
87 87
88begin 88begin
@@ -92,7 +92,7 @@ end;"
92 :group 'delphi) 92 :group 'delphi)
93 93
94(defcustom delphi-compound-block-indent 0 94(defcustom delphi-compound-block-indent 0
95 "*Extra indentation for blocks in compound statements. E.g. 95 "Extra indentation for blocks in compound statements. E.g.
96 96
97// block indent = 0 vs // block indent = 2 97// block indent = 0 vs // block indent = 2
98if b then if b then 98if b then if b then
@@ -105,7 +105,7 @@ end; else
105 :group 'delphi) 105 :group 'delphi)
106 106
107(defcustom delphi-case-label-indent delphi-indent-level 107(defcustom delphi-case-label-indent delphi-indent-level
108 "*Extra indentation for case statement labels. E.g. 108 "Extra indentation for case statement labels. E.g.
109 109
110// case indent = 0 vs // case indent = 3 110// case indent = 0 vs // case indent = 3
111case value of case value of 111case value of case value of
@@ -118,18 +118,18 @@ end; end;"
118 :group 'delphi) 118 :group 'delphi)
119 119
120(defcustom delphi-verbose t ; nil 120(defcustom delphi-verbose t ; nil
121 "*If true then Delphi token processing progress is reported to the user." 121 "If true then Delphi token processing progress is reported to the user."
122 :type 'boolean 122 :type 'boolean
123 :group 'delphi) 123 :group 'delphi)
124 124
125(defcustom delphi-tab-always-indents t 125(defcustom delphi-tab-always-indents t
126 "*Non-nil means TAB in Delphi mode should always reindent the current line, 126 "Non-nil means TAB in Delphi mode should always reindent the current line,
127regardless of where in the line point is when the TAB command is used." 127regardless of where in the line point is when the TAB command is used."
128 :type 'boolean 128 :type 'boolean
129 :group 'delphi) 129 :group 'delphi)
130 130
131(defcustom delphi-newline-always-indents t 131(defcustom delphi-newline-always-indents t
132 "*Non-nil means NEWLINE in Delphi mode should always reindent the current 132 "Non-nil means NEWLINE in Delphi mode should always reindent the current
133line, insert a blank line and move to the default indent column of the blank 133line, insert a blank line and move to the default indent column of the blank
134line. If nil, then no indentation occurs, and NEWLINE does the usual 134line. If nil, then no indentation occurs, and NEWLINE does the usual
135behavior. This is useful when one needs to do customized indentation that 135behavior. This is useful when one needs to do customized indentation that
@@ -138,22 +138,22 @@ differs from the default."
138 :group 'delphi) 138 :group 'delphi)
139 139
140(defcustom delphi-comment-face 'font-lock-comment-face 140(defcustom delphi-comment-face 'font-lock-comment-face
141 "*Face used to color Delphi comments." 141 "Face used to color Delphi comments."
142 :type 'face 142 :type 'face
143 :group 'delphi) 143 :group 'delphi)
144 144
145(defcustom delphi-string-face 'font-lock-string-face 145(defcustom delphi-string-face 'font-lock-string-face
146 "*Face used to color Delphi strings." 146 "Face used to color Delphi strings."
147 :type 'face 147 :type 'face
148 :group 'delphi) 148 :group 'delphi)
149 149
150(defcustom delphi-keyword-face 'font-lock-keyword-face 150(defcustom delphi-keyword-face 'font-lock-keyword-face
151 "*Face used to color Delphi keywords." 151 "Face used to color Delphi keywords."
152 :type 'face 152 :type 'face
153 :group 'delphi) 153 :group 'delphi)
154 154
155(defcustom delphi-other-face nil 155(defcustom delphi-other-face nil
156 "*Face used to color everything else." 156 "Face used to color everything else."
157 :type '(choice (const :tag "None" nil) face) 157 :type '(choice (const :tag "None" nil) face)
158 :group 'delphi) 158 :group 'delphi)
159 159
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 5d0bfad0366..05c9e160ceb 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1276,14 +1276,14 @@ Elements of ALIST that are not conses are ignored."
1276 1276
1277 1277
1278(defcustom ebnf-horizontal-orientation nil 1278(defcustom ebnf-horizontal-orientation nil
1279 "*Non-nil means productions are drawn horizontally." 1279 "Non-nil means productions are drawn horizontally."
1280 :type 'boolean 1280 :type 'boolean
1281 :version "20" 1281 :version "20"
1282 :group 'ebnf-displacement) 1282 :group 'ebnf-displacement)
1283 1283
1284 1284
1285(defcustom ebnf-horizontal-max-height nil 1285(defcustom ebnf-horizontal-max-height nil
1286 "*Non-nil means to use maximum production height in horizontal orientation. 1286 "Non-nil means to use maximum production height in horizontal orientation.
1287 1287
1288It is only used when `ebnf-horizontal-orientation' is non-nil." 1288It is only used when `ebnf-horizontal-orientation' is non-nil."
1289 :type 'boolean 1289 :type 'boolean
@@ -1292,7 +1292,7 @@ It is only used when `ebnf-horizontal-orientation' is non-nil."
1292 1292
1293 1293
1294(defcustom ebnf-production-horizontal-space 0.0 ; use ebnf2ps default value 1294(defcustom ebnf-production-horizontal-space 0.0 ; use ebnf2ps default value
1295 "*Specify horizontal space in points between productions. 1295 "Specify horizontal space in points between productions.
1296 1296
1297Value less or equal to zero forces ebnf2ps to set a proper default value." 1297Value less or equal to zero forces ebnf2ps to set a proper default value."
1298 :type 'number 1298 :type 'number
@@ -1301,7 +1301,7 @@ Value less or equal to zero forces ebnf2ps to set a proper default value."
1301 1301
1302 1302
1303(defcustom ebnf-production-vertical-space 0.0 ; use ebnf2ps default value 1303(defcustom ebnf-production-vertical-space 0.0 ; use ebnf2ps default value
1304 "*Specify vertical space in points between productions. 1304 "Specify vertical space in points between productions.
1305 1305
1306Value less or equal to zero forces ebnf2ps to set a proper default value." 1306Value less or equal to zero forces ebnf2ps to set a proper default value."
1307 :type 'number 1307 :type 'number
@@ -1310,7 +1310,7 @@ Value less or equal to zero forces ebnf2ps to set a proper default value."
1310 1310
1311 1311
1312(defcustom ebnf-justify-sequence 'center 1312(defcustom ebnf-justify-sequence 'center
1313 "*Specify justification of terms in a sequence inside alternatives. 1313 "Specify justification of terms in a sequence inside alternatives.
1314 1314
1315Valid values are: 1315Valid values are:
1316 1316
@@ -1324,14 +1324,14 @@ Valid values are:
1324 1324
1325 1325
1326(defcustom ebnf-special-show-delimiter t 1326(defcustom ebnf-special-show-delimiter t
1327 "*Non-nil means special delimiter (character `?') is shown." 1327 "Non-nil means special delimiter (character `?') is shown."
1328 :type 'boolean 1328 :type 'boolean
1329 :version "20" 1329 :version "20"
1330 :group 'ebnf-special) 1330 :group 'ebnf-special)
1331 1331
1332 1332
1333(defcustom ebnf-special-font '(7 Courier "Black" "Gray95" bold italic) 1333(defcustom ebnf-special-font '(7 Courier "Black" "Gray95" bold italic)
1334 "*Specify special font. 1334 "Specify special font.
1335 1335
1336See documentation for `ebnf-production-font'." 1336See documentation for `ebnf-production-font'."
1337 :type '(list :tag "Special Font" 1337 :type '(list :tag "Special Font"
@@ -1353,7 +1353,7 @@ See documentation for `ebnf-production-font'."
1353 1353
1354 1354
1355(defcustom ebnf-special-shape 'bevel 1355(defcustom ebnf-special-shape 'bevel
1356 "*Specify special box shape. 1356 "Specify special box shape.
1357 1357
1358See documentation for `ebnf-non-terminal-shape'." 1358See documentation for `ebnf-non-terminal-shape'."
1359 :type '(radio :tag "Special Shape" 1359 :type '(radio :tag "Special Shape"
@@ -1363,28 +1363,28 @@ See documentation for `ebnf-non-terminal-shape'."
1363 1363
1364 1364
1365(defcustom ebnf-special-shadow nil 1365(defcustom ebnf-special-shadow nil
1366 "*Non-nil means special box will have a shadow." 1366 "Non-nil means special box will have a shadow."
1367 :type 'boolean 1367 :type 'boolean
1368 :version "20" 1368 :version "20"
1369 :group 'ebnf-special) 1369 :group 'ebnf-special)
1370 1370
1371 1371
1372(defcustom ebnf-special-border-width 0.5 1372(defcustom ebnf-special-border-width 0.5
1373 "*Specify border width for special box." 1373 "Specify border width for special box."
1374 :type 'number 1374 :type 'number
1375 :version "20" 1375 :version "20"
1376 :group 'ebnf-special) 1376 :group 'ebnf-special)
1377 1377
1378 1378
1379(defcustom ebnf-special-border-color "Black" 1379(defcustom ebnf-special-border-color "Black"
1380 "*Specify border color for special box." 1380 "Specify border color for special box."
1381 :type 'string 1381 :type 'string
1382 :version "20" 1382 :version "20"
1383 :group 'ebnf-special) 1383 :group 'ebnf-special)
1384 1384
1385 1385
1386(defcustom ebnf-except-font '(7 Courier "Black" "Gray90" bold italic) 1386(defcustom ebnf-except-font '(7 Courier "Black" "Gray90" bold italic)
1387 "*Specify except font. 1387 "Specify except font.
1388 1388
1389See documentation for `ebnf-production-font'." 1389See documentation for `ebnf-production-font'."
1390 :type '(list :tag "Except Font" 1390 :type '(list :tag "Except Font"
@@ -1406,7 +1406,7 @@ See documentation for `ebnf-production-font'."
1406 1406
1407 1407
1408(defcustom ebnf-except-shape 'bevel 1408(defcustom ebnf-except-shape 'bevel
1409 "*Specify except box shape. 1409 "Specify except box shape.
1410 1410
1411See documentation for `ebnf-non-terminal-shape'." 1411See documentation for `ebnf-non-terminal-shape'."
1412 :type '(radio :tag "Except Shape" 1412 :type '(radio :tag "Except Shape"
@@ -1416,28 +1416,28 @@ See documentation for `ebnf-non-terminal-shape'."
1416 1416
1417 1417
1418(defcustom ebnf-except-shadow nil 1418(defcustom ebnf-except-shadow nil
1419 "*Non-nil means except box will have a shadow." 1419 "Non-nil means except box will have a shadow."
1420 :type 'boolean 1420 :type 'boolean
1421 :version "20" 1421 :version "20"
1422 :group 'ebnf-except) 1422 :group 'ebnf-except)
1423 1423
1424 1424
1425(defcustom ebnf-except-border-width 0.25 1425(defcustom ebnf-except-border-width 0.25
1426 "*Specify border width for except box." 1426 "Specify border width for except box."
1427 :type 'number 1427 :type 'number
1428 :version "20" 1428 :version "20"
1429 :group 'ebnf-except) 1429 :group 'ebnf-except)
1430 1430
1431 1431
1432(defcustom ebnf-except-border-color "Black" 1432(defcustom ebnf-except-border-color "Black"
1433 "*Specify border color for except box." 1433 "Specify border color for except box."
1434 :type 'string 1434 :type 'string
1435 :version "20" 1435 :version "20"
1436 :group 'ebnf-except) 1436 :group 'ebnf-except)
1437 1437
1438 1438
1439(defcustom ebnf-repeat-font '(7 Courier "Black" "Gray85" bold italic) 1439(defcustom ebnf-repeat-font '(7 Courier "Black" "Gray85" bold italic)
1440 "*Specify repeat font. 1440 "Specify repeat font.
1441 1441
1442See documentation for `ebnf-production-font'." 1442See documentation for `ebnf-production-font'."
1443 :type '(list :tag "Repeat Font" 1443 :type '(list :tag "Repeat Font"
@@ -1459,7 +1459,7 @@ See documentation for `ebnf-production-font'."
1459 1459
1460 1460
1461(defcustom ebnf-repeat-shape 'bevel 1461(defcustom ebnf-repeat-shape 'bevel
1462 "*Specify repeat box shape. 1462 "Specify repeat box shape.
1463 1463
1464See documentation for `ebnf-non-terminal-shape'." 1464See documentation for `ebnf-non-terminal-shape'."
1465 :type '(radio :tag "Repeat Shape" 1465 :type '(radio :tag "Repeat Shape"
@@ -1469,28 +1469,28 @@ See documentation for `ebnf-non-terminal-shape'."
1469 1469
1470 1470
1471(defcustom ebnf-repeat-shadow nil 1471(defcustom ebnf-repeat-shadow nil
1472 "*Non-nil means repeat box will have a shadow." 1472 "Non-nil means repeat box will have a shadow."
1473 :type 'boolean 1473 :type 'boolean
1474 :version "20" 1474 :version "20"
1475 :group 'ebnf-repeat) 1475 :group 'ebnf-repeat)
1476 1476
1477 1477
1478(defcustom ebnf-repeat-border-width 0.0 1478(defcustom ebnf-repeat-border-width 0.0
1479 "*Specify border width for repeat box." 1479 "Specify border width for repeat box."
1480 :type 'number 1480 :type 'number
1481 :version "20" 1481 :version "20"
1482 :group 'ebnf-repeat) 1482 :group 'ebnf-repeat)
1483 1483
1484 1484
1485(defcustom ebnf-repeat-border-color "Black" 1485(defcustom ebnf-repeat-border-color "Black"
1486 "*Specify border color for repeat box." 1486 "Specify border color for repeat box."
1487 :type 'string 1487 :type 'string
1488 :version "20" 1488 :version "20"
1489 :group 'ebnf-repeat) 1489 :group 'ebnf-repeat)
1490 1490
1491 1491
1492(defcustom ebnf-terminal-font '(7 Courier "Black" "White") 1492(defcustom ebnf-terminal-font '(7 Courier "Black" "White")
1493 "*Specify terminal font. 1493 "Specify terminal font.
1494 1494
1495See documentation for `ebnf-production-font'." 1495See documentation for `ebnf-production-font'."
1496 :type '(list :tag "Terminal Font" 1496 :type '(list :tag "Terminal Font"
@@ -1512,7 +1512,7 @@ See documentation for `ebnf-production-font'."
1512 1512
1513 1513
1514(defcustom ebnf-terminal-shape 'miter 1514(defcustom ebnf-terminal-shape 'miter
1515 "*Specify terminal box shape. 1515 "Specify terminal box shape.
1516 1516
1517See documentation for `ebnf-non-terminal-shape'." 1517See documentation for `ebnf-non-terminal-shape'."
1518 :type '(radio :tag "Terminal Shape" 1518 :type '(radio :tag "Terminal Shape"
@@ -1522,35 +1522,35 @@ See documentation for `ebnf-non-terminal-shape'."
1522 1522
1523 1523
1524(defcustom ebnf-terminal-shadow nil 1524(defcustom ebnf-terminal-shadow nil
1525 "*Non-nil means terminal box will have a shadow." 1525 "Non-nil means terminal box will have a shadow."
1526 :type 'boolean 1526 :type 'boolean
1527 :version "20" 1527 :version "20"
1528 :group 'ebnf-terminal) 1528 :group 'ebnf-terminal)
1529 1529
1530 1530
1531(defcustom ebnf-terminal-border-width 1.0 1531(defcustom ebnf-terminal-border-width 1.0
1532 "*Specify border width for terminal box." 1532 "Specify border width for terminal box."
1533 :type 'number 1533 :type 'number
1534 :version "20" 1534 :version "20"
1535 :group 'ebnf-terminal) 1535 :group 'ebnf-terminal)
1536 1536
1537 1537
1538(defcustom ebnf-terminal-border-color "Black" 1538(defcustom ebnf-terminal-border-color "Black"
1539 "*Specify border color for terminal box." 1539 "Specify border color for terminal box."
1540 :type 'string 1540 :type 'string
1541 :version "20" 1541 :version "20"
1542 :group 'ebnf-terminal) 1542 :group 'ebnf-terminal)
1543 1543
1544 1544
1545(defcustom ebnf-production-name-p t 1545(defcustom ebnf-production-name-p t
1546 "*Non-nil means production name will be printed." 1546 "Non-nil means production name will be printed."
1547 :type 'boolean 1547 :type 'boolean
1548 :version "20" 1548 :version "20"
1549 :group 'ebnf-production) 1549 :group 'ebnf-production)
1550 1550
1551 1551
1552(defcustom ebnf-sort-production nil 1552(defcustom ebnf-sort-production nil
1553 "*Specify how productions are sorted. 1553 "Specify how productions are sorted.
1554 1554
1555Valid values are: 1555Valid values are:
1556 1556
@@ -1566,7 +1566,7 @@ Valid values are:
1566 1566
1567 1567
1568(defcustom ebnf-production-font '(10 Helvetica "Black" "White" bold) 1568(defcustom ebnf-production-font '(10 Helvetica "Black" "White" bold)
1569 "*Specify production header font. 1569 "Specify production header font.
1570 1570
1571It is a list with the following form: 1571It is a list with the following form:
1572 1572
@@ -1609,7 +1609,7 @@ See `ps-font-info-database' for valid font name."
1609 1609
1610 1610
1611(defcustom ebnf-non-terminal-font '(7 Helvetica "Black" "White") 1611(defcustom ebnf-non-terminal-font '(7 Helvetica "Black" "White")
1612 "*Specify non-terminal font. 1612 "Specify non-terminal font.
1613 1613
1614See documentation for `ebnf-production-font'." 1614See documentation for `ebnf-production-font'."
1615 :type '(list :tag "Non-Terminal Font" 1615 :type '(list :tag "Non-Terminal Font"
@@ -1631,7 +1631,7 @@ See documentation for `ebnf-production-font'."
1631 1631
1632 1632
1633(defcustom ebnf-non-terminal-shape 'round 1633(defcustom ebnf-non-terminal-shape 'round
1634 "*Specify non-terminal box shape. 1634 "Specify non-terminal box shape.
1635 1635
1636Valid values are: 1636Valid values are:
1637 1637
@@ -1655,28 +1655,28 @@ Any other value is treated as `miter'."
1655 1655
1656 1656
1657(defcustom ebnf-non-terminal-shadow nil 1657(defcustom ebnf-non-terminal-shadow nil
1658 "*Non-nil means non-terminal box will have a shadow." 1658 "Non-nil means non-terminal box will have a shadow."
1659 :type 'boolean 1659 :type 'boolean
1660 :version "20" 1660 :version "20"
1661 :group 'ebnf-non-terminal) 1661 :group 'ebnf-non-terminal)
1662 1662
1663 1663
1664(defcustom ebnf-non-terminal-border-width 1.0 1664(defcustom ebnf-non-terminal-border-width 1.0
1665 "*Specify border width for non-terminal box." 1665 "Specify border width for non-terminal box."
1666 :type 'number 1666 :type 'number
1667 :version "20" 1667 :version "20"
1668 :group 'ebnf-non-terminal) 1668 :group 'ebnf-non-terminal)
1669 1669
1670 1670
1671(defcustom ebnf-non-terminal-border-color "Black" 1671(defcustom ebnf-non-terminal-border-color "Black"
1672 "*Specify border color for non-terminal box." 1672 "Specify border color for non-terminal box."
1673 :type 'string 1673 :type 'string
1674 :version "20" 1674 :version "20"
1675 :group 'ebnf-non-terminal) 1675 :group 'ebnf-non-terminal)
1676 1676
1677 1677
1678(defcustom ebnf-arrow-shape 'hollow 1678(defcustom ebnf-arrow-shape 'hollow
1679 "*Specify the arrow shape. 1679 "Specify the arrow shape.
1680 1680
1681Valid values are: 1681Valid values are:
1682 1682
@@ -1733,7 +1733,7 @@ Any other value is treated as `none'."
1733 1733
1734 1734
1735(defcustom ebnf-chart-shape 'round 1735(defcustom ebnf-chart-shape 'round
1736 "*Specify chart flow shape. 1736 "Specify chart flow shape.
1737 1737
1738See documentation for `ebnf-non-terminal-shape'." 1738See documentation for `ebnf-non-terminal-shape'."
1739 :type '(radio :tag "Chart Flow Shape" 1739 :type '(radio :tag "Chart Flow Shape"
@@ -1743,7 +1743,7 @@ See documentation for `ebnf-non-terminal-shape'."
1743 1743
1744 1744
1745(defcustom ebnf-user-arrow nil 1745(defcustom ebnf-user-arrow nil
1746 "*Specify a sexp for user arrow shape (a PostScript code). 1746 "Specify a sexp for user arrow shape (a PostScript code).
1747 1747
1748When evaluated, the sexp should return nil or a string containing PostScript 1748When evaluated, the sexp should return nil or a string containing PostScript
1749code. PostScript code should draw a right arrow. 1749code. PostScript code should draw a right arrow.
@@ -1783,7 +1783,7 @@ symbol `user'."
1783 1783
1784 1784
1785(defcustom ebnf-syntax 'ebnf 1785(defcustom ebnf-syntax 'ebnf
1786 "*Specify syntax to be recognized. 1786 "Specify syntax to be recognized.
1787 1787
1788Valid values are: 1788Valid values are:
1789 1789
@@ -1827,7 +1827,7 @@ Any other value is treated as `ebnf'."
1827 1827
1828 1828
1829(defcustom ebnf-lex-comment-char ?\; 1829(defcustom ebnf-lex-comment-char ?\;
1830 "*Specify the line comment character. 1830 "Specify the line comment character.
1831 1831
1832It's used only when `ebnf-syntax' is `ebnf'." 1832It's used only when `ebnf-syntax' is `ebnf'."
1833 :type 'character 1833 :type 'character
@@ -1836,7 +1836,7 @@ It's used only when `ebnf-syntax' is `ebnf'."
1836 1836
1837 1837
1838(defcustom ebnf-lex-eop-char ?. 1838(defcustom ebnf-lex-eop-char ?.
1839 "*Specify the end of production character. 1839 "Specify the end of production character.
1840 1840
1841It's used only when `ebnf-syntax' is `ebnf'." 1841It's used only when `ebnf-syntax' is `ebnf'."
1842 :type 'character 1842 :type 'character
@@ -1845,7 +1845,7 @@ It's used only when `ebnf-syntax' is `ebnf'."
1845 1845
1846 1846
1847(defcustom ebnf-terminal-regexp nil 1847(defcustom ebnf-terminal-regexp nil
1848 "*Specify how it's a terminal name. 1848 "Specify how it's a terminal name.
1849 1849
1850If it's nil, the terminal name must be enclosed by `\"'. 1850If it's nil, the terminal name must be enclosed by `\"'.
1851If it's a string, it should be a regexp that it'll be used to determine a 1851If it's a string, it should be a regexp that it'll be used to determine a
@@ -1859,7 +1859,7 @@ It's used only when `ebnf-syntax' is `ebnf'."
1859 1859
1860 1860
1861(defcustom ebnf-case-fold-search nil 1861(defcustom ebnf-case-fold-search nil
1862 "*Non-nil means ignore case on matching. 1862 "Non-nil means ignore case on matching.
1863 1863
1864It's only used when `ebnf-terminal-regexp' is non-nil and when `ebnf-syntax' is 1864It's only used when `ebnf-terminal-regexp' is non-nil and when `ebnf-syntax' is
1865`ebnf'." 1865`ebnf'."
@@ -1869,7 +1869,7 @@ It's only used when `ebnf-terminal-regexp' is non-nil and when `ebnf-syntax' is
1869 1869
1870 1870
1871(defcustom ebnf-iso-alternative-p nil 1871(defcustom ebnf-iso-alternative-p nil
1872 "*Non-nil means use alternative ISO EBNF. 1872 "Non-nil means use alternative ISO EBNF.
1873 1873
1874It's only used when `ebnf-syntax' is `iso-ebnf'. 1874It's only used when `ebnf-syntax' is `iso-ebnf'.
1875 1875
@@ -1888,7 +1888,7 @@ This variable affects the following symbol set:
1888 1888
1889 1889
1890(defcustom ebnf-iso-normalize-p nil 1890(defcustom ebnf-iso-normalize-p nil
1891 "*Non-nil means normalize ISO EBNF syntax names. 1891 "Non-nil means normalize ISO EBNF syntax names.
1892 1892
1893Normalize a name means that several contiguous spaces inside name become a 1893Normalize a name means that several contiguous spaces inside name become a
1894single space, so \"A B C\" is normalized to \"A B C\". 1894single space, so \"A B C\" is normalized to \"A B C\".
@@ -1900,7 +1900,7 @@ It's only used when `ebnf-syntax' is `iso-ebnf'."
1900 1900
1901 1901
1902(defcustom ebnf-file-suffix-regexp "\.[Bb][Nn][Ff]$" 1902(defcustom ebnf-file-suffix-regexp "\.[Bb][Nn][Ff]$"
1903 "*Specify file name suffix that contains EBNF. 1903 "Specify file name suffix that contains EBNF.
1904 1904
1905See `ebnf-eps-directory' command." 1905See `ebnf-eps-directory' command."
1906 :type 'regexp 1906 :type 'regexp
@@ -1909,7 +1909,7 @@ See `ebnf-eps-directory' command."
1909 1909
1910 1910
1911(defcustom ebnf-eps-prefix "ebnf--" 1911(defcustom ebnf-eps-prefix "ebnf--"
1912 "*Specify EPS prefix file name. 1912 "Specify EPS prefix file name.
1913 1913
1914See `ebnf-eps-buffer' and `ebnf-eps-region' commands." 1914See `ebnf-eps-buffer' and `ebnf-eps-region' commands."
1915 :type 'string 1915 :type 'string
@@ -1918,7 +1918,7 @@ See `ebnf-eps-buffer' and `ebnf-eps-region' commands."
1918 1918
1919 1919
1920(defcustom ebnf-eps-header-font '(11 Helvetica "Black" "White" bold) 1920(defcustom ebnf-eps-header-font '(11 Helvetica "Black" "White" bold)
1921 "*Specify EPS header font. 1921 "Specify EPS header font.
1922 1922
1923See documentation for `ebnf-production-font'. 1923See documentation for `ebnf-production-font'.
1924 1924
@@ -1942,7 +1942,7 @@ See `ebnf-eps-buffer' and `ebnf-eps-region' commands."
1942 1942
1943 1943
1944(defcustom ebnf-eps-header nil 1944(defcustom ebnf-eps-header nil
1945 "*Specify EPS header. 1945 "Specify EPS header.
1946 1946
1947The value should be a string, a symbol or nil. 1947The value should be a string, a symbol or nil.
1948 1948
@@ -1978,7 +1978,7 @@ empty string, no header is generated until a non-empty header is specified or
1978 1978
1979 1979
1980(defcustom ebnf-eps-footer-font '(7 Helvetica "Black" "White" bold) 1980(defcustom ebnf-eps-footer-font '(7 Helvetica "Black" "White" bold)
1981 "*Specify EPS footer font. 1981 "Specify EPS footer font.
1982 1982
1983See documentation for `ebnf-production-font'. 1983See documentation for `ebnf-production-font'.
1984 1984
@@ -2002,7 +2002,7 @@ See `ebnf-eps-buffer' and `ebnf-eps-region' commands."
2002 2002
2003 2003
2004(defcustom ebnf-eps-footer nil 2004(defcustom ebnf-eps-footer nil
2005 "*Specify EPS footer. 2005 "Specify EPS footer.
2006 2006
2007The value should be a string, a symbol or nil. 2007The value should be a string, a symbol or nil.
2008 2008
@@ -2038,7 +2038,7 @@ empty string, no footer is generated until a non-empty footer is specified or
2038 2038
2039 2039
2040(defcustom ebnf-entry-percentage 0.5 ; middle 2040(defcustom ebnf-entry-percentage 0.5 ; middle
2041 "*Specify entry height on alternatives. 2041 "Specify entry height on alternatives.
2042 2042
2043It must be a float between 0.0 (top) and 1.0 (bottom)." 2043It must be a float between 0.0 (top) and 1.0 (bottom)."
2044 :type 'number 2044 :type 'number
@@ -2047,7 +2047,7 @@ It must be a float between 0.0 (top) and 1.0 (bottom)."
2047 2047
2048 2048
2049(defcustom ebnf-default-width 0.6 2049(defcustom ebnf-default-width 0.6
2050 "*Specify additional border width over default terminal, non-terminal or 2050 "Specify additional border width over default terminal, non-terminal or
2051special." 2051special."
2052 :type 'number 2052 :type 'number
2053 :version "20" 2053 :version "20"
@@ -2057,21 +2057,21 @@ special."
2057;; Printing color requires x-color-values. 2057;; Printing color requires x-color-values.
2058(defcustom ebnf-color-p (or (fboundp 'x-color-values) ; Emacs 2058(defcustom ebnf-color-p (or (fboundp 'x-color-values) ; Emacs
2059 (fboundp 'color-instance-rgb-components)) ; XEmacs 2059 (fboundp 'color-instance-rgb-components)) ; XEmacs
2060 "*Non-nil means use color." 2060 "Non-nil means use color."
2061 :type 'boolean 2061 :type 'boolean
2062 :version "20" 2062 :version "20"
2063 :group 'ebnf2ps) 2063 :group 'ebnf2ps)
2064 2064
2065 2065
2066(defcustom ebnf-line-width 1.0 2066(defcustom ebnf-line-width 1.0
2067 "*Specify flow line width." 2067 "Specify flow line width."
2068 :type 'number 2068 :type 'number
2069 :version "20" 2069 :version "20"
2070 :group 'ebnf2ps) 2070 :group 'ebnf2ps)
2071 2071
2072 2072
2073(defcustom ebnf-line-color "Black" 2073(defcustom ebnf-line-color "Black"
2074 "*Specify flow line color." 2074 "Specify flow line color."
2075 :type 'string 2075 :type 'string
2076 :version "20" 2076 :version "20"
2077 :group 'ebnf2ps) 2077 :group 'ebnf2ps)
@@ -2081,7 +2081,7 @@ special."
2081 (if (eq ebnf-arrow-shape 'none) 2081 (if (eq ebnf-arrow-shape 'none)
2082 0.0 2082 0.0
2083 (* (sqrt 5.0) 0.65 ebnf-line-width)) 2083 (* (sqrt 5.0) 0.65 ebnf-line-width))
2084 "*Specify extra width for arrow shape drawing. 2084 "Specify extra width for arrow shape drawing.
2085 2085
2086The extra width is used to avoid that the arrowhead and the terminal border 2086The extra width is used to avoid that the arrowhead and the terminal border
2087overlap. It depends on `ebnf-arrow-shape' and `ebnf-line-width'." 2087overlap. It depends on `ebnf-arrow-shape' and `ebnf-line-width'."
@@ -2091,7 +2091,7 @@ overlap. It depends on `ebnf-arrow-shape' and `ebnf-line-width'."
2091 2091
2092 2092
2093(defcustom ebnf-arrow-scale 1.0 2093(defcustom ebnf-arrow-scale 1.0
2094 "*Specify the arrow scale. 2094 "Specify the arrow scale.
2095 2095
2096Values lower than 1.0, shrink the arrow. 2096Values lower than 1.0, shrink the arrow.
2097Values greater than 1.0, expand the arrow." 2097Values greater than 1.0, expand the arrow."
@@ -2101,7 +2101,7 @@ Values greater than 1.0, expand the arrow."
2101 2101
2102 2102
2103(defcustom ebnf-debug-ps nil 2103(defcustom ebnf-debug-ps nil
2104 "*Non-nil means to generate PostScript debug procedures. 2104 "Non-nil means to generate PostScript debug procedures.
2105 2105
2106It is intended to help PostScript programmers in debugging." 2106It is intended to help PostScript programmers in debugging."
2107 :type 'boolean 2107 :type 'boolean
@@ -2110,7 +2110,7 @@ It is intended to help PostScript programmers in debugging."
2110 2110
2111 2111
2112(defcustom ebnf-use-float-format t 2112(defcustom ebnf-use-float-format t
2113 "*Non-nil means use `%f' float format. 2113 "Non-nil means use `%f' float format.
2114 2114
2115The advantage of using float format is that ebnf2ps generates a little short 2115The advantage of using float format is that ebnf2ps generates a little short
2116PostScript file. 2116PostScript file.
@@ -2126,14 +2126,14 @@ when executing ebnf2ps, set `ebnf-use-float-format' to nil."
2126 2126
2127 2127
2128(defcustom ebnf-stop-on-error nil 2128(defcustom ebnf-stop-on-error nil
2129 "*Non-nil means signal error and stop. Otherwise, signal error and continue." 2129 "Non-nil means signal error and stop. Otherwise, signal error and continue."
2130 :type 'boolean 2130 :type 'boolean
2131 :version "20" 2131 :version "20"
2132 :group 'ebnf2ps) 2132 :group 'ebnf2ps)
2133 2133
2134 2134
2135(defcustom ebnf-yac-ignore-error-recovery nil 2135(defcustom ebnf-yac-ignore-error-recovery nil
2136 "*Non-nil means ignore error recovery. 2136 "Non-nil means ignore error recovery.
2137 2137
2138It's only used when `ebnf-syntax' is `yacc'." 2138It's only used when `ebnf-syntax' is `yacc'."
2139 :type 'boolean 2139 :type 'boolean
@@ -2142,7 +2142,7 @@ It's only used when `ebnf-syntax' is `yacc'."
2142 2142
2143 2143
2144(defcustom ebnf-ignore-empty-rule nil 2144(defcustom ebnf-ignore-empty-rule nil
2145 "*Non-nil means ignore empty rules. 2145 "Non-nil means ignore empty rules.
2146 2146
2147It's interesting to set this variable if your Yacc/Bison grammar has a lot of 2147It's interesting to set this variable if your Yacc/Bison grammar has a lot of
2148middle action rule." 2148middle action rule."
@@ -2152,7 +2152,7 @@ middle action rule."
2152 2152
2153 2153
2154(defcustom ebnf-optimize nil 2154(defcustom ebnf-optimize nil
2155 "*Non-nil means optimize syntactic chart of rules. 2155 "Non-nil means optimize syntactic chart of rules.
2156 2156
2157The following optimizations are done: 2157The following optimizations are done:
2158 2158
@@ -2179,7 +2179,7 @@ The above optimizations are specially useful when `ebnf-syntax' is `yacc'."
2179 2179
2180 2180
2181(defcustom ebnf-log nil 2181(defcustom ebnf-log nil
2182 "*Non-nil means generate log messages. 2182 "Non-nil means generate log messages.
2183 2183
2184The log messages are generated into the buffer *Ebnf2ps Log*. 2184The log messages are generated into the buffer *Ebnf2ps Log*.
2185These messages are intended to help debugging ebnf2ps." 2185These messages are intended to help debugging ebnf2ps."
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 4a07392c309..849ca4b7c9d 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -50,7 +50,7 @@
50 50
51 51
52(defcustom ebrowse-search-path nil 52(defcustom ebrowse-search-path nil
53 "*List of directories to search for source files in a class tree. 53 "List of directories to search for source files in a class tree.
54Elements should be directory names; nil as an element means to try 54Elements should be directory names; nil as an element means to try
55to find source files relative to the location of the BROWSE file loaded." 55to find source files relative to the location of the BROWSE file loaded."
56 :group 'ebrowse 56 :group 'ebrowse
@@ -59,25 +59,25 @@ to find source files relative to the location of the BROWSE file loaded."
59 59
60 60
61(defcustom ebrowse-view/find-hook nil 61(defcustom ebrowse-view/find-hook nil
62 "*Hooks run after finding or viewing a member or class." 62 "Hooks run after finding or viewing a member or class."
63 :group 'ebrowse 63 :group 'ebrowse
64 :type 'hook) 64 :type 'hook)
65 65
66 66
67(defcustom ebrowse-not-found-hook nil 67(defcustom ebrowse-not-found-hook nil
68 "*Hooks run when finding or viewing a member or class was not successful." 68 "Hooks run when finding or viewing a member or class was not successful."
69 :group 'ebrowse 69 :group 'ebrowse
70 :type 'hook) 70 :type 'hook)
71 71
72 72
73(defcustom ebrowse-electric-list-mode-hook nil 73(defcustom ebrowse-electric-list-mode-hook nil
74 "*Hook called by `ebrowse-electric-position-mode'." 74 "Hook called by `ebrowse-electric-position-mode'."
75 :group 'ebrowse 75 :group 'ebrowse
76 :type 'hook) 76 :type 'hook)
77 77
78 78
79(defcustom ebrowse-max-positions 50 79(defcustom ebrowse-max-positions 50
80 "*Number of markers saved on electric position stack." 80 "Number of markers saved on electric position stack."
81 :group 'ebrowse 81 :group 'ebrowse
82 :type 'integer) 82 :type 'integer)
83 83
@@ -89,31 +89,31 @@ to find source files relative to the location of the BROWSE file loaded."
89 89
90 90
91(defcustom ebrowse-tree-mode-hook nil 91(defcustom ebrowse-tree-mode-hook nil
92 "*Hook run in each new tree buffer." 92 "Hook run in each new tree buffer."
93 :group 'ebrowse-tree 93 :group 'ebrowse-tree
94 :type 'hook) 94 :type 'hook)
95 95
96 96
97(defcustom ebrowse-tree-buffer-name "*Tree*" 97(defcustom ebrowse-tree-buffer-name "*Tree*"
98 "*The default name of class tree buffers." 98 "The default name of class tree buffers."
99 :group 'ebrowse-tree 99 :group 'ebrowse-tree
100 :type 'string) 100 :type 'string)
101 101
102 102
103(defcustom ebrowse--indentation 4 103(defcustom ebrowse--indentation 4
104 "*The amount by which subclasses are indented in the tree." 104 "The amount by which subclasses are indented in the tree."
105 :group 'ebrowse-tree 105 :group 'ebrowse-tree
106 :type 'integer) 106 :type 'integer)
107 107
108 108
109(defcustom ebrowse-source-file-column 40 109(defcustom ebrowse-source-file-column 40
110 "*The column in which source file names are displayed in the tree." 110 "The column in which source file names are displayed in the tree."
111 :group 'ebrowse-tree 111 :group 'ebrowse-tree
112 :type 'integer) 112 :type 'integer)
113 113
114 114
115(defcustom ebrowse-tree-left-margin 2 115(defcustom ebrowse-tree-left-margin 2
116 "*Amount of space left at the left side of the tree display. 116 "Amount of space left at the left side of the tree display.
117This space is used to display markers." 117This space is used to display markers."
118 :group 'ebrowse-tree 118 :group 'ebrowse-tree
119 :type 'integer) 119 :type 'integer)
@@ -126,25 +126,25 @@ This space is used to display markers."
126 126
127 127
128(defcustom ebrowse-default-declaration-column 25 128(defcustom ebrowse-default-declaration-column 25
129 "*The column in which member declarations are displayed in member buffers." 129 "The column in which member declarations are displayed in member buffers."
130 :group 'ebrowse-member 130 :group 'ebrowse-member
131 :type 'integer) 131 :type 'integer)
132 132
133 133
134(defcustom ebrowse-default-column-width 25 134(defcustom ebrowse-default-column-width 25
135 "*The width of the columns in member buffers (short display form)." 135 "The width of the columns in member buffers (short display form)."
136 :group 'ebrowse-member 136 :group 'ebrowse-member
137 :type 'integer) 137 :type 'integer)
138 138
139 139
140(defcustom ebrowse-member-buffer-name "*Members*" 140(defcustom ebrowse-member-buffer-name "*Members*"
141 "*The name of the buffer for member display." 141 "The name of the buffer for member display."
142 :group 'ebrowse-member 142 :group 'ebrowse-member
143 :type 'string) 143 :type 'string)
144 144
145 145
146(defcustom ebrowse-member-mode-hook nil 146(defcustom ebrowse-member-mode-hook nil
147 "*Run in each new member buffer." 147 "Run in each new member buffer."
148 :group 'ebrowse-member 148 :group 'ebrowse-member
149 :type 'hook) 149 :type 'hook)
150 150
@@ -158,7 +158,7 @@ This space is used to display markers."
158(defface ebrowse-tree-mark 158(defface ebrowse-tree-mark
159 '((((min-colors 88)) (:foreground "red1")) 159 '((((min-colors 88)) (:foreground "red1"))
160 (t (:foreground "red"))) 160 (t (:foreground "red")))
161 "*The face used for the mark character in the tree." 161 "The face used for the mark character in the tree."
162 :group 'ebrowse-faces) 162 :group 'ebrowse-faces)
163(define-obsolete-face-alias 'ebrowse-tree-mark-face 'ebrowse-tree-mark "22.1") 163(define-obsolete-face-alias 'ebrowse-tree-mark-face 'ebrowse-tree-mark "22.1")
164 164
@@ -166,21 +166,21 @@ This space is used to display markers."
166(defface ebrowse-root-class 166(defface ebrowse-root-class
167 '((((min-colors 88)) (:weight bold :foreground "blue1")) 167 '((((min-colors 88)) (:weight bold :foreground "blue1"))
168 (t (:weight bold :foreground "blue"))) 168 (t (:weight bold :foreground "blue")))
169 "*The face used for root classes in the tree." 169 "The face used for root classes in the tree."
170 :group 'ebrowse-faces) 170 :group 'ebrowse-faces)
171(define-obsolete-face-alias 'ebrowse-root-class-face 'ebrowse-root-class "22.1") 171(define-obsolete-face-alias 'ebrowse-root-class-face 'ebrowse-root-class "22.1")
172 172
173 173
174(defface ebrowse-file-name 174(defface ebrowse-file-name
175 '((t (:italic t))) 175 '((t (:italic t)))
176 "*The face for filenames displayed in the tree." 176 "The face for filenames displayed in the tree."
177 :group 'ebrowse-faces) 177 :group 'ebrowse-faces)
178(define-obsolete-face-alias 'ebrowse-file-name-face 'ebrowse-file-name "22.1") 178(define-obsolete-face-alias 'ebrowse-file-name-face 'ebrowse-file-name "22.1")
179 179
180 180
181(defface ebrowse-default 181(defface ebrowse-default
182 '((t nil)) 182 '((t nil))
183 "*Face for everything else in the tree not having other faces." 183 "Face for everything else in the tree not having other faces."
184 :group 'ebrowse-faces) 184 :group 'ebrowse-faces)
185(define-obsolete-face-alias 'ebrowse-default-face 'ebrowse-default "22.1") 185(define-obsolete-face-alias 'ebrowse-default-face 'ebrowse-default "22.1")
186 186
@@ -188,7 +188,7 @@ This space is used to display markers."
188(defface ebrowse-member-attribute 188(defface ebrowse-member-attribute
189 '((((min-colors 88)) (:foreground "red1")) 189 '((((min-colors 88)) (:foreground "red1"))
190 (t (:foreground "red"))) 190 (t (:foreground "red")))
191 "*Face used to display member attributes." 191 "Face used to display member attributes."
192 :group 'ebrowse-faces) 192 :group 'ebrowse-faces)
193(define-obsolete-face-alias 'ebrowse-member-attribute-face 193(define-obsolete-face-alias 'ebrowse-member-attribute-face
194 'ebrowse-member-attribute "22.1") 194 'ebrowse-member-attribute "22.1")
@@ -196,7 +196,7 @@ This space is used to display markers."
196 196
197(defface ebrowse-member-class 197(defface ebrowse-member-class
198 '((t (:foreground "purple"))) 198 '((t (:foreground "purple")))
199 "*Face used to display the class title in member buffers." 199 "Face used to display the class title in member buffers."
200 :group 'ebrowse-faces) 200 :group 'ebrowse-faces)
201(define-obsolete-face-alias 'ebrowse-member-class-face 201(define-obsolete-face-alias 'ebrowse-member-class-face
202 'ebrowse-member-class "22.1") 202 'ebrowse-member-class "22.1")
@@ -205,7 +205,7 @@ This space is used to display markers."
205(defface ebrowse-progress 205(defface ebrowse-progress
206 '((((min-colors 88)) (:background "blue1")) 206 '((((min-colors 88)) (:background "blue1"))
207 (t (:background "blue"))) 207 (t (:background "blue")))
208 "*Face for progress indicator." 208 "Face for progress indicator."
209 :group 'ebrowse-faces) 209 :group 'ebrowse-faces)
210(define-obsolete-face-alias 'ebrowse-progress-face 'ebrowse-progress "22.1") 210(define-obsolete-face-alias 'ebrowse-progress-face 'ebrowse-progress "22.1")
211 211
@@ -4178,7 +4178,7 @@ NUMBER-OF-STATIC-VARIABLES:"
4178;; prefix `\C-c\C-m' to browse commands. 4178;; prefix `\C-c\C-m' to browse commands.
4179 4179
4180(defvar ebrowse-global-map nil 4180(defvar ebrowse-global-map nil
4181 "*Keymap for Ebrowse commands.") 4181 "Keymap for Ebrowse commands.")
4182 4182
4183 4183
4184(defvar ebrowse-global-prefix-key "\C-c\C-m" 4184(defvar ebrowse-global-prefix-key "\C-c\C-m"
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 6bb86738df0..d8a561340d3 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -33,7 +33,7 @@
33 33
34;;;###autoload 34;;;###autoload
35(defvar tags-file-name nil 35(defvar tags-file-name nil
36 "*File name of tags table. 36 "File name of tags table.
37To switch to a new tags table, setting this variable is sufficient. 37To switch to a new tags table, setting this variable is sufficient.
38If you set this variable, do not also set `tags-table-list'. 38If you set this variable, do not also set `tags-table-list'.
39Use the `etags' program to make a tags table file.") 39Use the `etags' program to make a tags table file.")
@@ -46,7 +46,7 @@ Use the `etags' program to make a tags table file.")
46 46
47;;;###autoload 47;;;###autoload
48(defcustom tags-case-fold-search 'default 48(defcustom tags-case-fold-search 'default
49 "*Whether tags operations should be case-sensitive. 49 "Whether tags operations should be case-sensitive.
50A value of t means case-insensitive, a value of nil means case-sensitive. 50A value of t means case-insensitive, a value of nil means case-sensitive.
51Any other value means use the setting of `case-fold-search'." 51Any other value means use the setting of `case-fold-search'."
52 :group 'etags 52 :group 'etags
@@ -58,7 +58,7 @@ Any other value means use the setting of `case-fold-search'."
58;;;###autoload 58;;;###autoload
59;; Use `visit-tags-table-buffer' to cycle through tags tables in this list. 59;; Use `visit-tags-table-buffer' to cycle through tags tables in this list.
60(defcustom tags-table-list nil 60(defcustom tags-table-list nil
61 "*List of file names of tags tables to search. 61 "List of file names of tags tables to search.
62An element that is a directory means the file \"TAGS\" in that directory. 62An element that is a directory means the file \"TAGS\" in that directory.
63To switch to a new list of tags tables, setting this variable is sufficient. 63To switch to a new list of tags tables, setting this variable is sufficient.
64If you set this variable, do not also set `tags-file-name'. 64If you set this variable, do not also set `tags-file-name'.
@@ -69,7 +69,7 @@ Use the `etags' program to make a tags table file."
69;;;###autoload 69;;;###autoload
70(defcustom tags-compression-info-list 70(defcustom tags-compression-info-list
71 (purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz")) 71 (purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz"))
72 "*List of extensions tried by etags when jka-compr is used. 72 "List of extensions tried by etags when jka-compr is used.
73An empty string means search the non-compressed file. 73An empty string means search the non-compressed file.
74These extensions will be tried only if jka-compr was activated 74These extensions will be tried only if jka-compr was activated
75\(i.e. via customize of `auto-compression-mode' or by calling the function 75\(i.e. via customize of `auto-compression-mode' or by calling the function
@@ -90,7 +90,7 @@ These extensions will be tried only if jka-compr was activated
90 90
91;;;###autoload 91;;;###autoload
92(defcustom tags-add-tables 'ask-user 92(defcustom tags-add-tables 'ask-user
93 "*Control whether to add a new tags table to the current list. 93 "Control whether to add a new tags table to the current list.
94t means do; nil means don't (always start a new list). 94t means do; nil means don't (always start a new list).
95Any other value means ask the user whether to add a new tags table 95Any other value means ask the user whether to add a new tags table
96to the current list (as opposed to starting a new list)." 96to the current list (as opposed to starting a new list)."
@@ -100,7 +100,7 @@ to the current list (as opposed to starting a new list)."
100 (other :tag "Ask" ask-user))) 100 (other :tag "Ask" ask-user)))
101 101
102(defcustom tags-revert-without-query nil 102(defcustom tags-revert-without-query nil
103 "*Non-nil means reread a TAGS table without querying, if it has changed." 103 "Non-nil means reread a TAGS table without querying, if it has changed."
104 :group 'etags 104 :group 'etags
105 :type 'boolean) 105 :type 'boolean)
106 106
@@ -131,7 +131,7 @@ Each element is a list of strings which are file names.")
131 131
132;;;###autoload 132;;;###autoload
133(defcustom find-tag-hook nil 133(defcustom find-tag-hook nil
134 "*Hook to be run by \\[find-tag] after finding a tag. See `run-hooks'. 134 "Hook to be run by \\[find-tag] after finding a tag. See `run-hooks'.
135The value in the buffer in which \\[find-tag] is done is used, 135The value in the buffer in which \\[find-tag] is done is used,
136not the value in the buffer \\[find-tag] goes to." 136not the value in the buffer \\[find-tag] goes to."
137 :group 'etags 137 :group 'etags
@@ -139,7 +139,7 @@ not the value in the buffer \\[find-tag] goes to."
139 139
140;;;###autoload 140;;;###autoload
141(defcustom find-tag-default-function nil 141(defcustom find-tag-default-function nil
142 "*A function of no arguments used by \\[find-tag] to pick a default tag. 142 "A function of no arguments used by \\[find-tag] to pick a default tag.
143If nil, and the symbol that is the value of `major-mode' 143If nil, and the symbol that is the value of `major-mode'
144has a `find-tag-default-function' property (see `put'), that is used. 144has a `find-tag-default-function' property (see `put'), that is used.
145Otherwise, `find-tag-default' is used." 145Otherwise, `find-tag-default' is used."
@@ -147,13 +147,13 @@ Otherwise, `find-tag-default' is used."
147 :type '(choice (const nil) function)) 147 :type '(choice (const nil) function))
148 148
149(defcustom find-tag-marker-ring-length 16 149(defcustom find-tag-marker-ring-length 16
150 "*Length of marker rings `find-tag-marker-ring' and `tags-location-ring'." 150 "Length of marker rings `find-tag-marker-ring' and `tags-location-ring'."
151 :group 'etags 151 :group 'etags
152 :type 'integer 152 :type 'integer
153 :version "20.3") 153 :version "20.3")
154 154
155(defcustom tags-tag-face 'default 155(defcustom tags-tag-face 'default
156 "*Face for tags in the output of `tags-apropos'." 156 "Face for tags in the output of `tags-apropos'."
157 :group 'etags 157 :group 'etags
158 :type 'face 158 :type 'face
159 :version "21.1") 159 :version "21.1")
@@ -1687,7 +1687,7 @@ Point should be just after a string that matches TAG."
1687 (re-search-backward re bol t))))) 1687 (re-search-backward re bol t)))))
1688 1688
1689(defcustom tags-loop-revert-buffers nil 1689(defcustom tags-loop-revert-buffers nil
1690 "*Non-nil means tags-scanning loops should offer to reread changed files. 1690 "Non-nil means tags-scanning loops should offer to reread changed files.
1691These loops normally read each file into Emacs, but when a file 1691These loops normally read each file into Emacs, but when a file
1692is already visited, they use the existing buffer. 1692is already visited, they use the existing buffer.
1693When this flag is non-nil, they offer to revert the existing buffer 1693When this flag is non-nil, they offer to revert the existing buffer
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index c44f1d73501..e5142571972 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -57,7 +57,7 @@
57;; This used to default to `other', but that doesn't seem to have any 57;; This used to default to `other', but that doesn't seem to have any
58;; significance. fx 2000-02-11. 58;; significance. fx 2000-02-11.
59(defcustom executable-insert t ; 'other 59(defcustom executable-insert t ; 'other
60 "*Non-nil means offer to add a magic number to a file. 60 "Non-nil means offer to add a magic number to a file.
61This takes effect when you switch to certain major modes, 61This takes effect when you switch to certain major modes,
62including Shell-script mode (`sh-mode'). 62including Shell-script mode (`sh-mode').
63When you type \\[executable-set-magic], it always offers to add or 63When you type \\[executable-set-magic], it always offers to add or
@@ -70,7 +70,7 @@ update the magic number."
70 70
71 71
72(defcustom executable-query 'function 72(defcustom executable-query 'function
73 "*If non-nil, ask user before changing an existing magic number. 73 "If non-nil, ask user before changing an existing magic number.
74When this is `function', only ask when called non-interactively." 74When this is `function', only ask when called non-interactively."
75 :type '(choice (const :tag "Don't Ask" nil) 75 :type '(choice (const :tag "Don't Ask" nil)
76 (const :tag "Ask when non-interactive" function) 76 (const :tag "Ask when non-interactive" function)
@@ -79,19 +79,19 @@ When this is `function', only ask when called non-interactively."
79 79
80 80
81(defcustom executable-magicless-file-regexp "/[Mm]akefile$\\|/\\.\\(z?profile\\|bash_profile\\|z?login\\|bash_login\\|z?logout\\|bash_logout\\|.+shrc\\|esrc\\|rcrc\\|[kz]shenv\\)$" 81(defcustom executable-magicless-file-regexp "/[Mm]akefile$\\|/\\.\\(z?profile\\|bash_profile\\|z?login\\|bash_login\\|z?logout\\|bash_logout\\|.+shrc\\|esrc\\|rcrc\\|[kz]shenv\\)$"
82 "*On files with this kind of name no magic is inserted or changed." 82 "On files with this kind of name no magic is inserted or changed."
83 :type 'regexp 83 :type 'regexp
84 :group 'executable) 84 :group 'executable)
85 85
86 86
87(defcustom executable-prefix "#! " 87(defcustom executable-prefix "#! "
88 "*Interpreter magic number prefix inserted when there was no magic number." 88 "Interpreter magic number prefix inserted when there was no magic number."
89 :type 'string 89 :type 'string
90 :group 'executable) 90 :group 'executable)
91 91
92 92
93(defcustom executable-chmod 73 93(defcustom executable-chmod 73
94 "*After saving, if the file is not executable, set this mode. 94 "After saving, if the file is not executable, set this mode.
95This mode passed to `set-file-modes' is taken absolutely when negative, or 95This mode passed to `set-file-modes' is taken absolutely when negative, or
96relative to the files existing modes. Do nothing if this is nil. 96relative to the files existing modes. Do nothing if this is nil.
97Typical values are 73 (+x) or -493 (rwxr-xr-x)." 97Typical values are 73 (+x) or -493 (rwxr-xr-x)."
@@ -103,7 +103,7 @@ Typical values are 73 (+x) or -493 (rwxr-xr-x)."
103(defvar executable-command nil) 103(defvar executable-command nil)
104 104
105(defcustom executable-self-display "tail" 105(defcustom executable-self-display "tail"
106 "*Command you use with argument `+2' to make text files self-display. 106 "Command you use with argument `+2' to make text files self-display.
107Note that the like of `more' doesn't work too well under Emacs \\[shell]." 107Note that the like of `more' doesn't work too well under Emacs \\[shell]."
108 :type 'string 108 :type 'string
109 :group 'executable) 109 :group 'executable)
@@ -111,7 +111,7 @@ Note that the like of `more' doesn't work too well under Emacs \\[shell]."
111 111
112(defvar executable-font-lock-keywords 112(defvar executable-font-lock-keywords
113 '(("\\`#!.*/\\([^ \t\n]+\\)" 1 font-lock-keyword-face t)) 113 '(("\\`#!.*/\\([^ \t\n]+\\)" 1 font-lock-keyword-face t))
114 "*Rules for highlighting executable scripts' magic number. 114 "Rules for highlighting executable scripts' magic number.
115This can be included in `font-lock-keywords' by modes that call `executable'.") 115This can be included in `font-lock-keywords' by modes that call `executable'.")
116 116
117 117
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index df6fdfd7cd9..1d2beedd191 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -651,7 +651,7 @@ logical\\|double[ \t]*precision\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*"
651 651
652(defvar f90-font-lock-keywords 652(defvar f90-font-lock-keywords
653 f90-font-lock-keywords-2 653 f90-font-lock-keywords-2
654 "*Default expressions to highlight in F90 mode. 654 "Default expressions to highlight in F90 mode.
655Can be overridden by the value of `font-lock-maximum-decoration'.") 655Can be overridden by the value of `font-lock-maximum-decoration'.")
656 656
657 657
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index b49739a94d5..7c131dd316c 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -78,7 +78,7 @@ string."
78 78
79 79
80(defcustom glasses-original-separator "_" 80(defcustom glasses-original-separator "_"
81 "*String to be displayed as `glasses-separator' in separator positions. 81 "String to be displayed as `glasses-separator' in separator positions.
82For instance, if you set it to \"_\" and set `glasses-separator' to \"-\", 82For instance, if you set it to \"_\" and set `glasses-separator' to \"-\",
83underscore separators are displayed as hyphens. 83underscore separators are displayed as hyphens.
84If `glasses-original-separator' is an empty string, no such display change is 84If `glasses-original-separator' is an empty string, no such display change is
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 54d678323f6..d41364547f2 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -61,7 +61,7 @@ SYMBOL should be one of `grep-command', `grep-template',
61 61
62;;;###autoload 62;;;###autoload
63(defcustom grep-window-height nil 63(defcustom grep-window-height nil
64 "*Number of lines in a grep window. If nil, use `compilation-window-height'." 64 "Number of lines in a grep window. If nil, use `compilation-window-height'."
65 :type '(choice (const :tag "Default" nil) 65 :type '(choice (const :tag "Default" nil)
66 integer) 66 integer)
67 :version "22.1" 67 :version "22.1"
@@ -104,7 +104,7 @@ To change the default value, use Customize or call the function
104 :group 'grep) 104 :group 'grep)
105 105
106(defcustom grep-scroll-output nil 106(defcustom grep-scroll-output nil
107 "*Non-nil to scroll the *grep* buffer window as output appears. 107 "Non-nil to scroll the *grep* buffer window as output appears.
108 108
109Setting it causes the grep commands to put point at the end of their 109Setting it causes the grep commands to put point at the end of their
110output window so that the end of the output is always visible rather 110output window so that the end of the output is always visible rather
@@ -203,13 +203,13 @@ Customize or call the function `grep-apply-setting'."
203 ("tex" . "*.tex") 203 ("tex" . "*.tex")
204 ("texi" . "*.texi") 204 ("texi" . "*.texi")
205 ("asm" . "*.[sS]")) 205 ("asm" . "*.[sS]"))
206 "*Alist of aliases for the FILES argument to `lgrep' and `rgrep'." 206 "Alist of aliases for the FILES argument to `lgrep' and `rgrep'."
207 :type 'alist 207 :type 'alist
208 :group 'grep) 208 :group 'grep)
209 209
210(defcustom grep-find-ignored-directories 210(defcustom grep-find-ignored-directories
211 vc-directory-exclusion-list 211 vc-directory-exclusion-list
212 "*List of names of sub-directories which `rgrep' shall not recurse into. 212 "List of names of sub-directories which `rgrep' shall not recurse into.
213If an element is a cons cell, the car is called on the search directory 213If an element is a cons cell, the car is called on the search directory
214to determine whether cdr should not be recursed into." 214to determine whether cdr should not be recursed into."
215 :type '(choice (repeat :tag "Ignored directories" string) 215 :type '(choice (repeat :tag "Ignored directories" string)
@@ -221,7 +221,7 @@ to determine whether cdr should not be recursed into."
221 (unless (string-match-p "/\\'" s) 221 (unless (string-match-p "/\\'" s)
222 (concat "*" s))) 222 (concat "*" s)))
223 completion-ignored-extensions))) 223 completion-ignored-extensions)))
224 "*List of file names which `rgrep' and `lgrep' shall exclude. 224 "List of file names which `rgrep' and `lgrep' shall exclude.
225If an element is a cons cell, the car is called on the search directory 225If an element is a cons cell, the car is called on the search directory
226to determine whether cdr should not be excluded." 226to determine whether cdr should not be excluded."
227 :type '(choice (repeat :tag "Ignored file" string) 227 :type '(choice (repeat :tag "Ignored file" string)
@@ -229,7 +229,7 @@ to determine whether cdr should not be excluded."
229 :group 'grep) 229 :group 'grep)
230 230
231(defcustom grep-error-screen-columns nil 231(defcustom grep-error-screen-columns nil
232 "*If non-nil, column numbers in grep hits are screen columns. 232 "If non-nil, column numbers in grep hits are screen columns.
233See `compilation-error-screen-columns'" 233See `compilation-error-screen-columns'"
234 :type '(choice (const :tag "Default" nil) 234 :type '(choice (const :tag "Default" nil)
235 integer) 235 integer)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 121a023cd54..6b1f891b230 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1046,7 +1046,7 @@ and source-file directory for your debugger."
1046(defvar gud-dbx-history nil) 1046(defvar gud-dbx-history nil)
1047 1047
1048(defcustom gud-dbx-directories nil 1048(defcustom gud-dbx-directories nil
1049 "*A list of directories that dbx should search for source code. 1049 "A list of directories that dbx should search for source code.
1050If nil, only source files in the program directory 1050If nil, only source files in the program directory
1051will be known to dbx. 1051will be known to dbx.
1052 1052
@@ -1358,7 +1358,7 @@ and source-file directory for your debugger."
1358(defvar gud-xdb-history nil) 1358(defvar gud-xdb-history nil)
1359 1359
1360(defcustom gud-xdb-directories nil 1360(defcustom gud-xdb-directories nil
1361 "*A list of directories that xdb should search for source code. 1361 "A list of directories that xdb should search for source code.
1362If nil, only source files in the program directory 1362If nil, only source files in the program directory
1363will be known to xdb. 1363will be known to xdb.
1364 1364
@@ -1811,7 +1811,7 @@ source file information.")
1811 1811
1812;; List of Java source file directories. 1812;; List of Java source file directories.
1813(defvar gud-jdb-directories (list ".") 1813(defvar gud-jdb-directories (list ".")
1814 "*A list of directories that gud jdb should search for source code. 1814 "A list of directories that gud jdb should search for source code.
1815The file names should be absolute, or relative to the current 1815The file names should be absolute, or relative to the current
1816directory. 1816directory.
1817 1817
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 26db60ddbc2..e2016e206a8 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -238,18 +238,18 @@
238 :group 'languages) 238 :group 'languages)
239 239
240(defcustom hs-hide-comments-when-hiding-all t 240(defcustom hs-hide-comments-when-hiding-all t
241 "*Hide the comments too when you do an `hs-hide-all'." 241 "Hide the comments too when you do an `hs-hide-all'."
242 :type 'boolean 242 :type 'boolean
243 :group 'hideshow) 243 :group 'hideshow)
244 244
245(defcustom hs-minor-mode-hook nil 245(defcustom hs-minor-mode-hook nil
246 "*Hook called when hideshow minor mode is activated or deactivated." 246 "Hook called when hideshow minor mode is activated or deactivated."
247 :type 'hook 247 :type 'hook
248 :group 'hideshow 248 :group 'hideshow
249 :version "21.1") 249 :version "21.1")
250 250
251(defcustom hs-isearch-open 'code 251(defcustom hs-isearch-open 'code
252 "*What kind of hidden blocks to open when doing `isearch'. 252 "What kind of hidden blocks to open when doing `isearch'.
253One of the following symbols: 253One of the following symbols:
254 254
255 code -- open only code blocks 255 code -- open only code blocks
@@ -272,7 +272,7 @@ This has effect only if `search-invisible' is set to `open'."
272 (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) 272 (bibtex-mode ("@\\S(*\\(\\s(\\)" 1))
273 (java-mode "{" "}" "/[*/]" nil nil) 273 (java-mode "{" "}" "/[*/]" nil nil)
274 (js-mode "{" "}" "/[*/]" nil))) 274 (js-mode "{" "}" "/[*/]" nil)))
275 "*Alist for initializing the hideshow variables for different modes. 275 "Alist for initializing the hideshow variables for different modes.
276Each element has the form 276Each element has the form
277 (MODE START END COMMENT-START FORWARD-SEXP-FUNC ADJUST-BEG-FUNC). 277 (MODE START END COMMENT-START FORWARD-SEXP-FUNC ADJUST-BEG-FUNC).
278 278
@@ -300,25 +300,25 @@ appropriate values. The regexps should not contain leading or trailing
300whitespace. Case does not matter.") 300whitespace. Case does not matter.")
301 301
302(defvar hs-hide-all-non-comment-function nil 302(defvar hs-hide-all-non-comment-function nil
303 "*Function called if non-nil when doing `hs-hide-all' for non-comments.") 303 "Function called if non-nil when doing `hs-hide-all' for non-comments.")
304 304
305(defvar hs-allow-nesting nil 305(defvar hs-allow-nesting nil
306 "*If non-nil, hiding remembers internal blocks. 306 "If non-nil, hiding remembers internal blocks.
307This means that when the outer block is shown again, 307This means that when the outer block is shown again,
308any previously hidden internal blocks remain hidden.") 308any previously hidden internal blocks remain hidden.")
309 309
310(defvar hs-hide-hook nil 310(defvar hs-hide-hook nil
311 "*Hook called (with `run-hooks') at the end of commands to hide text. 311 "Hook called (with `run-hooks') at the end of commands to hide text.
312These commands include the toggling commands (when the result is to hide 312These commands include the toggling commands (when the result is to hide
313a block), `hs-hide-all', `hs-hide-block' and `hs-hide-level'.") 313a block), `hs-hide-all', `hs-hide-block' and `hs-hide-level'.")
314 314
315(defvar hs-show-hook nil 315(defvar hs-show-hook nil
316 "*Hook called (with `run-hooks') at the end of commands to show text. 316 "Hook called (with `run-hooks') at the end of commands to show text.
317These commands include the toggling commands (when the result is to show 317These commands include the toggling commands (when the result is to show
318a block), `hs-show-all' and `hs-show-block'.") 318a block), `hs-show-all' and `hs-show-block'.")
319 319
320(defvar hs-set-up-overlay nil 320(defvar hs-set-up-overlay nil
321 "*Function called with one arg, OV, a newly initialized overlay. 321 "Function called with one arg, OV, a newly initialized overlay.
322Hideshow puts a unique overlay on each range of text to be hidden 322Hideshow puts a unique overlay on each range of text to be hidden
323in the buffer. Here is a simple example of how to use this variable: 323in the buffer. Here is a simple example of how to use this variable:
324 324
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 35c29e10627..205b226160a 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -85,39 +85,39 @@
85 :group 'languages) 85 :group 'languages)
86 86
87(defcustom icon-indent-level 4 87(defcustom icon-indent-level 4
88 "*Indentation of Icon statements with respect to containing block." 88 "Indentation of Icon statements with respect to containing block."
89 :type 'integer 89 :type 'integer
90 :group 'icon) 90 :group 'icon)
91 91
92(defcustom icon-brace-imaginary-offset 0 92(defcustom icon-brace-imaginary-offset 0
93 "*Imagined indentation of a Icon open brace that actually follows a statement." 93 "Imagined indentation of a Icon open brace that actually follows a statement."
94 :type 'integer 94 :type 'integer
95 :group 'icon) 95 :group 'icon)
96 96
97(defcustom icon-brace-offset 0 97(defcustom icon-brace-offset 0
98 "*Extra indentation for braces, compared with other text in same context." 98 "Extra indentation for braces, compared with other text in same context."
99 :type 'integer 99 :type 'integer
100 :group 'icon) 100 :group 'icon)
101 101
102(defcustom icon-continued-statement-offset 4 102(defcustom icon-continued-statement-offset 4
103 "*Extra indent for Icon lines not starting new statements." 103 "Extra indent for Icon lines not starting new statements."
104 :type 'integer 104 :type 'integer
105 :group 'icon) 105 :group 'icon)
106 106
107(defcustom icon-continued-brace-offset 0 107(defcustom icon-continued-brace-offset 0
108 "*Extra indent for Icon substatements that start with open-braces. 108 "Extra indent for Icon substatements that start with open-braces.
109This is in addition to `icon-continued-statement-offset'." 109This is in addition to `icon-continued-statement-offset'."
110 :type 'integer 110 :type 'integer
111 :group 'icon) 111 :group 'icon)
112 112
113(defcustom icon-auto-newline nil 113(defcustom icon-auto-newline nil
114 "*Non-nil means automatically newline before and after braces Icon code. 114 "Non-nil means automatically newline before and after braces Icon code.
115This applies when braces are inserted." 115This applies when braces are inserted."
116 :type 'boolean 116 :type 'boolean
117 :group 'icon) 117 :group 'icon)
118 118
119(defcustom icon-tab-always-indent t 119(defcustom icon-tab-always-indent t
120 "*Non-nil means TAB in Icon mode should always reindent the current line. 120 "Non-nil means TAB in Icon mode should always reindent the current line.
121It will then reindent, regardless of where in the line point is 121It will then reindent, regardless of where in the line point is
122when the TAB command is used." 122when the TAB command is used."
123 :type 'boolean 123 :type 'boolean
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index f2f9fd30ed4..0cb8b7da4aa 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -115,7 +115,7 @@ must be explicitly set non-nil in order for the variable
115 "Obsolete variable. See `idlwave-html-help-location'.") 115 "Obsolete variable. See `idlwave-html-help-location'.")
116 116
117(defcustom idlwave-help-use-dedicated-frame t 117(defcustom idlwave-help-use-dedicated-frame t
118 "*Non-nil means, use a separate frame for Online Help if possible." 118 "Non-nil means, use a separate frame for Online Help if possible."
119 :group 'idlwave-online-help 119 :group 'idlwave-online-help
120 :type 'boolean) 120 :type 'boolean)
121 121
@@ -164,12 +164,12 @@ probably a good idea to still call this function as a fallback."
164 :type 'symbol) 164 :type 'symbol)
165 165
166(defcustom idlwave-help-fontify-source-code nil 166(defcustom idlwave-help-fontify-source-code nil
167 "*Non-nil means, fontify source code displayed as help like normal code." 167 "Non-nil means, fontify source code displayed as help like normal code."
168 :group 'idlwave-online-help 168 :group 'idlwave-online-help
169 :type 'boolean) 169 :type 'boolean)
170 170
171(defcustom idlwave-help-source-try-header t 171(defcustom idlwave-help-source-try-header t
172 "*Non-nil means, try to find help in routine header when displaying source. 172 "Non-nil means, try to find help in routine header when displaying source.
173Routines which are not documented in the system manual use their source as 173Routines which are not documented in the system manual use their source as
174help text. When this variable is non-nil, we try to find a description of 174help text. When this variable is non-nil, we try to find a description of
175the help item in the first routine doclib header above the routine definition. 175the help item in the first routine doclib header above the routine definition.
@@ -180,14 +180,14 @@ definition is displayed instead."
180 180
181 181
182(defcustom idlwave-help-doclib-name "name" 182(defcustom idlwave-help-doclib-name "name"
183 "*A regexp for the heading word to search for in doclib headers 183 "A regexp for the heading word to search for in doclib headers
184which specifies the `name' section. Can be used for localization 184which specifies the `name' section. Can be used for localization
185support." 185support."
186 :group 'idlwave-online-help 186 :group 'idlwave-online-help
187 :type 'string) 187 :type 'string)
188 188
189(defcustom idlwave-help-doclib-keyword "KEYWORD" 189(defcustom idlwave-help-doclib-keyword "KEYWORD"
190 "*A regexp for the heading word to search for in doclib headers 190 "A regexp for the heading word to search for in doclib headers
191which specifies the `keywords' section. Can be used for localization 191which specifies the `keywords' section. Can be used for localization
192support." 192support."
193 :group 'idlwave-online-help 193 :group 'idlwave-online-help
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 55a085fbde0..d843de04913 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -106,7 +106,7 @@
106 :group 'idlwave) 106 :group 'idlwave)
107 107
108(defcustom idlwave-shell-prompt-pattern "^\r? ?IDL> " 108(defcustom idlwave-shell-prompt-pattern "^\r? ?IDL> "
109 "*Regexp to match IDL prompt at beginning of a line. 109 "Regexp to match IDL prompt at beginning of a line.
110For example, \"^\r?IDL> \" or \"^\r?WAVE> \". 110For example, \"^\r?IDL> \" or \"^\r?WAVE> \".
111The \"^\r?\" is needed, to indicate the beginning of the line, with 111The \"^\r?\" is needed, to indicate the beginning of the line, with
112optional return character (which IDL seems to output randomly). 112optional return character (which IDL seems to output randomly).
@@ -118,7 +118,7 @@ This is a fine thing to set in your `.emacs' file."
118 :type 'regexp) 118 :type 'regexp)
119 119
120(defcustom idlwave-shell-process-name "idl" 120(defcustom idlwave-shell-process-name "idl"
121 "*Name to be associated with the IDL process. The buffer for the 121 "Name to be associated with the IDL process. The buffer for the
122process output is made by surrounding this name with `*'s." 122process output is made by surrounding this name with `*'s."
123 :group 'idlwave-shell-general-setup 123 :group 'idlwave-shell-general-setup
124 :type 'string) 124 :type 'string)
@@ -126,12 +126,12 @@ process output is made by surrounding this name with `*'s."
126;; (defcustom idlwave-shell-automatic-start...) See idlwave.el 126;; (defcustom idlwave-shell-automatic-start...) See idlwave.el
127 127
128(defcustom idlwave-shell-use-dedicated-window nil 128(defcustom idlwave-shell-use-dedicated-window nil
129 "*Non-nil means, never replace the shell frame with another buffer." 129 "Non-nil means, never replace the shell frame with another buffer."
130 :group 'idlwave-shell-general-setup 130 :group 'idlwave-shell-general-setup
131 :type 'boolean) 131 :type 'boolean)
132 132
133(defcustom idlwave-shell-use-dedicated-frame nil 133(defcustom idlwave-shell-use-dedicated-frame nil
134 "*Non-nil means, IDLWAVE should use a special frame to display shell buffer." 134 "Non-nil means, IDLWAVE should use a special frame to display shell buffer."
135 :group 'idlwave-shell-general-setup 135 :group 'idlwave-shell-general-setup
136 :type 'boolean) 136 :type 'boolean)
137 137
@@ -145,12 +145,12 @@ The default makes the frame splittable, so that completion works correctly."
145 (cons symbol sexp))) 145 (cons symbol sexp)))
146 146
147(defcustom idlwave-shell-raise-frame t 147(defcustom idlwave-shell-raise-frame t
148 "*Non-nil means, `idlwave-shell' raises the frame showing the shell window." 148 "Non-nil means, `idlwave-shell' raises the frame showing the shell window."
149 :group 'idlwave-shell-general-setup 149 :group 'idlwave-shell-general-setup
150 :type 'boolean) 150 :type 'boolean)
151 151
152(defcustom idlwave-shell-arrows-do-history t 152(defcustom idlwave-shell-arrows-do-history t
153 "*Non-nil means UP and DOWN arrows move through command history. 153 "Non-nil means UP and DOWN arrows move through command history.
154This variable can have 3 values: 154This variable can have 3 values:
155nil Arrows just move the cursor 155nil Arrows just move the cursor
156t Arrows force the cursor back to the current command line and 156t Arrows force the cursor back to the current command line and
@@ -166,7 +166,7 @@ t Arrows force the cursor back to the current command line and
166;; FIXME: add comint-input-ring-size? 166;; FIXME: add comint-input-ring-size?
167 167
168(defcustom idlwave-shell-use-toolbar t 168(defcustom idlwave-shell-use-toolbar t
169 "*Non-nil means, use the debugging toolbar in all IDL related buffers. 169 "Non-nil means, use the debugging toolbar in all IDL related buffers.
170Starting the shell will then add the toolbar to all idlwave-mode buffers. 170Starting the shell will then add the toolbar to all idlwave-mode buffers.
171Exiting the shell will removed everywhere. 171Exiting the shell will removed everywhere.
172Available on XEmacs and on Emacs 21.x or later. 172Available on XEmacs and on Emacs 21.x or later.
@@ -176,7 +176,7 @@ At any time you can toggle the display of the toolbar with
176 :type 'boolean) 176 :type 'boolean)
177 177
178(defcustom idlwave-shell-temp-pro-prefix "/tmp/idltemp" 178(defcustom idlwave-shell-temp-pro-prefix "/tmp/idltemp"
179 "*The prefix for temporary IDL files used when compiling regions. 179 "The prefix for temporary IDL files used when compiling regions.
180It should be an absolute pathname. 180It should be an absolute pathname.
181The full temporary file name is obtained by using `make-temp-file' 181The full temporary file name is obtained by using `make-temp-file'
182so that the name will be unique among multiple Emacs processes." 182so that the name will be unique among multiple Emacs processes."
@@ -184,13 +184,13 @@ so that the name will be unique among multiple Emacs processes."
184 :type 'string) 184 :type 'string)
185 185
186(defvar idlwave-shell-fix-inserted-breaks nil 186(defvar idlwave-shell-fix-inserted-breaks nil
187 "*OBSOLETE VARIABLE, is no longer used. 187 "OBSOLETE VARIABLE, is no longer used.
188 188
189The documentation of this variable used to be: 189The documentation of this variable used to be:
190If non-nil then run `idlwave-shell-remove-breaks' to clean up IDL messages.") 190If non-nil then run `idlwave-shell-remove-breaks' to clean up IDL messages.")
191 191
192(defcustom idlwave-shell-prefix-key "\C-c\C-d" 192(defcustom idlwave-shell-prefix-key "\C-c\C-d"
193 "*The prefix key for the debugging map `idlwave-shell-mode-prefix-map'. 193 "The prefix key for the debugging map `idlwave-shell-mode-prefix-map'.
194This variable must already be set when idlwave-shell.el is loaded. 194This variable must already be set when idlwave-shell.el is loaded.
195Setting it in the mode-hook is too late." 195Setting it in the mode-hook is too late."
196 :group 'idlwave-shell-general-setup 196 :group 'idlwave-shell-general-setup
@@ -227,7 +227,7 @@ window, but is useful for stepping, etc."
227 "Obsolete variable. See `idlwave-shell-debug-modifiers'.") 227 "Obsolete variable. See `idlwave-shell-debug-modifiers'.")
228 228
229(defcustom idlwave-shell-use-truename nil 229(defcustom idlwave-shell-use-truename nil
230 "*Non-nil means, use `file-truename' when looking for buffers. 230 "Non-nil means, use `file-truename' when looking for buffers.
231If this variable is non-nil, Emacs will use the function `file-truename' to 231If this variable is non-nil, Emacs will use the function `file-truename' to
232resolve symbolic links in the file paths printed by e.g., STOP commands. 232resolve symbolic links in the file paths printed by e.g., STOP commands.
233This means, unvisited files will be loaded under their truename. 233This means, unvisited files will be loaded under their truename.
@@ -247,7 +247,7 @@ because these are used as separators by IDL."
247 :type 'string) 247 :type 'string)
248 248
249(defcustom idlwave-shell-mode-hook '() 249(defcustom idlwave-shell-mode-hook '()
250 "*Hook for customizing `idlwave-shell-mode'." 250 "Hook for customizing `idlwave-shell-mode'."
251 :group 'idlwave-shell-general-setup 251 :group 'idlwave-shell-general-setup
252 :type 'hook) 252 :type 'hook)
253 253
@@ -292,7 +292,7 @@ is non-nil."
292 292
293(defcustom idlwave-shell-show-commands 293(defcustom idlwave-shell-show-commands
294 '(run misc breakpoint) 294 '(run misc breakpoint)
295 "*A list of command types to show output from in the shell. 295 "A list of command types to show output from in the shell.
296Possibilities are 'run, 'debug, 'breakpoint, and 'misc. Unselected 296Possibilities are 'run, 'debug, 'breakpoint, and 'misc. Unselected
297types are not displayed in the shell. The type 'everything causes all 297types are not displayed in the shell. The type 'everything causes all
298the copious shell traffic to be displayed." 298the copious shell traffic to be displayed."
@@ -336,10 +336,10 @@ expression being examined."
336 (string :tag "Command")))) 336 (string :tag "Command"))))
337 337
338(defvar idlwave-shell-print-expression-function nil 338(defvar idlwave-shell-print-expression-function nil
339 "*OBSOLETE VARIABLE, is no longer used.") 339 "OBSOLETE VARIABLE, is no longer used.")
340 340
341(defcustom idlwave-shell-separate-examine-output t 341(defcustom idlwave-shell-separate-examine-output t
342 "*Non-nil means, put output of examine commands in their own buffer." 342 "Non-nil means, put output of examine commands in their own buffer."
343 :group 'idlwave-shell-command-setup 343 :group 'idlwave-shell-command-setup
344 :type 'boolean) 344 :type 'boolean)
345 345
@@ -359,12 +359,12 @@ newly created."
359 (cons variable sexp))) 359 (cons variable sexp)))
360 360
361(defcustom idlwave-shell-query-for-class t 361(defcustom idlwave-shell-query-for-class t
362 "*Non-nil means query the shell for object class on object completions." 362 "Non-nil means query the shell for object class on object completions."
363 :group 'idlwave-shell-command-setup 363 :group 'idlwave-shell-command-setup
364 :type 'boolean) 364 :type 'boolean)
365 365
366(defcustom idlwave-shell-use-input-mode-magic nil 366(defcustom idlwave-shell-use-input-mode-magic nil
367 "*Non-nil means, IDLWAVE should check for input mode spells in output. 367 "Non-nil means, IDLWAVE should check for input mode spells in output.
368The spells are strings printed by your IDL program and matched 368The spells are strings printed by your IDL program and matched
369by the regular expressions in `idlwave-shell-input-mode-spells'. 369by the regular expressions in `idlwave-shell-input-mode-spells'.
370When these expressions match, IDLWAVE switches to character input mode and 370When these expressions match, IDLWAVE switches to character input mode and
@@ -432,7 +432,7 @@ end"
432 (regexp :tag "Line-mode regexp"))) 432 (regexp :tag "Line-mode regexp")))
433 433
434(defcustom idlwave-shell-breakpoint-popup-menu t 434(defcustom idlwave-shell-breakpoint-popup-menu t
435 "*If non-nil, provide a menu on mouse-3 on breakpoint lines, and 435 "If non-nil, provide a menu on mouse-3 on breakpoint lines, and
436popup help text on the line." 436popup help text on the line."
437 :group 'idlwave-shell-command-setup 437 :group 'idlwave-shell-command-setup
438 :type 'boolean) 438 :type 'boolean)
@@ -449,7 +449,7 @@ popup help text on the line."
449 :group 'idlwave) 449 :group 'idlwave)
450 450
451(defcustom idlwave-shell-mark-stop-line t 451(defcustom idlwave-shell-mark-stop-line t
452 "*Non-nil means, mark the source code line where IDL is currently stopped. 452 "Non-nil means, mark the source code line where IDL is currently stopped.
453Value decides about the method which is used to mark the line. Valid values 453Value decides about the method which is used to mark the line. Valid values
454are: 454are:
455 455
@@ -471,7 +471,7 @@ hides any code, so setting this to 'arrow on Emacs 21 sounds like a good idea."
471 (const :tag "Face or arrow." t))) 471 (const :tag "Face or arrow." t)))
472 472
473(defcustom idlwave-shell-overlay-arrow ">" 473(defcustom idlwave-shell-overlay-arrow ">"
474 "*The overlay arrow to display at source lines where execution halts. 474 "The overlay arrow to display at source lines where execution halts.
475We use a single character by default, since the main block of IDL procedures 475We use a single character by default, since the main block of IDL procedures
476often has no indentation. Where possible, IDLWAVE will use overlays to 476often has no indentation. Where possible, IDLWAVE will use overlays to
477display the stop-lines. The arrow is only used on character-based terminals. 477display the stop-lines. The arrow is only used on character-based terminals.
@@ -480,14 +480,14 @@ See also `idlwave-shell-use-overlay-arrow'."
480 :type 'string) 480 :type 'string)
481 481
482(defcustom idlwave-shell-stop-line-face 'highlight 482(defcustom idlwave-shell-stop-line-face 'highlight
483 "*The face for `idlwave-shell-stop-line-overlay'. 483 "The face for `idlwave-shell-stop-line-overlay'.
484Allows you to choose the font, color and other properties for 484Allows you to choose the font, color and other properties for
485line where IDL is stopped. See also `idlwave-shell-mark-stop-line'." 485line where IDL is stopped. See also `idlwave-shell-mark-stop-line'."
486 :group 'idlwave-shell-highlighting-and-faces 486 :group 'idlwave-shell-highlighting-and-faces
487 :type 'symbol) 487 :type 'symbol)
488 488
489(defcustom idlwave-shell-electric-stop-color "Violet" 489(defcustom idlwave-shell-electric-stop-color "Violet"
490 "*The color for the default face or overlay arrow when stopped." 490 "The color for the default face or overlay arrow when stopped."
491 :group 'idlwave-shell-highlighting-and-faces 491 :group 'idlwave-shell-highlighting-and-faces
492 :type 'string) 492 :type 'string)
493 493
@@ -499,14 +499,14 @@ line where IDL is stopped. See also `idlwave-shell-mark-stop-line'."
499 (condition-case nil 499 (condition-case nil
500 (set-face-foreground 'idlwave-shell-electric-stop-line nil) 500 (set-face-foreground 'idlwave-shell-electric-stop-line nil)
501 (error nil))) 501 (error nil)))
502 "*The face for `idlwave-shell-stop-line-overlay' when in electric debug mode. 502 "The face for `idlwave-shell-stop-line-overlay' when in electric debug mode.
503Allows you to choose the font, color and other properties for the line 503Allows you to choose the font, color and other properties for the line
504where IDL is stopped, when in Electric Debug Mode." 504where IDL is stopped, when in Electric Debug Mode."
505 :group 'idlwave-shell-highlighting-and-faces 505 :group 'idlwave-shell-highlighting-and-faces
506 :type 'symbol) 506 :type 'symbol)
507 507
508(defcustom idlwave-shell-mark-breakpoints t 508(defcustom idlwave-shell-mark-breakpoints t
509 "*Non-nil means, mark breakpoints in the source files. 509 "Non-nil means, mark breakpoints in the source files.
510Valid values are: 510Valid values are:
511nil Do not mark breakpoints. 511nil Do not mark breakpoints.
512'face Highlight line with `idlwave-shell-breakpoint-face'. 512'face Highlight line with `idlwave-shell-breakpoint-face'.
@@ -524,7 +524,7 @@ t Glyph when possible, otherwise face (same effect as 'glyph)."
524 "Obsolete variable. See `idlwave-shell-mark-breakpoints'.") 524 "Obsolete variable. See `idlwave-shell-mark-breakpoints'.")
525 525
526(defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp 526(defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp
527 "*The face for breakpoint lines in the source code. 527 "The face for breakpoint lines in the source code.
528Allows you to choose the font, color and other properties for 528Allows you to choose the font, color and other properties for
529lines which have a breakpoint. See also `idlwave-shell-mark-breakpoints'." 529lines which have a breakpoint. See also `idlwave-shell-mark-breakpoints'."
530 :group 'idlwave-shell-highlighting-and-faces 530 :group 'idlwave-shell-highlighting-and-faces
@@ -542,7 +542,7 @@ lines which have a breakpoint. See also `idlwave-shell-mark-breakpoints'."
542 542
543(defcustom idlwave-shell-disabled-breakpoint-face 543(defcustom idlwave-shell-disabled-breakpoint-face
544 'idlwave-shell-disabled-bp 544 'idlwave-shell-disabled-bp
545 "*The face for disabled breakpoint lines in the source code. 545 "The face for disabled breakpoint lines in the source code.
546Allows you to choose the font, color and other properties for 546Allows you to choose the font, color and other properties for
547lines which have a breakpoint. See also `idlwave-shell-mark-breakpoints'." 547lines which have a breakpoint. See also `idlwave-shell-mark-breakpoints'."
548 :group 'idlwave-shell-highlighting-and-faces 548 :group 'idlwave-shell-highlighting-and-faces
@@ -560,14 +560,14 @@ lines which have a breakpoint. See also `idlwave-shell-mark-breakpoints'."
560 560
561 561
562(defcustom idlwave-shell-expression-face 'secondary-selection 562(defcustom idlwave-shell-expression-face 'secondary-selection
563 "*The face for `idlwave-shell-expression-overlay'. 563 "The face for `idlwave-shell-expression-overlay'.
564Allows you to choose the font, color and other properties for 564Allows you to choose the font, color and other properties for
565the expression printed by IDL." 565the expression printed by IDL."
566 :group 'idlwave-shell-highlighting-and-faces 566 :group 'idlwave-shell-highlighting-and-faces
567 :type 'symbol) 567 :type 'symbol)
568 568
569(defcustom idlwave-shell-output-face 'secondary-selection 569(defcustom idlwave-shell-output-face 'secondary-selection
570 "*The face for `idlwave-shell-output-overlay'. 570 "The face for `idlwave-shell-output-overlay'.
571Allows you to choose the font, color and other properties for 571Allows you to choose the font, color and other properties for
572the expression output by IDL." 572the expression output by IDL."
573 :group 'idlwave-shell-highlighting-and-faces 573 :group 'idlwave-shell-highlighting-and-faces
@@ -784,7 +784,7 @@ with `*'s."
784 "^% Skipped to:" 784 "^% Skipped to:"
785 "^% Stop encountered:" 785 "^% Stop encountered:"
786 ) 786 )
787 "*A list of regular expressions matching IDL messages. 787 "A list of regular expressions matching IDL messages.
788These are the messages containing file and line information where 788These are the messages containing file and line information where
789IDL is currently stopped.") 789IDL is currently stopped.")
790 790
@@ -795,19 +795,19 @@ IDL is currently stopped.")
795 795
796(defconst idlwave-shell-trace-message-re 796(defconst idlwave-shell-trace-message-re
797 "^% At " ;; First line of a trace message 797 "^% At " ;; First line of a trace message
798 "*A regular expression matching IDL trace messages. These are the 798 "A regular expression matching IDL trace messages. These are the
799messages containing file and line information of a current 799messages containing file and line information of a current
800traceback.") 800traceback.")
801 801
802(defconst idlwave-shell-step-messages 802(defconst idlwave-shell-step-messages
803 '("^% Stepped to:" 803 '("^% Stepped to:"
804 ) 804 )
805 "*A list of regular expressions matching stepped execution messages. 805 "A list of regular expressions matching stepped execution messages.
806These are IDL messages containing file and line information where 806These are IDL messages containing file and line information where
807IDL has currently stepped.") 807IDL has currently stepped.")
808 808
809(defvar idlwave-shell-break-message "^% Breakpoint at:" 809(defvar idlwave-shell-break-message "^% Breakpoint at:"
810 "*Regular expression matching an IDL breakpoint message line.") 810 "Regular expression matching an IDL breakpoint message line.")
811 811
812(defconst idlwave-shell-electric-debug-help 812(defconst idlwave-shell-electric-debug-help
813 " ==> IDLWAVE Electric Debug Mode Help <== 813 " ==> IDLWAVE Electric Debug Mode Help <==
@@ -1672,7 +1672,7 @@ number.")
1672 "\\([ \t]*\n[ \t]*[^ \t\n]+\\)*" ; continuation lines file name (6) 1672 "\\([ \t]*\n[ \t]*[^ \t\n]+\\)*" ; continuation lines file name (6)
1673 "\\)" ; end line number group (5) 1673 "\\)" ; end line number group (5)
1674 ) 1674 )
1675 "*A regular expression to parse out the file name and line number. 1675 "A regular expression to parse out the file name and line number.
1676The 1st group should match the subroutine name. 1676The 1st group should match the subroutine name.
1677The 3rd group is the line number. 1677The 3rd group is the line number.
1678The 5th group is the file name. 1678The 5th group is the file name.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 31fe20698b9..74f37df9b2d 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -195,34 +195,34 @@
195 :group 'idlwave) 195 :group 'idlwave)
196 196
197(defcustom idlwave-main-block-indent 2 197(defcustom idlwave-main-block-indent 2
198 "*Extra indentation for the main block of code. 198 "Extra indentation for the main block of code.
199That is the block between the FUNCTION/PRO statement and the END 199That is the block between the FUNCTION/PRO statement and the END
200statement for that program unit." 200statement for that program unit."
201 :group 'idlwave-code-formatting 201 :group 'idlwave-code-formatting
202 :type 'integer) 202 :type 'integer)
203 203
204(defcustom idlwave-block-indent 3 204(defcustom idlwave-block-indent 3
205 "*Extra indentation applied to block lines. 205 "Extra indentation applied to block lines.
206If you change this, you probably also want to change `idlwave-end-offset'." 206If you change this, you probably also want to change `idlwave-end-offset'."
207 :group 'idlwave-code-formatting 207 :group 'idlwave-code-formatting
208 :type 'integer) 208 :type 'integer)
209 209
210(defcustom idlwave-end-offset -3 210(defcustom idlwave-end-offset -3
211 "*Extra indentation applied to block END lines. 211 "Extra indentation applied to block END lines.
212A value equal to negative `idlwave-block-indent' will make END lines 212A value equal to negative `idlwave-block-indent' will make END lines
213line up with the block BEGIN lines." 213line up with the block BEGIN lines."
214 :group 'idlwave-code-formatting 214 :group 'idlwave-code-formatting
215 :type 'integer) 215 :type 'integer)
216 216
217(defcustom idlwave-continuation-indent 3 217(defcustom idlwave-continuation-indent 3
218 "*Extra indentation applied to continuation lines. 218 "Extra indentation applied to continuation lines.
219This extra offset applies to the first of a set of continuation lines. 219This extra offset applies to the first of a set of continuation lines.
220The following lines receive the same indentation as the first." 220The following lines receive the same indentation as the first."
221 :group 'idlwave-code-formatting 221 :group 'idlwave-code-formatting
222 :type 'integer) 222 :type 'integer)
223 223
224(defcustom idlwave-max-extra-continuation-indent 40 224(defcustom idlwave-max-extra-continuation-indent 40
225 "*Maximum additional indentation for special continuation indent. 225 "Maximum additional indentation for special continuation indent.
226Several special indentations are tried to help line up continuation 226Several special indentations are tried to help line up continuation
227lines in routine calls or definitions, other statements with 227lines in routine calls or definitions, other statements with
228parentheses, or assignment statements. This variable specifies a 228parentheses, or assignment statements. This variable specifies a
@@ -236,7 +236,7 @@ this variable."
236 :type 'integer) 236 :type 'integer)
237 237
238(defcustom idlwave-indent-to-open-paren t 238(defcustom idlwave-indent-to-open-paren t
239 "*Non-nil means, indent continuation lines to innermost open parenthesis. 239 "Non-nil means, indent continuation lines to innermost open parenthesis.
240This indentation occurs even if otherwise disallowed by 240This indentation occurs even if otherwise disallowed by
241`idlwave-max-extra-continuation-indent'. Matching parens and the 241`idlwave-max-extra-continuation-indent'. Matching parens and the
242interleaving args are lined up. Example: 242interleaving args are lined up. Example:
@@ -260,38 +260,38 @@ would yield:
260 :type 'boolean) 260 :type 'boolean)
261 261
262(defcustom idlwave-indent-parens-nested nil 262(defcustom idlwave-indent-parens-nested nil
263 "*Non-nil means, indent continuation lines with parens by nesting 263 "Non-nil means, indent continuation lines with parens by nesting
264lines at consecutively deeper levels." 264lines at consecutively deeper levels."
265 :group 'idlwave-code-formatting 265 :group 'idlwave-code-formatting
266 :type 'boolean) 266 :type 'boolean)
267 267
268 268
269(defcustom idlwave-hanging-indent t 269(defcustom idlwave-hanging-indent t
270 "*If set non-nil then comment paragraphs are indented under the 270 "If set non-nil then comment paragraphs are indented under the
271hanging indent given by `idlwave-hang-indent-regexp' match in the first line 271hanging indent given by `idlwave-hang-indent-regexp' match in the first line
272of the paragraph." 272of the paragraph."
273 :group 'idlwave-code-formatting 273 :group 'idlwave-code-formatting
274 :type 'boolean) 274 :type 'boolean)
275 275
276(defcustom idlwave-hang-indent-regexp "- " 276(defcustom idlwave-hang-indent-regexp "- "
277 "*Regular expression matching the position of the hanging indent 277 "Regular expression matching the position of the hanging indent
278in the first line of a comment paragraph. The size of the indent 278in the first line of a comment paragraph. The size of the indent
279extends to the end of the match for the regular expression." 279extends to the end of the match for the regular expression."
280 :group 'idlwave-code-formatting 280 :group 'idlwave-code-formatting
281 :type 'regexp) 281 :type 'regexp)
282 282
283(defcustom idlwave-use-last-hang-indent nil 283(defcustom idlwave-use-last-hang-indent nil
284 "*If non-nil then use last match on line for `idlwave-indent-regexp'." 284 "If non-nil then use last match on line for `idlwave-indent-regexp'."
285 :group 'idlwave-code-formatting 285 :group 'idlwave-code-formatting
286 :type 'boolean) 286 :type 'boolean)
287 287
288(defcustom idlwave-fill-comment-line-only t 288(defcustom idlwave-fill-comment-line-only t
289 "*If non-nil then auto fill will only operate on comment lines." 289 "If non-nil then auto fill will only operate on comment lines."
290 :group 'idlwave-code-formatting 290 :group 'idlwave-code-formatting
291 :type 'boolean) 291 :type 'boolean)
292 292
293(defcustom idlwave-auto-fill-split-string t 293(defcustom idlwave-auto-fill-split-string t
294 "*If non-nil then auto fill will split strings with the IDL `+' operator. 294 "If non-nil then auto fill will split strings with the IDL `+' operator.
295When the line end falls within a string, string concatenation with the 295When the line end falls within a string, string concatenation with the
296'+' operator will be used to distribute a long string over lines. 296'+' operator will be used to distribute a long string over lines.
297If nil and a string is split then a terminal beep and warning are issued. 297If nil and a string is split then a terminal beep and warning are issued.
@@ -302,7 +302,7 @@ non-nil, since in this case code is not auto-filled."
302 :type 'boolean) 302 :type 'boolean)
303 303
304(defcustom idlwave-split-line-string t 304(defcustom idlwave-split-line-string t
305 "*If non-nil then `idlwave-split-line' will split strings with `+'. 305 "If non-nil then `idlwave-split-line' will split strings with `+'.
306When the splitting point of a line falls inside a string, split the string 306When the splitting point of a line falls inside a string, split the string
307using the `+' string concatenation operator. If nil and a string is 307using the `+' string concatenation operator. If nil and a string is
308split then a terminal beep and warning are issued." 308split then a terminal beep and warning are issued."
@@ -310,14 +310,14 @@ split then a terminal beep and warning are issued."
310 :type 'boolean) 310 :type 'boolean)
311 311
312(defcustom idlwave-no-change-comment ";;;" 312(defcustom idlwave-no-change-comment ";;;"
313 "*The indentation of a comment that starts with this regular 313 "The indentation of a comment that starts with this regular
314expression will not be changed. Note that the indentation of a comment 314expression will not be changed. Note that the indentation of a comment
315at the beginning of a line is never changed." 315at the beginning of a line is never changed."
316 :group 'idlwave-code-formatting 316 :group 'idlwave-code-formatting
317 :type 'string) 317 :type 'string)
318 318
319(defcustom idlwave-begin-line-comment nil 319(defcustom idlwave-begin-line-comment nil
320 "*A comment anchored at the beginning of line. 320 "A comment anchored at the beginning of line.
321A comment matching this regular expression will not have its 321A comment matching this regular expression will not have its
322indentation changed. If nil the default is \"^;\", i.e., any line 322indentation changed. If nil the default is \"^;\", i.e., any line
323beginning with a \";\". Expressions for comments at the beginning of 323beginning with a \";\". Expressions for comments at the beginning of
@@ -327,7 +327,7 @@ the line should begin with \"^\"."
327 'regexp)) 327 'regexp))
328 328
329(defcustom idlwave-code-comment ";;[^;]" 329(defcustom idlwave-code-comment ";;[^;]"
330 "*A comment that starts with this regular expression on a line by 330 "A comment that starts with this regular expression on a line by
331itself is indented as if it is a part of IDL code. As a result if 331itself is indented as if it is a part of IDL code. As a result if
332the comment is not preceded by whitespace it is unchanged." 332the comment is not preceded by whitespace it is unchanged."
333 :group 'idlwave-code-formatting 333 :group 'idlwave-code-formatting
@@ -343,7 +343,7 @@ the comment is not preceded by whitespace it is unchanged."
343 :group 'idlwave) 343 :group 'idlwave)
344 344
345(defcustom idlwave-use-library-catalogs t 345(defcustom idlwave-use-library-catalogs t
346 "*Non-nil means search the IDL path for library catalog files. 346 "Non-nil means search the IDL path for library catalog files.
347 347
348These files, named .idlwave_catalog, document routine information for 348These files, named .idlwave_catalog, document routine information for
349individual directories and libraries of IDL .pro files. Many popular 349individual directories and libraries of IDL .pro files. Many popular
@@ -353,7 +353,7 @@ usually a good idea."
353 :type 'boolean) 353 :type 'boolean)
354 354
355(defcustom idlwave-init-rinfo-when-idle-after 10 355(defcustom idlwave-init-rinfo-when-idle-after 10
356 "*Seconds of idle time before routine info is automatically initialized. 356 "Seconds of idle time before routine info is automatically initialized.
357Initializing the routine info can take a long time, in particular if a 357Initializing the routine info can take a long time, in particular if a
358large number of library catalogs are involved. When Emacs is idle for 358large number of library catalogs are involved. When Emacs is idle for
359more than the number of seconds specified by this variable, it starts 359more than the number of seconds specified by this variable, it starts
@@ -370,7 +370,7 @@ needed, and initialize then."
370 :type 'number) 370 :type 'number)
371 371
372(defcustom idlwave-scan-all-buffers-for-routine-info t 372(defcustom idlwave-scan-all-buffers-for-routine-info t
373 "*Non-nil means, scan buffers for IDL programs when updating info. 373 "Non-nil means, scan buffers for IDL programs when updating info.
374The scanning is done by the command `idlwave-update-routine-info'. 374The scanning is done by the command `idlwave-update-routine-info'.
375The following values are allowed: 375The following values are allowed:
376 376
@@ -384,7 +384,7 @@ current Scan only the current buffer, but no other buffers."
384 (const :tag "Current buffer only" 'current))) 384 (const :tag "Current buffer only" 'current)))
385 385
386(defcustom idlwave-query-shell-for-routine-info t 386(defcustom idlwave-query-shell-for-routine-info t
387 "*Non-nil means query the shell for info about compiled routines. 387 "Non-nil means query the shell for info about compiled routines.
388Querying the shell is useful to get information about compiled modules, 388Querying the shell is useful to get information about compiled modules,
389and it is turned on by default. However, when you have a complete library 389and it is turned on by default. However, when you have a complete library
390scan, this is not necessary." 390scan, this is not necessary."
@@ -393,7 +393,7 @@ scan, this is not necessary."
393 393
394(defcustom idlwave-auto-routine-info-updates 394(defcustom idlwave-auto-routine-info-updates
395 '(find-file save-buffer kill-buffer compile-buffer) 395 '(find-file save-buffer kill-buffer compile-buffer)
396 "*Controls under what circumstances routine info is updated automatically. 396 "Controls under what circumstances routine info is updated automatically.
397Possible values: 397Possible values:
398nil Never 398nil Never
399t All available 399t All available
@@ -413,7 +413,7 @@ t All available
413 (const :tag "After a buffer was compiled successfully, update shell info" compile-buffer)))) 413 (const :tag "After a buffer was compiled successfully, update shell info" compile-buffer))))
414 414
415(defcustom idlwave-rinfo-max-source-lines 5 415(defcustom idlwave-rinfo-max-source-lines 5
416 "*Maximum number of source files displayed in the Routine Info window. 416 "Maximum number of source files displayed in the Routine Info window.
417When an integer, it is the maximum number of source files displayed. 417When an integer, it is the maximum number of source files displayed.
418A value of t means to show all source files." 418A value of t means to show all source files."
419 :group 'idlwave-routine-info 419 :group 'idlwave-routine-info
@@ -448,7 +448,7 @@ value of `!DIR'. See also `idlwave-library-path'."
448;; Configuration files 448;; Configuration files
449(defcustom idlwave-config-directory 449(defcustom idlwave-config-directory
450 (convert-standard-filename "~/.idlwave") 450 (convert-standard-filename "~/.idlwave")
451 "*Directory for configuration files and user-library catalog." 451 "Directory for configuration files and user-library catalog."
452 :group 'idlwave-routine-info 452 :group 'idlwave-routine-info
453 :type 'file) 453 :type 'file)
454 454
@@ -457,7 +457,7 @@ value of `!DIR'. See also `idlwave-library-path'."
457(defvar idlwave-path-file "idlpath.el") 457(defvar idlwave-path-file "idlpath.el")
458 458
459(defvar idlwave-libinfo-file nil 459(defvar idlwave-libinfo-file nil
460 "*Obsolete variable, no longer used.") 460 "Obsolete variable, no longer used.")
461 461
462(defcustom idlwave-special-lib-alist nil 462(defcustom idlwave-special-lib-alist nil
463 "Alist of regular expressions matching special library directories. 463 "Alist of regular expressions matching special library directories.
@@ -538,7 +538,7 @@ After changing this variable, you need to either restart Emacs or press
538 ,idlwave-tmp))) 538 ,idlwave-tmp)))
539 539
540(defcustom idlwave-completion-force-default-case nil 540(defcustom idlwave-completion-force-default-case nil
541 "*Non-nil means, completion will always honor `idlwave-completion-case'. 541 "Non-nil means, completion will always honor `idlwave-completion-case'.
542When nil, only the completion of a mixed case or upper case string 542When nil, only the completion of a mixed case or upper case string
543will honor the default settings in `idlwave-completion-case', while 543will honor the default settings in `idlwave-completion-case', while
544the completion of lower case strings will be completed entirely in 544the completion of lower case strings will be completed entirely in
@@ -547,7 +547,7 @@ lower case."
547 :type 'boolean) 547 :type 'boolean)
548 548
549(defcustom idlwave-complete-empty-string-as-lower-case nil 549(defcustom idlwave-complete-empty-string-as-lower-case nil
550 "*Non-nil means, the empty string is considered downcase for completion. 550 "Non-nil means, the empty string is considered downcase for completion.
551The case of what is already in the buffer determines the case of completions. 551The case of what is already in the buffer determines the case of completions.
552When this variable is non-nil, the empty string is considered to be downcase. 552When this variable is non-nil, the empty string is considered to be downcase.
553Completing on the empty string then offers downcase versions of the possible 553Completing on the empty string then offers downcase versions of the possible
@@ -560,7 +560,7 @@ completions."
560`idlwave-completion-case'.") 560`idlwave-completion-case'.")
561 561
562(defcustom idlwave-buffer-case-takes-precedence nil 562(defcustom idlwave-buffer-case-takes-precedence nil
563 "*Non-nil means, the case of tokens in buffers dominates over system stuff. 563 "Non-nil means, the case of tokens in buffers dominates over system stuff.
564To make this possible, we need to re-case everything each time we update 564To make this possible, we need to re-case everything each time we update
565the routine info from the buffers. This is slow. 565the routine info from the buffers. This is slow.
566The default is to consider the case given in the system and library files 566The default is to consider the case given in the system and library files
@@ -569,7 +569,7 @@ first which makes updating much faster."
569 :type 'boolean) 569 :type 'boolean)
570 570
571(defcustom idlwave-highlight-help-links-in-completion t 571(defcustom idlwave-highlight-help-links-in-completion t
572 "*Non-nil means, highlight completions for which system help is available. 572 "Non-nil means, highlight completions for which system help is available.
573Help can then be accessed with mouse-3. 573Help can then be accessed with mouse-3.
574This option is only effective when the online help system is installed." 574This option is only effective when the online help system is installed."
575 :group 'idlwave-completion 575 :group 'idlwave-completion
@@ -594,7 +594,7 @@ for which to assume this can be set here."
594 594
595 595
596(defcustom idlwave-completion-show-classes 1 596(defcustom idlwave-completion-show-classes 1
597 "*Number of classes to show when completing object methods and keywords. 597 "Number of classes to show when completing object methods and keywords.
598When completing methods or keywords for an object with unknown class, 598When completing methods or keywords for an object with unknown class,
599the *Completions* buffer will show the valid classes for each completion 599the *Completions* buffer will show the valid classes for each completion
600like this: 600like this:
@@ -613,7 +613,7 @@ negative integer, the `help-echo' property will be suppressed."
613 (integer :tag "Number of classes shown" 1))) 613 (integer :tag "Number of classes shown" 1)))
614 614
615(defcustom idlwave-completion-fontify-classes t 615(defcustom idlwave-completion-fontify-classes t
616 "*Non-nil means, fontify the classes in completions buffer. 616 "Non-nil means, fontify the classes in completions buffer.
617This makes it easier to distinguish the completion items from the extra 617This makes it easier to distinguish the completion items from the extra
618class info listed. See `idlwave-completion-show-classes'." 618class info listed. See `idlwave-completion-show-classes'."
619 :group 'idlwave-completion 619 :group 'idlwave-completion
@@ -673,7 +673,7 @@ method, add an entry (\"INIT\" . t). The method name must be ALL-CAPS."
673 (boolean :tag "Determine class for this method"))))) 673 (boolean :tag "Determine class for this method")))))
674 674
675(defcustom idlwave-store-inquired-class t 675(defcustom idlwave-store-inquired-class t
676 "*Non-nil means, store class of a method call as text property on `->'. 676 "Non-nil means, store class of a method call as text property on `->'.
677IDLWAVE sometimes has to ask the user for the class associated with a 677IDLWAVE sometimes has to ask the user for the class associated with a
678particular object method call. This happens during the commands 678particular object method call. This happens during the commands
679`idlwave-routine-info' and `idlwave-complete', depending upon the 679`idlwave-routine-info' and `idlwave-complete', depending upon the
@@ -698,7 +698,7 @@ at point."
698 :type 'boolean) 698 :type 'boolean)
699 699
700(defcustom idlwave-class-arrow-face 'bold 700(defcustom idlwave-class-arrow-face 'bold
701 "*Face to highlight object operator arrows `->' which carry a class property. 701 "Face to highlight object operator arrows `->' which carry a class property.
702When IDLWAVE stores a class name as text property on an object arrow 702When IDLWAVE stores a class name as text property on an object arrow
703\(see variable `idlwave-store-inquired-class', it highlights the arrow 703\(see variable `idlwave-store-inquired-class', it highlights the arrow
704with this font in order to remind the user that this arrow is special." 704with this font in order to remind the user that this arrow is special."
@@ -706,17 +706,17 @@ with this font in order to remind the user that this arrow is special."
706 :type 'symbol) 706 :type 'symbol)
707 707
708(defcustom idlwave-resize-routine-help-window t 708(defcustom idlwave-resize-routine-help-window t
709 "*Non-nil means, resize the Routine-info *Help* window to fit the content." 709 "Non-nil means, resize the Routine-info *Help* window to fit the content."
710 :group 'idlwave-completion 710 :group 'idlwave-completion
711 :type 'boolean) 711 :type 'boolean)
712 712
713(defcustom idlwave-keyword-completion-adds-equal t 713(defcustom idlwave-keyword-completion-adds-equal t
714 "*Non-nil means, completion automatically adds `=' after completed keywords." 714 "Non-nil means, completion automatically adds `=' after completed keywords."
715 :group 'idlwave-completion 715 :group 'idlwave-completion
716 :type 'boolean) 716 :type 'boolean)
717 717
718(defcustom idlwave-function-completion-adds-paren t 718(defcustom idlwave-function-completion-adds-paren t
719 "*Non-nil means, completion automatically adds `(' after completed function. 719 "Non-nil means, completion automatically adds `(' after completed function.
720nil means, don't add anything. 720nil means, don't add anything.
721A value of `2' means, also add the closing parenthesis and position cursor 721A value of `2' means, also add the closing parenthesis and position cursor
722between the two." 722between the two."
@@ -726,7 +726,7 @@ between the two."
726 (const :tag "()" 2))) 726 (const :tag "()" 2)))
727 727
728(defcustom idlwave-completion-restore-window-configuration t 728(defcustom idlwave-completion-restore-window-configuration t
729 "*Non-nil means, try to restore the window configuration after completion. 729 "Non-nil means, try to restore the window configuration after completion.
730When completion is not unique, Emacs displays a list of completions. 730When completion is not unique, Emacs displays a list of completions.
731This messes up your window configuration. With this variable set, IDLWAVE 731This messes up your window configuration. With this variable set, IDLWAVE
732restores the old configuration after successful completion." 732restores the old configuration after successful completion."
@@ -741,13 +741,13 @@ The variables in this group govern this."
741 :group 'idlwave) 741 :group 'idlwave)
742 742
743(defcustom idlwave-do-actions nil 743(defcustom idlwave-do-actions nil
744 "*Non-nil means performs actions when indenting. 744 "Non-nil means performs actions when indenting.
745The actions that can be performed are listed in `idlwave-indent-action-table'." 745The actions that can be performed are listed in `idlwave-indent-action-table'."
746 :group 'idlwave-abbrev-and-indent-action 746 :group 'idlwave-abbrev-and-indent-action
747 :type 'boolean) 747 :type 'boolean)
748 748
749(defcustom idlwave-abbrev-start-char "\\" 749(defcustom idlwave-abbrev-start-char "\\"
750 "*A single character string used to start abbreviations in abbrev mode. 750 "A single character string used to start abbreviations in abbrev mode.
751Possible characters to chose from: ~`\% 751Possible characters to chose from: ~`\%
752or even '?'. '.' is not a good choice because it can make structure 752or even '?'. '.' is not a good choice because it can make structure
753field names act like abbrevs in certain circumstances. 753field names act like abbrevs in certain circumstances.
@@ -759,7 +759,7 @@ is loaded."
759 :type 'string) 759 :type 'string)
760 760
761(defcustom idlwave-surround-by-blank nil 761(defcustom idlwave-surround-by-blank nil
762 "*Non-nil means, enable `idlwave-surround'. 762 "Non-nil means, enable `idlwave-surround'.
763If non-nil, `=',`<',`>',`&',`,', `->' are surrounded with spaces by 763If non-nil, `=',`<',`>',`&',`,', `->' are surrounded with spaces by
764`idlwave-surround'. 764`idlwave-surround'.
765See help for `idlwave-indent-action-table' for symbols using `idlwave-surround'. 765See help for `idlwave-indent-action-table' for symbols using `idlwave-surround'.
@@ -774,7 +774,7 @@ Also see help for `idlwave-surround'."
774 :type 'boolean) 774 :type 'boolean)
775 775
776(defcustom idlwave-pad-keyword t 776(defcustom idlwave-pad-keyword t
777 "*Non-nil means pad '=' in keywords (routine calls or defs) like assignment. 777 "Non-nil means pad '=' in keywords (routine calls or defs) like assignment.
778Whenever `idlwave-surround' is non-nil then this affects how '=' is 778Whenever `idlwave-surround' is non-nil then this affects how '=' is
779padded for keywords and for variables. If t, pad the same as for 779padded for keywords and for variables. If t, pad the same as for
780assignments. If nil then spaces are removed. With any other value, 780assignments. If nil then spaces are removed. With any other value,
@@ -786,22 +786,22 @@ spaces are left unchanged."
786 (const :tag "Keep space near `='" 'keep))) 786 (const :tag "Keep space near `='" 'keep)))
787 787
788(defcustom idlwave-show-block t 788(defcustom idlwave-show-block t
789 "*Non-nil means point blinks to block beginning for `idlwave-show-begin'." 789 "Non-nil means point blinks to block beginning for `idlwave-show-begin'."
790 :group 'idlwave-abbrev-and-indent-action 790 :group 'idlwave-abbrev-and-indent-action
791 :type 'boolean) 791 :type 'boolean)
792 792
793(defcustom idlwave-expand-generic-end nil 793(defcustom idlwave-expand-generic-end nil
794 "*Non-nil means expand generic END to ENDIF/ENDELSE/ENDWHILE etc." 794 "Non-nil means expand generic END to ENDIF/ENDELSE/ENDWHILE etc."
795 :group 'idlwave-abbrev-and-indent-action 795 :group 'idlwave-abbrev-and-indent-action
796 :type 'boolean) 796 :type 'boolean)
797 797
798(defcustom idlwave-reindent-end t 798(defcustom idlwave-reindent-end t
799 "*Non-nil means re-indent line after END was typed." 799 "Non-nil means re-indent line after END was typed."
800 :group 'idlwave-abbrev-and-indent-action 800 :group 'idlwave-abbrev-and-indent-action
801 :type 'boolean) 801 :type 'boolean)
802 802
803(defcustom idlwave-abbrev-move t 803(defcustom idlwave-abbrev-move t
804 "*Non-nil means the abbrev hook can move point. 804 "Non-nil means the abbrev hook can move point.
805Set to nil by `idlwave-expand-region-abbrevs'. To see the abbrev 805Set to nil by `idlwave-expand-region-abbrevs'. To see the abbrev
806definitions, use the command `list-abbrevs', for abbrevs that move 806definitions, use the command `list-abbrevs', for abbrevs that move
807point. Moving point is useful, for example, to place point between 807point. Moving point is useful, for example, to place point between
@@ -812,7 +812,7 @@ See `idlwave-check-abbrev'."
812 :type 'boolean) 812 :type 'boolean)
813 813
814(defcustom idlwave-abbrev-change-case nil 814(defcustom idlwave-abbrev-change-case nil
815 "*Non-nil means all abbrevs will be forced to either upper or lower case. 815 "Non-nil means all abbrevs will be forced to either upper or lower case.
816If the value t, all expanded abbrevs will be upper case. 816If the value t, all expanded abbrevs will be upper case.
817If the value is 'down then abbrevs will be forced to lower case. 817If the value is 'down then abbrevs will be forced to lower case.
818If nil, the case will not change. 818If nil, the case will not change.
@@ -822,7 +822,7 @@ upper case, regardless of this variable."
822 :type 'boolean) 822 :type 'boolean)
823 823
824(defcustom idlwave-reserved-word-upcase nil 824(defcustom idlwave-reserved-word-upcase nil
825 "*Non-nil means, reserved words will be made upper case via abbrev expansion. 825 "Non-nil means, reserved words will be made upper case via abbrev expansion.
826If nil case of reserved words is controlled by `idlwave-abbrev-change-case'. 826If nil case of reserved words is controlled by `idlwave-abbrev-change-case'.
827Has effect only if in abbrev-mode." 827Has effect only if in abbrev-mode."
828 :group 'idlwave-abbrev-and-indent-action 828 :group 'idlwave-abbrev-and-indent-action
@@ -859,7 +859,7 @@ Has effect only if in abbrev-mode."
859;; '(capitalize-word -1) t) 859;; '(capitalize-word -1) t)
860 860
861(defvar idlwave-indent-action-table nil 861(defvar idlwave-indent-action-table nil
862 "*Associated array containing action lists of search string (car), 862 "Associated array containing action lists of search string (car),
863and function as a cdr. This table is used by `idlwave-indent-line'. 863and function as a cdr. This table is used by `idlwave-indent-line'.
864See documentation for `idlwave-do-action' for a complete description of 864See documentation for `idlwave-do-action' for a complete description of
865the action lists. 865the action lists.
@@ -869,7 +869,7 @@ binding is not requested.
869See help on `idlwave-action-and-binding' for examples.") 869See help on `idlwave-action-and-binding' for examples.")
870 870
871(defvar idlwave-indent-expand-table nil 871(defvar idlwave-indent-expand-table nil
872 "*Associated array containing action lists of search string (car), 872 "Associated array containing action lists of search string (car),
873and function as a cdr. The table is used by the 873and function as a cdr. The table is used by the
874`idlwave-indent-and-action' function. See documentation for 874`idlwave-indent-and-action' function. See documentation for
875`idlwave-do-action' for a complete description of the action lists. 875`idlwave-do-action' for a complete description of the action lists.
@@ -948,14 +948,14 @@ See help on `idlwave-action-and-binding' for examples.")
948; 948;
949;- 949;-
950") 950")
951 "*A list (PATHNAME STRING) specifying the doc-header template to use for 951 "A list (PATHNAME STRING) specifying the doc-header template to use for
952summarizing a file. If PATHNAME is non-nil then this file will be included. 952summarizing a file. If PATHNAME is non-nil then this file will be included.
953Otherwise STRING is used. If nil, the file summary will be omitted. 953Otherwise STRING is used. If nil, the file summary will be omitted.
954For example you might set PATHNAME to the path for the 954For example you might set PATHNAME to the path for the
955lib_template.pro file included in the IDL distribution.") 955lib_template.pro file included in the IDL distribution.")
956 956
957(defcustom idlwave-header-to-beginning-of-file t 957(defcustom idlwave-header-to-beginning-of-file t
958 "*Non-nil means, the documentation header will always be at start of file. 958 "Non-nil means, the documentation header will always be at start of file.
959When nil, the header is positioned between the PRO/FUNCTION line of 959When nil, the header is positioned between the PRO/FUNCTION line of
960the current routine and the code, allowing several routine headers in 960the current routine and the code, allowing several routine headers in
961a file." 961a file."
@@ -963,12 +963,12 @@ a file."
963 :type 'boolean) 963 :type 'boolean)
964 964
965(defcustom idlwave-timestamp-hook 'idlwave-default-insert-timestamp 965(defcustom idlwave-timestamp-hook 'idlwave-default-insert-timestamp
966 "*The hook function used to update the timestamp of a function." 966 "The hook function used to update the timestamp of a function."
967 :group 'idlwave-documentation 967 :group 'idlwave-documentation
968 :type 'function) 968 :type 'function)
969 969
970(defcustom idlwave-doc-modifications-keyword "HISTORY" 970(defcustom idlwave-doc-modifications-keyword "HISTORY"
971 "*The modifications keyword to use with the log documentation commands. 971 "The modifications keyword to use with the log documentation commands.
972A ':' is added to the keyword end. 972A ':' is added to the keyword end.
973Inserted by doc-header and used to position logs by doc-modification. 973Inserted by doc-header and used to position logs by doc-modification.
974If nil it will not be inserted." 974If nil it will not be inserted."
@@ -976,12 +976,12 @@ If nil it will not be inserted."
976 :type 'string) 976 :type 'string)
977 977
978(defcustom idlwave-doclib-start "^;+\\+" 978(defcustom idlwave-doclib-start "^;+\\+"
979 "*Regexp matching the start of a document library header." 979 "Regexp matching the start of a document library header."
980 :group 'idlwave-documentation 980 :group 'idlwave-documentation
981 :type 'regexp) 981 :type 'regexp)
982 982
983(defcustom idlwave-doclib-end "^;+-" 983(defcustom idlwave-doclib-end "^;+-"
984 "*Regexp matching the end of a document library header." 984 "Regexp matching the end of a document library header."
985 :group 'idlwave-documentation 985 :group 'idlwave-documentation
986 :type 'regexp) 986 :type 'regexp)
987 987
@@ -992,7 +992,7 @@ If nil it will not be inserted."
992 :group 'idlwave) 992 :group 'idlwave)
993 993
994(defcustom idlwave-shell-explicit-file-name "idl" 994(defcustom idlwave-shell-explicit-file-name "idl"
995 "*If non-nil, this is the command to run IDL. 995 "If non-nil, this is the command to run IDL.
996Should be an absolute file path or path relative to the current environment 996Should be an absolute file path or path relative to the current environment
997execution search path. If you want to specify command line switches 997execution search path. If you want to specify command line switches
998for the IDL program, use `idlwave-shell-command-line-options'. 998for the IDL program, use `idlwave-shell-command-line-options'.
@@ -1003,7 +1003,7 @@ it without compromising backwards-compatibility."
1003 :type 'string) 1003 :type 'string)
1004 1004
1005(defcustom idlwave-shell-command-line-options nil 1005(defcustom idlwave-shell-command-line-options nil
1006 "*A list of command line options for calling the IDL program. 1006 "A list of command line options for calling the IDL program.
1007Since IDL is executed directly without going through a shell like /bin/sh, 1007Since IDL is executed directly without going through a shell like /bin/sh,
1008this should be a list of strings like '(\"-rt=file\" \"-nw\") with a separate 1008this should be a list of strings like '(\"-rt=file\" \"-nw\") with a separate
1009string for each argument. But you may also give a single string which 1009string for each argument. But you may also give a single string which
@@ -1015,7 +1015,7 @@ split it for you."
1015 :group 'idlwave-external-programs) 1015 :group 'idlwave-external-programs)
1016 1016
1017(defcustom idlwave-help-application "idlhelp" 1017(defcustom idlwave-help-application "idlhelp"
1018 "*The external application providing reference help for programming. 1018 "The external application providing reference help for programming.
1019Obsolete, if the IDL Assistant is being used for help." 1019Obsolete, if the IDL Assistant is being used for help."
1020 :group 'idlwave-external-programs 1020 :group 'idlwave-external-programs
1021 :type 'string) 1021 :type 'string)
@@ -1040,7 +1040,7 @@ are `control', `meta', `super', `hyper', `alt', and `shift'."
1040 (const shift))) 1040 (const shift)))
1041 1041
1042(defcustom idlwave-shell-automatic-start nil 1042(defcustom idlwave-shell-automatic-start nil
1043 "*If non-nil attempt invoke `idlwave-shell' if not already running. 1043 "If non-nil attempt invoke `idlwave-shell' if not already running.
1044This is checked when an attempt to send a command to an 1044This is checked when an attempt to send a command to an
1045IDL process is made." 1045IDL process is made."
1046 :group 'idlwave-shell-general-setup 1046 :group 'idlwave-shell-general-setup
@@ -1054,7 +1054,7 @@ IDL process is made."
1054 :group 'idlwave) 1054 :group 'idlwave)
1055 1055
1056(defcustom idlwave-startup-message t 1056(defcustom idlwave-startup-message t
1057 "*Non-nil displays a startup message when `idlwave-mode' is first called." 1057 "Non-nil displays a startup message when `idlwave-mode' is first called."
1058 :group 'idlwave-misc 1058 :group 'idlwave-misc
1059 :type 'boolean) 1059 :type 'boolean)
1060 1060
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 73e167d1587..cd6c8869d9f 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -72,7 +72,7 @@
72;;;###autoload 72;;;###autoload
73(defcustom inferior-lisp-filter-regexp 73(defcustom inferior-lisp-filter-regexp
74 (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'") 74 (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'")
75 "*What not to save on inferior Lisp's input history. 75 "What not to save on inferior Lisp's input history.
76Input matching this regexp is not saved on the input history in Inferior Lisp 76Input matching this regexp is not saved on the input history in Inferior Lisp
77mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword 77mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
78\(as in :a, :c, etc.)" 78\(as in :a, :c, etc.)"
@@ -139,13 +139,13 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
139 139
140;;;###autoload 140;;;###autoload
141(defcustom inferior-lisp-program (purecopy "lisp") 141(defcustom inferior-lisp-program (purecopy "lisp")
142 "*Program name for invoking an inferior Lisp in Inferior Lisp mode." 142 "Program name for invoking an inferior Lisp in Inferior Lisp mode."
143 :type 'string 143 :type 'string
144 :group 'inferior-lisp) 144 :group 'inferior-lisp)
145 145
146;;;###autoload 146;;;###autoload
147(defcustom inferior-lisp-load-command (purecopy "(load \"%s\")\n") 147(defcustom inferior-lisp-load-command (purecopy "(load \"%s\")\n")
148 "*Format-string for building a Lisp expression to load a file. 148 "Format-string for building a Lisp expression to load a file.
149This format string should use `%s' to substitute a file name 149This format string should use `%s' to substitute a file name
150and should result in a Lisp expression that will command the inferior Lisp 150and should result in a Lisp expression that will command the inferior Lisp
151to load that file. The default works acceptably on most Lisps. 151to load that file. The default works acceptably on most Lisps.
@@ -211,7 +211,7 @@ buffer with \\[set-variable].")
211 211
212;;;###autoload 212;;;###autoload
213(defvar inferior-lisp-mode-hook '() 213(defvar inferior-lisp-mode-hook '()
214 "*Hook for customizing Inferior Lisp mode.") 214 "Hook for customizing Inferior Lisp mode.")
215 215
216(put 'inferior-lisp-mode 'mode-class 'special) 216(put 'inferior-lisp-mode 'mode-class 'special)
217 217
@@ -453,7 +453,7 @@ This holds a cons cell of the form `(DIRECTORY . FILE)'
453describing the last `lisp-load-file' or `lisp-compile-file' command.") 453describing the last `lisp-load-file' or `lisp-compile-file' command.")
454 454
455(defcustom lisp-source-modes '(lisp-mode) 455(defcustom lisp-source-modes '(lisp-mode)
456 "*Used to determine if a buffer contains Lisp source code. 456 "Used to determine if a buffer contains Lisp source code.
457If it's loaded into a buffer that is in one of these major modes, it's 457If it's loaded into a buffer that is in one of these major modes, it's
458considered a Lisp source file by `lisp-load-file' and `lisp-compile-file'. 458considered a Lisp source file by `lisp-load-file' and `lisp-compile-file'.
459Used by these commands to determine defaults." 459Used by these commands to determine defaults."
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index b1884bd105b..20f91ce2d9e 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -80,7 +80,7 @@
80 "Default font-lock-keywords for `m4 mode'.") 80 "Default font-lock-keywords for `m4 mode'.")
81 81
82(defcustom m4-mode-hook nil 82(defcustom m4-mode-hook nil
83 "*Hook called by `m4-mode'." 83 "Hook called by `m4-mode'."
84 :type 'hook 84 :type 'hook
85 :group 'm4) 85 :group 'm4)
86 86
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index b4ca1ba665f..a173b11500e 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -129,18 +129,18 @@
129 :version "22.1") 129 :version "22.1")
130 130
131(defcustom makefile-browser-buffer-name "*Macros and Targets*" 131(defcustom makefile-browser-buffer-name "*Macros and Targets*"
132 "*Name of the macro- and target browser buffer." 132 "Name of the macro- and target browser buffer."
133 :type 'string 133 :type 'string
134 :group 'makefile) 134 :group 'makefile)
135 135
136(defcustom makefile-target-colon ":" 136(defcustom makefile-target-colon ":"
137 "*String to append to all target names inserted by `makefile-insert-target'. 137 "String to append to all target names inserted by `makefile-insert-target'.
138\":\" or \"::\" are common values." 138\":\" or \"::\" are common values."
139 :type 'string 139 :type 'string
140 :group 'makefile) 140 :group 'makefile)
141 141
142(defcustom makefile-macro-assign " = " 142(defcustom makefile-macro-assign " = "
143 "*String to append to all macro names inserted by `makefile-insert-macro'. 143 "String to append to all macro names inserted by `makefile-insert-macro'.
144The normal value should be \" = \", since this is what 144The normal value should be \" = \", since this is what
145standard make expects. However, newer makes such as dmake 145standard make expects. However, newer makes such as dmake
146allow a larger variety of different macro assignments, so you 146allow a larger variety of different macro assignments, so you
@@ -149,69 +149,69 @@ might prefer to use \" += \" or \" := \" ."
149 :group 'makefile) 149 :group 'makefile)
150 150
151(defcustom makefile-electric-keys nil 151(defcustom makefile-electric-keys nil
152 "*If non-nil, Makefile mode should install electric keybindings. 152 "If non-nil, Makefile mode should install electric keybindings.
153Default is nil." 153Default is nil."
154 :type 'boolean 154 :type 'boolean
155 :group 'makefile) 155 :group 'makefile)
156 156
157(defcustom makefile-use-curly-braces-for-macros-p nil 157(defcustom makefile-use-curly-braces-for-macros-p nil
158 "*Controls the style of generated macro references. 158 "Controls the style of generated macro references.
159Non-nil means macro references should use curly braces, like `${this}'. 159Non-nil means macro references should use curly braces, like `${this}'.
160nil means use parentheses, like `$(this)'." 160nil means use parentheses, like `$(this)'."
161 :type 'boolean 161 :type 'boolean
162 :group 'makefile) 162 :group 'makefile)
163 163
164(defcustom makefile-tab-after-target-colon t 164(defcustom makefile-tab-after-target-colon t
165 "*If non-nil, insert a TAB after a target colon. 165 "If non-nil, insert a TAB after a target colon.
166Otherwise, a space is inserted. 166Otherwise, a space is inserted.
167The default is t." 167The default is t."
168 :type 'boolean 168 :type 'boolean
169 :group 'makefile) 169 :group 'makefile)
170 170
171(defcustom makefile-browser-leftmost-column 10 171(defcustom makefile-browser-leftmost-column 10
172 "*Number of blanks to the left of the browser selection mark." 172 "Number of blanks to the left of the browser selection mark."
173 :type 'integer 173 :type 'integer
174 :group 'makefile) 174 :group 'makefile)
175 175
176(defcustom makefile-browser-cursor-column 10 176(defcustom makefile-browser-cursor-column 10
177 "*Column the cursor goes to when it moves up or down in the Makefile browser." 177 "Column the cursor goes to when it moves up or down in the Makefile browser."
178 :type 'integer 178 :type 'integer
179 :group 'makefile) 179 :group 'makefile)
180 180
181(defcustom makefile-backslash-column 48 181(defcustom makefile-backslash-column 48
182 "*Column in which `makefile-backslash-region' inserts backslashes." 182 "Column in which `makefile-backslash-region' inserts backslashes."
183 :type 'integer 183 :type 'integer
184 :group 'makefile) 184 :group 'makefile)
185 185
186(defcustom makefile-backslash-align t 186(defcustom makefile-backslash-align t
187 "*If non-nil, `makefile-backslash-region' will align backslashes." 187 "If non-nil, `makefile-backslash-region' will align backslashes."
188 :type 'boolean 188 :type 'boolean
189 :group 'makefile) 189 :group 'makefile)
190 190
191(defcustom makefile-browser-selected-mark "+ " 191(defcustom makefile-browser-selected-mark "+ "
192 "*String used to mark selected entries in the Makefile browser." 192 "String used to mark selected entries in the Makefile browser."
193 :type 'string 193 :type 'string
194 :group 'makefile) 194 :group 'makefile)
195 195
196(defcustom makefile-browser-unselected-mark " " 196(defcustom makefile-browser-unselected-mark " "
197 "*String used to mark unselected entries in the Makefile browser." 197 "String used to mark unselected entries in the Makefile browser."
198 :type 'string 198 :type 'string
199 :group 'makefile) 199 :group 'makefile)
200 200
201(defcustom makefile-browser-auto-advance-after-selection-p t 201(defcustom makefile-browser-auto-advance-after-selection-p t
202 "*If non-nil, cursor will move after item is selected in Makefile browser." 202 "If non-nil, cursor will move after item is selected in Makefile browser."
203 :type 'boolean 203 :type 'boolean
204 :group 'makefile) 204 :group 'makefile)
205 205
206(defcustom makefile-pickup-everything-picks-up-filenames-p nil 206(defcustom makefile-pickup-everything-picks-up-filenames-p nil
207 "*If non-nil, `makefile-pickup-everything' picks up filenames as targets. 207 "If non-nil, `makefile-pickup-everything' picks up filenames as targets.
208This means it calls `makefile-pickup-filenames-as-targets'. 208This means it calls `makefile-pickup-filenames-as-targets'.
209Otherwise filenames are omitted." 209Otherwise filenames are omitted."
210 :type 'boolean 210 :type 'boolean
211 :group 'makefile) 211 :group 'makefile)
212 212
213(defcustom makefile-cleanup-continuations nil 213(defcustom makefile-cleanup-continuations nil
214 "*If non-nil, automatically clean up continuation lines when saving. 214 "If non-nil, automatically clean up continuation lines when saving.
215A line is cleaned up by removing all whitespace following a trailing 215A line is cleaned up by removing all whitespace following a trailing
216backslash. This is done silently. 216backslash. This is done silently.
217IMPORTANT: Please note that enabling this option causes Makefile mode 217IMPORTANT: Please note that enabling this option causes Makefile mode
@@ -220,7 +220,7 @@ to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"."
220 :group 'makefile) 220 :group 'makefile)
221 221
222(defcustom makefile-mode-hook nil 222(defcustom makefile-mode-hook nil
223 "*Normal hook run by `makefile-mode'." 223 "Normal hook run by `makefile-mode'."
224 :type 'hook 224 :type 'hook
225 :group 'makefile) 225 :group 'makefile)
226 226
@@ -247,7 +247,7 @@ you enter a \".\" at the beginning of a line in `makefile-mode'."
247 247
248(defcustom makefile-runtime-macros-list 248(defcustom makefile-runtime-macros-list
249 '(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$")) 249 '(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$"))
250 "*List of macros that are resolved by make at runtime. 250 "List of macros that are resolved by make at runtime.
251If you insert a macro reference using `makefile-insert-macro-ref', the name 251If you insert a macro reference using `makefile-insert-macro-ref', the name
252of the macro is checked against this list. If it can be found its name will 252of the macro is checked against this list. If it can be found its name will
253not be enclosed in { } or ( )." 253not be enclosed in { } or ( )."
@@ -553,14 +553,14 @@ not be enclosed in { } or ( )."
553;; ------------------------------------------------------------ 553;; ------------------------------------------------------------
554 554
555(defcustom makefile-brave-make "make" 555(defcustom makefile-brave-make "make"
556 "*How to invoke make, for `makefile-query-targets'. 556 "How to invoke make, for `makefile-query-targets'.
557This should identify a `make' command that can handle the `-q' option." 557This should identify a `make' command that can handle the `-q' option."
558 :type 'string 558 :type 'string
559 :group 'makefile) 559 :group 'makefile)
560 560
561(defcustom makefile-query-one-target-method-function 561(defcustom makefile-query-one-target-method-function
562 'makefile-query-by-make-minus-q 562 'makefile-query-by-make-minus-q
563 "*Function to call to determine whether a make target is up to date. 563 "Function to call to determine whether a make target is up to date.
564The function must satisfy this calling convention: 564The function must satisfy this calling convention:
565 565
566* As its first argument, it must accept the name of the target to 566* As its first argument, it must accept the name of the target to
@@ -579,7 +579,7 @@ The function must satisfy this calling convention:
579 'makefile-query-one-target-method-function) 579 'makefile-query-one-target-method-function)
580 580
581(defcustom makefile-up-to-date-buffer-name "*Makefile Up-to-date overview*" 581(defcustom makefile-up-to-date-buffer-name "*Makefile Up-to-date overview*"
582 "*Name of the Up-to-date overview buffer." 582 "Name of the Up-to-date overview buffer."
583 :type 'string 583 :type 'string
584 :group 'makefile) 584 :group 'makefile)
585 585
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index 0c43a3ed354..d634efebe5b 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -65,7 +65,7 @@
65 :group 'modula2) 65 :group 'modula2)
66 66
67(defcustom m2-end-comment-column 75 67(defcustom m2-end-comment-column 75
68 "*Column for aligning the end of a comment, in Modula-2." 68 "Column for aligning the end of a comment, in Modula-2."
69 :type 'integer 69 :type 'integer
70 :group 'modula2) 70 :group 'modula2)
71 71
@@ -104,7 +104,7 @@
104 "Keymap used in Modula-2 mode.") 104 "Keymap used in Modula-2 mode.")
105 105
106(defcustom m2-indent 5 106(defcustom m2-indent 5
107 "*This variable gives the indentation in Modula-2-Mode." 107 "This variable gives the indentation in Modula-2-Mode."
108 :type 'integer 108 :type 'integer
109 :group 'modula2) 109 :group 'modula2)
110(put 'm2-indent 'safe-local-variable 110(put 'm2-indent 'safe-local-variable
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 2cae41889bd..f77e24e665a 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -79,7 +79,7 @@ mode, set this to (\"-q\" \"--traditional\")."
79 "Syntax table in use in inferior-octave-mode buffers.") 79 "Syntax table in use in inferior-octave-mode buffers.")
80 80
81(defcustom inferior-octave-mode-hook nil 81(defcustom inferior-octave-mode-hook nil
82 "*Hook to be run when Inferior Octave mode is started." 82 "Hook to be run when Inferior Octave mode is started."
83 :type 'hook 83 :type 'hook
84 :group 'octave-inferior) 84 :group 'octave-inferior)
85 85
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 95f1adec40e..8f7f313753c 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -183,42 +183,42 @@
183(put 'pascal-mode 'font-lock-defaults '(pascal-font-lock-keywords nil t)) 183(put 'pascal-mode 'font-lock-defaults '(pascal-font-lock-keywords nil t))
184 184
185(defcustom pascal-indent-level 3 185(defcustom pascal-indent-level 3
186 "*Indentation of Pascal statements with respect to containing block." 186 "Indentation of Pascal statements with respect to containing block."
187 :type 'integer 187 :type 'integer
188 :group 'pascal) 188 :group 'pascal)
189 189
190(defcustom pascal-case-indent 2 190(defcustom pascal-case-indent 2
191 "*Indentation for case statements." 191 "Indentation for case statements."
192 :type 'integer 192 :type 'integer
193 :group 'pascal) 193 :group 'pascal)
194 194
195(defcustom pascal-auto-newline nil 195(defcustom pascal-auto-newline nil
196 "*Non-nil means automatically insert newlines in certain cases. 196 "Non-nil means automatically insert newlines in certain cases.
197These include after semicolons and after the punctuation mark after an `end'." 197These include after semicolons and after the punctuation mark after an `end'."
198 :type 'boolean 198 :type 'boolean
199 :group 'pascal) 199 :group 'pascal)
200 200
201(defcustom pascal-indent-nested-functions t 201(defcustom pascal-indent-nested-functions t
202 "*Non-nil means nested functions are indented." 202 "Non-nil means nested functions are indented."
203 :type 'boolean 203 :type 'boolean
204 :group 'pascal) 204 :group 'pascal)
205 205
206(defcustom pascal-tab-always-indent t 206(defcustom pascal-tab-always-indent t
207 "*Non-nil means TAB in Pascal mode should always reindent the current line. 207 "Non-nil means TAB in Pascal mode should always reindent the current line.
208If this is nil, TAB inserts a tab if it is at the end of the line 208If this is nil, TAB inserts a tab if it is at the end of the line
209and follows non-whitespace text." 209and follows non-whitespace text."
210 :type 'boolean 210 :type 'boolean
211 :group 'pascal) 211 :group 'pascal)
212 212
213(defcustom pascal-auto-endcomments t 213(defcustom pascal-auto-endcomments t
214 "*Non-nil means automatically insert comments after certain `end's. 214 "Non-nil means automatically insert comments after certain `end's.
215Specifically, this is done after the ends of cases statements and functions. 215Specifically, this is done after the ends of cases statements and functions.
216The name of the function or case is included between the braces." 216The name of the function or case is included between the braces."
217 :type 'boolean 217 :type 'boolean
218 :group 'pascal) 218 :group 'pascal)
219 219
220(defcustom pascal-auto-lineup '(all) 220(defcustom pascal-auto-lineup '(all)
221 "*List of contexts where auto lineup of :'s or ='s should be done. 221 "List of contexts where auto lineup of :'s or ='s should be done.
222Elements can be of type: 'paramlist', 'declaration' or 'case', which will 222Elements can be of type: 'paramlist', 'declaration' or 'case', which will
223do auto lineup in parameterlist, declarations or case-statements 223do auto lineup in parameterlist, declarations or case-statements
224respectively. The word 'all' will do all lineups. '(case paramlist) for 224respectively. The word 'all' will do all lineups. '(case paramlist) for
@@ -232,7 +232,7 @@ will do all lineups."
232 :group 'pascal) 232 :group 'pascal)
233 233
234(defvar pascal-toggle-completions nil 234(defvar pascal-toggle-completions nil
235 "*Non-nil meant \\<pascal-mode-map>\\[pascal-complete-word] would try all possible completions one by one. 235 "Non-nil meant \\<pascal-mode-map>\\[pascal-complete-word] would try all possible completions one by one.
236Repeated use of \\[pascal-complete-word] would show you all of them. 236Repeated use of \\[pascal-complete-word] would show you all of them.
237Normally, when there is more than one possible completion, 237Normally, when there is more than one possible completion,
238it displays a list of all possible completions.") 238it displays a list of all possible completions.")
@@ -241,7 +241,7 @@ it displays a list of all possible completions.")
241 241
242(defcustom pascal-type-keywords 242(defcustom pascal-type-keywords
243 '("array" "file" "packed" "char" "integer" "real" "string" "record") 243 '("array" "file" "packed" "char" "integer" "real" "string" "record")
244 "*Keywords for types used when completing a word in a declaration or parmlist. 244 "Keywords for types used when completing a word in a declaration or parmlist.
245These include integer, real, char, etc. 245These include integer, real, char, etc.
246The types defined within the Pascal program 246The types defined within the Pascal program
247are handled in another way, and should not be added to this list." 247are handled in another way, and should not be added to this list."
@@ -251,7 +251,7 @@ are handled in another way, and should not be added to this list."
251(defcustom pascal-start-keywords 251(defcustom pascal-start-keywords
252 '("begin" "end" "function" "procedure" "repeat" "until" "while" 252 '("begin" "end" "function" "procedure" "repeat" "until" "while"
253 "read" "readln" "reset" "rewrite" "write" "writeln") 253 "read" "readln" "reset" "rewrite" "write" "writeln")
254 "*Keywords to complete when standing at the first word of a statement. 254 "Keywords to complete when standing at the first word of a statement.
255These are keywords such as begin, repeat, until, readln. 255These are keywords such as begin, repeat, until, readln.
256The procedures and variables defined within the Pascal program 256The procedures and variables defined within the Pascal program
257are handled in another way, and should not be added to this list." 257are handled in another way, and should not be added to this list."
@@ -260,7 +260,7 @@ are handled in another way, and should not be added to this list."
260 260
261(defcustom pascal-separator-keywords 261(defcustom pascal-separator-keywords
262 '("downto" "else" "mod" "div" "then") 262 '("downto" "else" "mod" "div" "then")
263 "*Keywords to complete when NOT standing at the first word of a statement. 263 "Keywords to complete when NOT standing at the first word of a statement.
264These are keywords such as downto, else, mod, then. 264These are keywords such as downto, else, mod, then.
265Variables and function names defined within the Pascal program 265Variables and function names defined within the Pascal program
266are handled in another way, and should not be added to this list." 266are handled in another way, and should not be added to this list."
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 26c6e5a9f03..aab5f8f65a4 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -468,7 +468,7 @@ The expansion is entirely correct because it uses the C preprocessor."
468 (t (funcall (default-value 'font-lock-syntactic-face-function) state)))) 468 (t (funcall (default-value 'font-lock-syntactic-face-function) state))))
469 469
470(defcustom perl-indent-level 4 470(defcustom perl-indent-level 4
471 "*Indentation of Perl statements with respect to containing block." 471 "Indentation of Perl statements with respect to containing block."
472 :type 'integer 472 :type 'integer
473 :group 'perl) 473 :group 'perl)
474 474
@@ -485,28 +485,28 @@ The expansion is entirely correct because it uses the C preprocessor."
485;;;###autoload(put 'perl-label-offset 'safe-local-variable 'integerp) 485;;;###autoload(put 'perl-label-offset 'safe-local-variable 'integerp)
486 486
487(defcustom perl-continued-statement-offset 4 487(defcustom perl-continued-statement-offset 4
488 "*Extra indent for lines not starting new statements." 488 "Extra indent for lines not starting new statements."
489 :type 'integer 489 :type 'integer
490 :group 'perl) 490 :group 'perl)
491(defcustom perl-continued-brace-offset -4 491(defcustom perl-continued-brace-offset -4
492 "*Extra indent for substatements that start with open-braces. 492 "Extra indent for substatements that start with open-braces.
493This is in addition to `perl-continued-statement-offset'." 493This is in addition to `perl-continued-statement-offset'."
494 :type 'integer 494 :type 'integer
495 :group 'perl) 495 :group 'perl)
496(defcustom perl-brace-offset 0 496(defcustom perl-brace-offset 0
497 "*Extra indentation for braces, compared with other text in same context." 497 "Extra indentation for braces, compared with other text in same context."
498 :type 'integer 498 :type 'integer
499 :group 'perl) 499 :group 'perl)
500(defcustom perl-brace-imaginary-offset 0 500(defcustom perl-brace-imaginary-offset 0
501 "*Imagined indentation of an open brace that actually follows a statement." 501 "Imagined indentation of an open brace that actually follows a statement."
502 :type 'integer 502 :type 'integer
503 :group 'perl) 503 :group 'perl)
504(defcustom perl-label-offset -2 504(defcustom perl-label-offset -2
505 "*Offset of Perl label lines relative to usual indentation." 505 "Offset of Perl label lines relative to usual indentation."
506 :type 'integer 506 :type 'integer
507 :group 'perl) 507 :group 'perl)
508(defcustom perl-indent-continued-arguments nil 508(defcustom perl-indent-continued-arguments nil
509 "*If non-nil offset of argument lines relative to usual indentation. 509 "If non-nil offset of argument lines relative to usual indentation.
510If nil, continued arguments are aligned with the first argument." 510If nil, continued arguments are aligned with the first argument."
511 :type '(choice integer (const nil)) 511 :type '(choice integer (const nil))
512 :group 'perl) 512 :group 'perl)
@@ -521,7 +521,7 @@ nonwhite character on the line."
521;; I changed the default to nil for consistency with general Emacs 521;; I changed the default to nil for consistency with general Emacs
522;; conventions -- rms. 522;; conventions -- rms.
523(defcustom perl-tab-to-comment nil 523(defcustom perl-tab-to-comment nil
524 "*Non-nil means TAB moves to eol or makes a comment in some cases. 524 "Non-nil means TAB moves to eol or makes a comment in some cases.
525For lines which don't need indenting, TAB either indents an 525For lines which don't need indenting, TAB either indents an
526existing comment, moves to end-of-line, or if at end-of-line already, 526existing comment, moves to end-of-line, or if at end-of-line already,
527create a new comment." 527create a new comment."
@@ -529,7 +529,7 @@ create a new comment."
529 :group 'perl) 529 :group 'perl)
530 530
531(defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]" 531(defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]"
532 "*Lines starting with this regular expression are not auto-indented." 532 "Lines starting with this regular expression are not auto-indented."
533 :type 'regexp 533 :type 'regexp
534 :group 'perl) 534 :group 'perl)
535 535
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index a8ee6f4bff4..74c8c31b425 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -3621,12 +3621,12 @@ a new comment is created."
3621 (indent-for-comment))) 3621 (indent-for-comment)))
3622 3622
3623(defun prolog-indent-predicate () 3623(defun prolog-indent-predicate ()
3624 "*Indent the current predicate." 3624 "Indent the current predicate."
3625 (interactive) 3625 (interactive)
3626 (indent-region (prolog-pred-start) (prolog-pred-end) nil)) 3626 (indent-region (prolog-pred-start) (prolog-pred-end) nil))
3627 3627
3628(defun prolog-indent-buffer () 3628(defun prolog-indent-buffer ()
3629 "*Indent the entire buffer." 3629 "Indent the entire buffer."
3630 (interactive) 3630 (interactive)
3631 (indent-region (point-min) (point-max) nil)) 3631 (indent-region (point-min) (point-max) nil))
3632 3632
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index e85fa0476b0..bf52eff8f9a 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -60,17 +60,17 @@
60;; User variables. 60;; User variables.
61 61
62(defcustom ps-mode-auto-indent t 62(defcustom ps-mode-auto-indent t
63 "*Should we use autoindent?" 63 "Should we use autoindent?"
64 :group 'PostScript-edit 64 :group 'PostScript-edit
65 :type 'boolean) 65 :type 'boolean)
66 66
67(defcustom ps-mode-tab 4 67(defcustom ps-mode-tab 4
68 "*Number of spaces to use when indenting." 68 "Number of spaces to use when indenting."
69 :group 'PostScript-edit 69 :group 'PostScript-edit
70 :type 'integer) 70 :type 'integer)
71 71
72(defcustom ps-mode-paper-size '(595 842) 72(defcustom ps-mode-paper-size '(595 842)
73 "*Default paper size. 73 "Default paper size.
74 74
75When inserting an EPSF template these values are used 75When inserting an EPSF template these values are used
76to set the boundingbox to include the whole page. 76to set the boundingbox to include the whole page.
@@ -117,12 +117,12 @@ When the figure is finished these values should be replaced."
117 (lpr-command (if (memq system-type '(usg-unix-v hpux irix)) 117 (lpr-command (if (memq system-type '(usg-unix-v hpux irix))
118 "lp" "lpr"))) 118 "lp" "lpr")))
119 (lpr-buffer))) 119 (lpr-buffer)))
120 "*Lisp function to print current buffer as PostScript." 120 "Lisp function to print current buffer as PostScript."
121 :group 'PostScript-edit 121 :group 'PostScript-edit
122 :type 'function) 122 :type 'function)
123 123
124(defcustom ps-run-prompt "\\(GS\\(<[0-9]+\\)?>\\)+" 124(defcustom ps-run-prompt "\\(GS\\(<[0-9]+\\)?>\\)+"
125 "*Regexp to match prompt in interactive PostScript." 125 "Regexp to match prompt in interactive PostScript."
126 :group 'PostScript-interaction 126 :group 'PostScript-interaction
127 :type 'regexp) 127 :type 'regexp)
128 128
@@ -139,7 +139,7 @@ When the figure is finished these values should be replaced."
139 ("^\\(Current file position is\\) \\([0-9]+\\)" 139 ("^\\(Current file position is\\) \\([0-9]+\\)"
140 (1 font-lock-comment-face nil nil) 140 (1 font-lock-comment-face nil nil)
141 (2 font-lock-warning-face nil nil)))) 141 (2 font-lock-warning-face nil nil))))
142 "*Medium level highlighting of messages from the PostScript interpreter. 142 "Medium level highlighting of messages from the PostScript interpreter.
143 143
144See documentation on font-lock for details." 144See documentation on font-lock for details."
145 :group 'PostScript-interaction 145 :group 'PostScript-interaction
@@ -155,17 +155,17 @@ See documentation on font-lock for details."
155 (boolean :tag "Laxmatch" :value t)))))) 155 (boolean :tag "Laxmatch" :value t))))))
156 156
157(defcustom ps-run-x '("gs" "-r72" "-sPAPERSIZE=a4") 157(defcustom ps-run-x '("gs" "-r72" "-sPAPERSIZE=a4")
158 "*Command as list to run PostScript with graphic display." 158 "Command as list to run PostScript with graphic display."
159 :group 'PostScript-interaction 159 :group 'PostScript-interaction
160 :type '(repeat string)) 160 :type '(repeat string))
161 161
162(defcustom ps-run-dumb '("gs" "-dNODISPLAY") 162(defcustom ps-run-dumb '("gs" "-dNODISPLAY")
163 "*Command as list to run PostScript without graphic display." 163 "Command as list to run PostScript without graphic display."
164 :group 'PostScript-interaction 164 :group 'PostScript-interaction
165 :type '(repeat string)) 165 :type '(repeat string))
166 166
167(defcustom ps-run-init nil 167(defcustom ps-run-init nil
168 "*String of commands to send to PostScript to start interactive. 168 "String of commands to send to PostScript to start interactive.
169 169
170Example: \"executive\" 170Example: \"executive\"
171 171
@@ -174,13 +174,13 @@ You won't need to set this option for Ghostscript."
174 :type '(choice (const nil) string)) 174 :type '(choice (const nil) string))
175 175
176(defcustom ps-run-error-line-numbers nil 176(defcustom ps-run-error-line-numbers nil
177 "*What values are used by the PostScript interpreter in error messages?" 177 "What values are used by the PostScript interpreter in error messages?"
178 :group 'PostScript-interaction 178 :group 'PostScript-interaction
179 :type '(choice (const :tag "line numbers" t) 179 :type '(choice (const :tag "line numbers" t)
180 (const :tag "byte counts" nil))) 180 (const :tag "byte counts" nil)))
181 181
182(defcustom ps-run-tmp-dir nil 182(defcustom ps-run-tmp-dir nil
183 "*Name of directory to place temporary file. 183 "Name of directory to place temporary file.
184If nil, use `temporary-file-directory'." 184If nil, use `temporary-file-directory'."
185 :group 'PostScript-interaction 185 :group 'PostScript-interaction
186 :type '(choice (const nil) directory)) 186 :type '(choice (const nil) directory))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3ef872d26eb..f7566c31b41 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -494,7 +494,7 @@ statement."
494 494
495 495
496(defcustom python-pdbtrack-do-tracking-p t 496(defcustom python-pdbtrack-do-tracking-p t
497 "*Controls whether the pdbtrack feature is enabled or not. 497 "Controls whether the pdbtrack feature is enabled or not.
498 498
499When non-nil, pdbtrack is enabled in all comint-based buffers, 499When non-nil, pdbtrack is enabled in all comint-based buffers,
500e.g. shell interaction buffers and the *Python* buffer. 500e.g. shell interaction buffers and the *Python* buffer.
@@ -509,7 +509,7 @@ having to restart the program."
509(make-variable-buffer-local 'python-pdbtrack-do-tracking-p) 509(make-variable-buffer-local 'python-pdbtrack-do-tracking-p)
510 510
511(defcustom python-pdbtrack-minor-mode-string " PDB" 511(defcustom python-pdbtrack-minor-mode-string " PDB"
512 "*Minor-mode sign to be displayed when pdbtrack is active." 512 "Minor-mode sign to be displayed when pdbtrack is active."
513 :type 'string 513 :type 'string
514 :group 'python) 514 :group 'python)
515 515
@@ -1288,7 +1288,7 @@ modified by the user. Additional arguments are added when the command
1288is used by `run-python' et al.") 1288is used by `run-python' et al.")
1289 1289
1290(defvar python-buffer nil 1290(defvar python-buffer nil
1291 "*The current Python process buffer. 1291 "The current Python process buffer.
1292 1292
1293Commands that send text from source buffers to Python processes have 1293Commands that send text from source buffers to Python processes have
1294to choose a process to send to. This is determined by buffer-local 1294to choose a process to send to. This is determined by buffer-local
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 82a4985015f..1fa75f239eb 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -229,7 +229,7 @@ Set this to nil if you normally use another dialect."
229(defcustom dsssl-sgml-declaration 229(defcustom dsssl-sgml-declaration
230 "<!DOCTYPE style-sheet PUBLIC \"-//James Clark//DTD DSSSL Style Sheet//EN\"> 230 "<!DOCTYPE style-sheet PUBLIC \"-//James Clark//DTD DSSSL Style Sheet//EN\">
231" 231"
232 "*An SGML declaration for the DSSSL file. 232 "An SGML declaration for the DSSSL file.
233If it is defined as a string this will be inserted into an empty buffer 233If it is defined as a string this will be inserted into an empty buffer
234which is in `dsssl-mode'. It is typically James Clark's style-sheet 234which is in `dsssl-mode'. It is typically James Clark's style-sheet
235doctype, as required for Jade." 235doctype, as required for Jade."
@@ -251,7 +251,7 @@ See `run-hooks'."
251 251
252;; This is shared by cmuscheme and xscheme. 252;; This is shared by cmuscheme and xscheme.
253(defcustom scheme-program-name "scheme" 253(defcustom scheme-program-name "scheme"
254 "*Program invoked by the `run-scheme' command." 254 "Program invoked by the `run-scheme' command."
255 :type 'string 255 :type 'string
256 :group 'scheme) 256 :group 'scheme)
257 257
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 48b19524b8c..f60ce185bc7 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1410,7 +1410,7 @@ This list is used when switching between buffer-local and global
1410values of variables, and for the commands using indentation styles.") 1410values of variables, and for the commands using indentation styles.")
1411 1411
1412(defvar sh-make-vars-local t 1412(defvar sh-make-vars-local t
1413 "*Controls whether indentation variables are local to the buffer. 1413 "Controls whether indentation variables are local to the buffer.
1414If non-nil, indentation variables are made local initially. 1414If non-nil, indentation variables are made local initially.
1415If nil, you can later make the variables local by invoking 1415If nil, you can later make the variables local by invoking
1416command `sh-make-vars-local'. 1416command `sh-make-vars-local'.
@@ -1876,7 +1876,7 @@ region, clear header."
1876 1876
1877;; Indentation stuff. 1877;; Indentation stuff.
1878(defun sh-must-support-indent () 1878(defun sh-must-support-indent ()
1879 "*Signal an error if the shell type for this buffer is not supported. 1879 "Signal an error if the shell type for this buffer is not supported.
1880Also, the buffer must be in Shell-script mode." 1880Also, the buffer must be in Shell-script mode."
1881 (unless sh-indent-supported-here 1881 (unless sh-indent-supported-here
1882 (error "This buffer's shell does not support indentation through Emacs"))) 1882 (error "This buffer's shell does not support indentation through Emacs")))
@@ -2885,7 +2885,7 @@ so that `occur-next' and `occur-prev' will work."
2885 2885
2886;; Is this really worth having? 2886;; Is this really worth having?
2887(defvar sh-learned-buffer-hook nil 2887(defvar sh-learned-buffer-hook nil
2888 "*An abnormal hook, called with an alist of learned variables.") 2888 "An abnormal hook, called with an alist of learned variables.")
2889;; Example of how to use sh-learned-buffer-hook 2889;; Example of how to use sh-learned-buffer-hook
2890;; 2890;;
2891;; (defun what-i-learned (list) 2891;; (defun what-i-learned (list)
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index 7536126e8f1..2adb34c7824 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -48,7 +48,7 @@ Otherwise TAB indents only when point is within
48the run of whitespace at the beginning of the line.") 48the run of whitespace at the beginning of the line.")
49 49
50(defcustom simula-tab-always-indent simula-tab-always-indent-default 50(defcustom simula-tab-always-indent simula-tab-always-indent-default
51 "*Non-nil means TAB in SIMULA mode should always reindent the current line. 51 "Non-nil means TAB in SIMULA mode should always reindent the current line.
52Otherwise TAB indents only when point is within 52Otherwise TAB indents only when point is within
53the run of whitespace at the beginning of the line." 53the run of whitespace at the beginning of the line."
54 :type 'boolean 54 :type 'boolean
@@ -58,7 +58,7 @@ the run of whitespace at the beginning of the line."
58 "Indentation of SIMULA statements with respect to containing block.") 58 "Indentation of SIMULA statements with respect to containing block.")
59 59
60(defcustom simula-indent-level simula-indent-level-default 60(defcustom simula-indent-level simula-indent-level-default
61 "*Indentation of SIMULA statements with respect to containing block." 61 "Indentation of SIMULA statements with respect to containing block."
62 :type 'integer 62 :type 'integer
63 :group 'simula) 63 :group 'simula)
64 64
@@ -67,7 +67,7 @@ the run of whitespace at the beginning of the line."
67 "Extra indentation after DO, THEN, ELSE, WHEN and OTHERWISE.") 67 "Extra indentation after DO, THEN, ELSE, WHEN and OTHERWISE.")
68 68
69(defcustom simula-substatement-offset simula-substatement-offset-default 69(defcustom simula-substatement-offset simula-substatement-offset-default
70 "*Extra indentation after DO, THEN, ELSE, WHEN and OTHERWISE." 70 "Extra indentation after DO, THEN, ELSE, WHEN and OTHERWISE."
71 :type 'integer 71 :type 'integer
72 :group 'simula) 72 :group 'simula)
73 73
@@ -79,7 +79,7 @@ the previous line of the statement.")
79 79
80(defcustom simula-continued-statement-offset 80(defcustom simula-continued-statement-offset
81 simula-continued-statement-offset-default 81 simula-continued-statement-offset-default
82 "*Extra indentation for lines not starting a statement or substatement. 82 "Extra indentation for lines not starting a statement or substatement.
83If value is a list, each line in a multipleline continued statement 83If value is a list, each line in a multipleline continued statement
84will have the car of the list extra indentation with respect to 84will have the car of the list extra indentation with respect to
85the previous line of the statement." 85the previous line of the statement."
@@ -90,7 +90,7 @@ the previous line of the statement."
90 "Offset of SIMULA label lines relative to usual indentation.") 90 "Offset of SIMULA label lines relative to usual indentation.")
91 91
92(defcustom simula-label-offset simula-label-offset-default 92(defcustom simula-label-offset simula-label-offset-default
93 "*Offset of SIMULA label lines relative to usual indentation." 93 "Offset of SIMULA label lines relative to usual indentation."
94 :type 'integer 94 :type 'integer
95 :group 'simula) 95 :group 'simula)
96 96
@@ -100,7 +100,7 @@ Value is a cons cell, the car is extra THEN indentation and the cdr
100extra ELSE indentation. IF after ELSE is indented as the starting IF.") 100extra ELSE indentation. IF after ELSE is indented as the starting IF.")
101 101
102(defcustom simula-if-indent simula-if-indent-default 102(defcustom simula-if-indent simula-if-indent-default
103 "*Extra indentation of THEN and ELSE with respect to the starting IF. 103 "Extra indentation of THEN and ELSE with respect to the starting IF.
104Value is a cons cell, the car is extra THEN indentation and the cdr 104Value is a cons cell, the car is extra THEN indentation and the cdr
105extra ELSE indentation. IF after ELSE is indented as the starting IF." 105extra ELSE indentation. IF after ELSE is indented as the starting IF."
106 :type '(cons integer integer) 106 :type '(cons integer integer)
@@ -112,7 +112,7 @@ Value is a cons cell, the car is extra WHEN indentation
112and the cdr extra OTHERWISE indentation.") 112and the cdr extra OTHERWISE indentation.")
113 113
114(defcustom simula-inspect-indent simula-inspect-indent-default 114(defcustom simula-inspect-indent simula-inspect-indent-default
115 "*Extra indentation of WHEN and OTHERWISE with respect to the INSPECT. 115 "Extra indentation of WHEN and OTHERWISE with respect to the INSPECT.
116Value is a cons cell, the car is extra WHEN indentation 116Value is a cons cell, the car is extra WHEN indentation
117and the cdr extra OTHERWISE indentation." 117and the cdr extra OTHERWISE indentation."
118 :type '(cons integer integer) 118 :type '(cons integer integer)
@@ -122,7 +122,7 @@ and the cdr extra OTHERWISE indentation."
122 "Non-nil means `simula-indent-line' function may reindent previous line.") 122 "Non-nil means `simula-indent-line' function may reindent previous line.")
123 123
124(defcustom simula-electric-indent simula-electric-indent-default 124(defcustom simula-electric-indent simula-electric-indent-default
125 "*Non-nil means `simula-indent-line' function may reindent previous line." 125 "Non-nil means `simula-indent-line' function may reindent previous line."
126 :type 'boolean 126 :type 'boolean
127 :group 'simula) 127 :group 'simula)
128 128
@@ -132,7 +132,7 @@ Value is one of the symbols `upcase', `downcase', `capitalize',
132\(as in) `abbrev-table' or nil if they should not be changed.") 132\(as in) `abbrev-table' or nil if they should not be changed.")
133 133
134(defcustom simula-abbrev-keyword simula-abbrev-keyword-default 134(defcustom simula-abbrev-keyword simula-abbrev-keyword-default
135 "*Specify how to convert case for SIMULA keywords. 135 "Specify how to convert case for SIMULA keywords.
136Value is one of the symbols `upcase', `downcase', `capitalize', 136Value is one of the symbols `upcase', `downcase', `capitalize',
137\(as in) `abbrev-table' or nil if they should not be changed." 137\(as in) `abbrev-table' or nil if they should not be changed."
138 :type '(choice (const upcase) (const downcase) (const capitalize)(const nil)) 138 :type '(choice (const upcase) (const downcase) (const capitalize)(const nil))
@@ -144,7 +144,7 @@ Value is one of the symbols `upcase', `downcase', `capitalize',
144\(as in) `abbrev-table', or nil if they should not be changed.") 144\(as in) `abbrev-table', or nil if they should not be changed.")
145 145
146(defcustom simula-abbrev-stdproc simula-abbrev-stdproc-default 146(defcustom simula-abbrev-stdproc simula-abbrev-stdproc-default
147 "*Specify how to convert case for standard SIMULA procedure and class names. 147 "Specify how to convert case for standard SIMULA procedure and class names.
148Value is one of the symbols `upcase', `downcase', `capitalize', 148Value is one of the symbols `upcase', `downcase', `capitalize',
149\(as in) `abbrev-table', or nil if they should not be changed." 149\(as in) `abbrev-table', or nil if they should not be changed."
150 :type '(choice (const upcase) (const downcase) (const capitalize) 150 :type '(choice (const upcase) (const downcase) (const capitalize)
@@ -152,7 +152,7 @@ Value is one of the symbols `upcase', `downcase', `capitalize',
152 :group 'simula) 152 :group 'simula)
153 153
154(defcustom simula-abbrev-file nil 154(defcustom simula-abbrev-file nil
155 "*File with extra abbrev definitions for use in SIMULA mode. 155 "File with extra abbrev definitions for use in SIMULA mode.
156These are used together with the standard abbrev definitions for SIMULA. 156These are used together with the standard abbrev definitions for SIMULA.
157Please note that the standard definitions are required 157Please note that the standard definitions are required
158for SIMULA mode to function correctly." 158for SIMULA mode to function correctly."
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 0198b32ec9f..f1ab01fd07f 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -120,24 +120,24 @@
120 :group 'languages) 120 :group 'languages)
121 121
122(defcustom tcl-indent-level 4 122(defcustom tcl-indent-level 4
123 "*Indentation of Tcl statements with respect to containing block." 123 "Indentation of Tcl statements with respect to containing block."
124 :type 'integer 124 :type 'integer
125 :group 'tcl) 125 :group 'tcl)
126(put 'tcl-indent-level 'safe-local-variable 'integerp) 126(put 'tcl-indent-level 'safe-local-variable 'integerp)
127 127
128(defcustom tcl-continued-indent-level 4 128(defcustom tcl-continued-indent-level 4
129 "*Indentation of continuation line relative to first line of command." 129 "Indentation of continuation line relative to first line of command."
130 :type 'integer 130 :type 'integer
131 :group 'tcl) 131 :group 'tcl)
132(put 'tcl-continued-indent-level 'safe-local-variable 'integerp) 132(put 'tcl-continued-indent-level 'safe-local-variable 'integerp)
133 133
134(defcustom tcl-auto-newline nil 134(defcustom tcl-auto-newline nil
135 "*Non-nil means automatically newline before and after braces you insert." 135 "Non-nil means automatically newline before and after braces you insert."
136 :type 'boolean 136 :type 'boolean
137 :group 'tcl) 137 :group 'tcl)
138 138
139(defcustom tcl-tab-always-indent tab-always-indent 139(defcustom tcl-tab-always-indent tab-always-indent
140 "*Control effect of TAB key. 140 "Control effect of TAB key.
141If t (the default), always indent current line. 141If t (the default), always indent current line.
142If nil and point is not in the indentation area at the beginning of 142If nil and point is not in the indentation area at the beginning of
143the line, a TAB is inserted. 143the line, a TAB is inserted.
@@ -157,7 +157,7 @@ to take place:
157 157
158 158
159(defcustom tcl-electric-hash-style nil ;; 'smart 159(defcustom tcl-electric-hash-style nil ;; 'smart
160 "*Style of electric hash insertion to use. 160 "Style of electric hash insertion to use.
161Possible values are `backslash', meaning that `\\' quoting should be 161Possible values are `backslash', meaning that `\\' quoting should be
162done; `quote', meaning that `\"' quoting should be done; `smart', 162done; `quote', meaning that `\"' quoting should be done; `smart',
163meaning that the choice between `backslash' and `quote' should be 163meaning that the choice between `backslash' and `quote' should be
@@ -168,27 +168,27 @@ taken to mean `smart'. The default is nil."
168 :group 'tcl) 168 :group 'tcl)
169 169
170(defcustom tcl-help-directory-list nil 170(defcustom tcl-help-directory-list nil
171 "*List of topmost directories containing TclX help files." 171 "List of topmost directories containing TclX help files."
172 :type '(repeat directory) 172 :type '(repeat directory)
173 :group 'tcl) 173 :group 'tcl)
174 174
175(defcustom tcl-use-smart-word-finder t 175(defcustom tcl-use-smart-word-finder t
176 "*If not nil, use smart way to find current word, for Tcl help feature." 176 "If not nil, use smart way to find current word, for Tcl help feature."
177 :type 'boolean 177 :type 'boolean
178 :group 'tcl) 178 :group 'tcl)
179 179
180(defcustom tcl-application "wish" 180(defcustom tcl-application "wish"
181 "*Name of Tcl program to run in inferior Tcl mode." 181 "Name of Tcl program to run in inferior Tcl mode."
182 :type 'string 182 :type 'string
183 :group 'tcl) 183 :group 'tcl)
184 184
185(defcustom tcl-command-switches nil 185(defcustom tcl-command-switches nil
186 "*List of switches to supply to the `tcl-application' program." 186 "List of switches to supply to the `tcl-application' program."
187 :type '(repeat string) 187 :type '(repeat string)
188 :group 'tcl) 188 :group 'tcl)
189 189
190(defcustom tcl-prompt-regexp "^\\(% \\|\\)" 190(defcustom tcl-prompt-regexp "^\\(% \\|\\)"
191 "*If not nil, a regexp that will match the prompt in the inferior process. 191 "If not nil, a regexp that will match the prompt in the inferior process.
192If nil, the prompt is the name of the application with \">\" appended. 192If nil, the prompt is the name of the application with \">\" appended.
193 193
194The default is \"^\\(% \\|\\)\", which will match the default primary 194The default is \"^\\(% \\|\\)\", which will match the default primary
@@ -197,7 +197,7 @@ and secondary prompts for tclsh and wish."
197 :group 'tcl) 197 :group 'tcl)
198 198
199(defcustom inferior-tcl-source-command "source %s\n" 199(defcustom inferior-tcl-source-command "source %s\n"
200 "*Format-string for building a Tcl command to load a file. 200 "Format-string for building a Tcl command to load a file.
201This format string should use `%s' to substitute a file name 201This format string should use `%s' to substitute a file name
202and should result in a Tcl expression that will command the 202and should result in a Tcl expression that will command the
203inferior Tcl to load that file. The filename will be appropriately 203inferior Tcl to load that file. The filename will be appropriately
@@ -301,7 +301,7 @@ quoted for Tcl."
301 ["Tcl help" tcl-help-on-word tcl-help-directory-list])) 301 ["Tcl help" tcl-help-on-word tcl-help-directory-list]))
302 302
303(defvar inferior-tcl-buffer nil 303(defvar inferior-tcl-buffer nil
304 "*The current inferior-tcl process buffer. 304 "The current inferior-tcl process buffer.
305 305
306MULTIPLE PROCESS SUPPORT 306MULTIPLE PROCESS SUPPORT
307=========================================================================== 307===========================================================================
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index 7f3f99f5cfb..6737bf229a0 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -90,12 +90,12 @@
90 :group 'languages) 90 :group 'languages)
91 91
92(defcustom vera-basic-offset 2 92(defcustom vera-basic-offset 2
93 "*Amount of basic offset used for indentation." 93 "Amount of basic offset used for indentation."
94 :type 'integer 94 :type 'integer
95 :group 'vera) 95 :group 'vera)
96 96
97(defcustom vera-underscore-is-part-of-word nil 97(defcustom vera-underscore-is-part-of-word nil
98 "*Non-nil means consider the underscore character `_' as part of word. 98 "Non-nil means consider the underscore character `_' as part of word.
99An identifier containing underscores is then treated as a single word in 99An identifier containing underscores is then treated as a single word in
100select and move operations. All parts of an identifier separated by underscore 100select and move operations. All parts of an identifier separated by underscore
101are treated as single words otherwise." 101are treated as single words otherwise."
@@ -103,7 +103,7 @@ are treated as single words otherwise."
103 :group 'vera) 103 :group 'vera)
104 104
105(defcustom vera-intelligent-tab t 105(defcustom vera-intelligent-tab t
106 "*Non-nil means `TAB' does indentation, word completion and tab insertion. 106 "Non-nil means `TAB' does indentation, word completion and tab insertion.
107That is, if preceding character is part of a word then complete word, 107That is, if preceding character is part of a word then complete word,
108else if not at beginning of line then insert tab, 108else if not at beginning of line then insert tab,
109else if last command was a `TAB' or `RET' then dedent one step, 109else if last command was a `TAB' or `RET' then dedent one step,
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 73e3cd9980f..c8ef8f0324c 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -419,7 +419,7 @@ Set `verilog-in-hooks' during this time, to assist AUTO caches."
419 419
420(defcustom verilog-linter 420(defcustom verilog-linter
421 "echo 'No verilog-linter set, see \"M-x describe-variable verilog-linter\"'" 421 "echo 'No verilog-linter set, see \"M-x describe-variable verilog-linter\"'"
422 "*Unix program and arguments to call to run a lint checker on Verilog source. 422 "Unix program and arguments to call to run a lint checker on Verilog source.
423Depending on the `verilog-set-compile-command', this may be invoked when 423Depending on the `verilog-set-compile-command', this may be invoked when
424you type \\[compile]. When the compile completes, \\[next-error] will take 424you type \\[compile]. When the compile completes, \\[next-error] will take
425you to the next lint error." 425you to the next lint error."
@@ -429,7 +429,7 @@ you to the next lint error."
429 429
430(defcustom verilog-coverage 430(defcustom verilog-coverage
431 "echo 'No verilog-coverage set, see \"M-x describe-variable verilog-coverage\"'" 431 "echo 'No verilog-coverage set, see \"M-x describe-variable verilog-coverage\"'"
432 "*Program and arguments to use to annotate for coverage Verilog source. 432 "Program and arguments to use to annotate for coverage Verilog source.
433Depending on the `verilog-set-compile-command', this may be invoked when 433Depending on the `verilog-set-compile-command', this may be invoked when
434you type \\[compile]. When the compile completes, \\[next-error] will take 434you type \\[compile]. When the compile completes, \\[next-error] will take
435you to the next lint error." 435you to the next lint error."
@@ -439,7 +439,7 @@ you to the next lint error."
439 439
440(defcustom verilog-simulator 440(defcustom verilog-simulator
441 "echo 'No verilog-simulator set, see \"M-x describe-variable verilog-simulator\"'" 441 "echo 'No verilog-simulator set, see \"M-x describe-variable verilog-simulator\"'"
442 "*Program and arguments to use to interpret Verilog source. 442 "Program and arguments to use to interpret Verilog source.
443Depending on the `verilog-set-compile-command', this may be invoked when 443Depending on the `verilog-set-compile-command', this may be invoked when
444you type \\[compile]. When the compile completes, \\[next-error] will take 444you type \\[compile]. When the compile completes, \\[next-error] will take
445you to the next lint error." 445you to the next lint error."
@@ -449,7 +449,7 @@ you to the next lint error."
449 449
450(defcustom verilog-compiler 450(defcustom verilog-compiler
451 "echo 'No verilog-compiler set, see \"M-x describe-variable verilog-compiler\"'" 451 "echo 'No verilog-compiler set, see \"M-x describe-variable verilog-compiler\"'"
452 "*Program and arguments to use to compile Verilog source. 452 "Program and arguments to use to compile Verilog source.
453Depending on the `verilog-set-compile-command', this may be invoked when 453Depending on the `verilog-set-compile-command', this may be invoked when
454you type \\[compile]. When the compile completes, \\[next-error] will take 454you type \\[compile]. When the compile completes, \\[next-error] will take
455you to the next lint error." 455you to the next lint error."
@@ -460,7 +460,7 @@ you to the next lint error."
460(defcustom verilog-preprocessor 460(defcustom verilog-preprocessor
461 ;; Very few tools give preprocessed output, so we'll default to Verilog-Perl 461 ;; Very few tools give preprocessed output, so we'll default to Verilog-Perl
462 "vppreproc __FLAGS__ __FILE__" 462 "vppreproc __FLAGS__ __FILE__"
463 "*Program and arguments to use to preprocess Verilog source. 463 "Program and arguments to use to preprocess Verilog source.
464This is invoked with `verilog-preprocess', and depending on the 464This is invoked with `verilog-preprocess', and depending on the
465`verilog-set-compile-command', may also be invoked when you type 465`verilog-set-compile-command', may also be invoked when you type
466\\[compile]. When the compile completes, \\[next-error] will 466\\[compile]. When the compile completes, \\[next-error] will
@@ -480,7 +480,7 @@ Alternatively use the \"Choose Compilation Action\" menu. See
480`verilog-set-compile-command' for more information.") 480`verilog-set-compile-command' for more information.")
481 481
482(defcustom verilog-highlight-translate-off nil 482(defcustom verilog-highlight-translate-off nil
483 "*Non-nil means background-highlight code excluded from translation. 483 "Non-nil means background-highlight code excluded from translation.
484That is, all code between \"// synopsys translate_off\" and 484That is, all code between \"// synopsys translate_off\" and
485\"// synopsys translate_on\" is highlighted using a different background color 485\"// synopsys translate_on\" is highlighted using a different background color
486\(face `verilog-font-lock-translate-off-face'). 486\(face `verilog-font-lock-translate-off-face').
@@ -495,7 +495,7 @@ entry \"Fontify Buffer\"). XEmacs: turn off and on font locking."
495(put 'verilog-highlight-translate-off 'safe-local-variable 'verilog-booleanp) 495(put 'verilog-highlight-translate-off 'safe-local-variable 'verilog-booleanp)
496 496
497(defcustom verilog-auto-lineup 'declarations 497(defcustom verilog-auto-lineup 'declarations
498 "*Type of statements to lineup across multiple lines. 498 "Type of statements to lineup across multiple lines.
499If 'all' is selected, then all line ups described below are done. 499If 'all' is selected, then all line ups described below are done.
500 500
501If 'declaration', then just declarations are lined up with any 501If 'declaration', then just declarations are lined up with any
@@ -526,13 +526,13 @@ are lineup only when \\[verilog-pretty-declarations] is typed."
526 :group 'verilog-mode-indent ) 526 :group 'verilog-mode-indent )
527 527
528(defcustom verilog-indent-level 3 528(defcustom verilog-indent-level 3
529 "*Indentation of Verilog statements with respect to containing block." 529 "Indentation of Verilog statements with respect to containing block."
530 :group 'verilog-mode-indent 530 :group 'verilog-mode-indent
531 :type 'integer) 531 :type 'integer)
532(put 'verilog-indent-level 'safe-local-variable 'integerp) 532(put 'verilog-indent-level 'safe-local-variable 'integerp)
533 533
534(defcustom verilog-indent-level-module 3 534(defcustom verilog-indent-level-module 3
535 "*Indentation of Module level Verilog statements (eg always, initial). 535 "Indentation of Module level Verilog statements (eg always, initial).
536Set to 0 to get initial and always statements lined up on the left side of 536Set to 0 to get initial and always statements lined up on the left side of
537your screen." 537your screen."
538 :group 'verilog-mode-indent 538 :group 'verilog-mode-indent
@@ -540,14 +540,14 @@ your screen."
540(put 'verilog-indent-level-module 'safe-local-variable 'integerp) 540(put 'verilog-indent-level-module 'safe-local-variable 'integerp)
541 541
542(defcustom verilog-indent-level-declaration 3 542(defcustom verilog-indent-level-declaration 3
543 "*Indentation of declarations with respect to containing block. 543 "Indentation of declarations with respect to containing block.
544Set to 0 to get them list right under containing block." 544Set to 0 to get them list right under containing block."
545 :group 'verilog-mode-indent 545 :group 'verilog-mode-indent
546 :type 'integer) 546 :type 'integer)
547(put 'verilog-indent-level-declaration 'safe-local-variable 'integerp) 547(put 'verilog-indent-level-declaration 'safe-local-variable 'integerp)
548 548
549(defcustom verilog-indent-declaration-macros nil 549(defcustom verilog-indent-declaration-macros nil
550 "*How to treat macro expansions in a declaration. 550 "How to treat macro expansions in a declaration.
551If nil, indent as: 551If nil, indent as:
552 input [31:0] a; 552 input [31:0] a;
553 input `CP; 553 input `CP;
@@ -561,7 +561,7 @@ If non nil, treat as:
561(put 'verilog-indent-declaration-macros 'safe-local-variable 'verilog-booleanp) 561(put 'verilog-indent-declaration-macros 'safe-local-variable 'verilog-booleanp)
562 562
563(defcustom verilog-indent-lists t 563(defcustom verilog-indent-lists t
564 "*How to treat indenting items in a list. 564 "How to treat indenting items in a list.
565If t (the default), indent as: 565If t (the default), indent as:
566 always @( posedge a or 566 always @( posedge a or
567 reset ) begin 567 reset ) begin
@@ -574,58 +574,58 @@ If nil, treat as:
574(put 'verilog-indent-lists 'safe-local-variable 'verilog-booleanp) 574(put 'verilog-indent-lists 'safe-local-variable 'verilog-booleanp)
575 575
576(defcustom verilog-indent-level-behavioral 3 576(defcustom verilog-indent-level-behavioral 3
577 "*Absolute indentation of first begin in a task or function block. 577 "Absolute indentation of first begin in a task or function block.
578Set to 0 to get such code to start at the left side of the screen." 578Set to 0 to get such code to start at the left side of the screen."
579 :group 'verilog-mode-indent 579 :group 'verilog-mode-indent
580 :type 'integer) 580 :type 'integer)
581(put 'verilog-indent-level-behavioral 'safe-local-variable 'integerp) 581(put 'verilog-indent-level-behavioral 'safe-local-variable 'integerp)
582 582
583(defcustom verilog-indent-level-directive 1 583(defcustom verilog-indent-level-directive 1
584 "*Indentation to add to each level of `ifdef declarations. 584 "Indentation to add to each level of `ifdef declarations.
585Set to 0 to have all directives start at the left side of the screen." 585Set to 0 to have all directives start at the left side of the screen."
586 :group 'verilog-mode-indent 586 :group 'verilog-mode-indent
587 :type 'integer) 587 :type 'integer)
588(put 'verilog-indent-level-directive 'safe-local-variable 'integerp) 588(put 'verilog-indent-level-directive 'safe-local-variable 'integerp)
589 589
590(defcustom verilog-cexp-indent 2 590(defcustom verilog-cexp-indent 2
591 "*Indentation of Verilog statements split across lines." 591 "Indentation of Verilog statements split across lines."
592 :group 'verilog-mode-indent 592 :group 'verilog-mode-indent
593 :type 'integer) 593 :type 'integer)
594(put 'verilog-cexp-indent 'safe-local-variable 'integerp) 594(put 'verilog-cexp-indent 'safe-local-variable 'integerp)
595 595
596(defcustom verilog-case-indent 2 596(defcustom verilog-case-indent 2
597 "*Indentation for case statements." 597 "Indentation for case statements."
598 :group 'verilog-mode-indent 598 :group 'verilog-mode-indent
599 :type 'integer) 599 :type 'integer)
600(put 'verilog-case-indent 'safe-local-variable 'integerp) 600(put 'verilog-case-indent 'safe-local-variable 'integerp)
601 601
602(defcustom verilog-auto-newline t 602(defcustom verilog-auto-newline t
603 "*True means automatically newline after semicolons." 603 "True means automatically newline after semicolons."
604 :group 'verilog-mode-indent 604 :group 'verilog-mode-indent
605 :type 'boolean) 605 :type 'boolean)
606(put 'verilog-auto-newline 'safe-local-variable 'verilog-booleanp) 606(put 'verilog-auto-newline 'safe-local-variable 'verilog-booleanp)
607 607
608(defcustom verilog-auto-indent-on-newline t 608(defcustom verilog-auto-indent-on-newline t
609 "*True means automatically indent line after newline." 609 "True means automatically indent line after newline."
610 :group 'verilog-mode-indent 610 :group 'verilog-mode-indent
611 :type 'boolean) 611 :type 'boolean)
612(put 'verilog-auto-indent-on-newline 'safe-local-variable 'verilog-booleanp) 612(put 'verilog-auto-indent-on-newline 'safe-local-variable 'verilog-booleanp)
613 613
614(defcustom verilog-tab-always-indent t 614(defcustom verilog-tab-always-indent t
615 "*True means TAB should always re-indent the current line. 615 "True means TAB should always re-indent the current line.
616A nil value means TAB will only reindent when at the beginning of the line." 616A nil value means TAB will only reindent when at the beginning of the line."
617 :group 'verilog-mode-indent 617 :group 'verilog-mode-indent
618 :type 'boolean) 618 :type 'boolean)
619(put 'verilog-tab-always-indent 'safe-local-variable 'verilog-booleanp) 619(put 'verilog-tab-always-indent 'safe-local-variable 'verilog-booleanp)
620 620
621(defcustom verilog-tab-to-comment nil 621(defcustom verilog-tab-to-comment nil
622 "*True means TAB moves to the right hand column in preparation for a comment." 622 "True means TAB moves to the right hand column in preparation for a comment."
623 :group 'verilog-mode-actions 623 :group 'verilog-mode-actions
624 :type 'boolean) 624 :type 'boolean)
625(put 'verilog-tab-to-comment 'safe-local-variable 'verilog-booleanp) 625(put 'verilog-tab-to-comment 'safe-local-variable 'verilog-booleanp)
626 626
627(defcustom verilog-indent-begin-after-if t 627(defcustom verilog-indent-begin-after-if t
628 "*If true, indent begin statements following if, else, while, for and repeat. 628 "If true, indent begin statements following if, else, while, for and repeat.
629Otherwise, line them up." 629Otherwise, line them up."
630 :group 'verilog-mode-indent 630 :group 'verilog-mode-indent
631 :type 'boolean) 631 :type 'boolean)
@@ -633,14 +633,14 @@ Otherwise, line them up."
633 633
634 634
635(defcustom verilog-align-ifelse nil 635(defcustom verilog-align-ifelse nil
636 "*If true, align `else' under matching `if'. 636 "If true, align `else' under matching `if'.
637Otherwise else is lined up with first character on line holding matching if." 637Otherwise else is lined up with first character on line holding matching if."
638 :group 'verilog-mode-indent 638 :group 'verilog-mode-indent
639 :type 'boolean) 639 :type 'boolean)
640(put 'verilog-align-ifelse 'safe-local-variable 'verilog-booleanp) 640(put 'verilog-align-ifelse 'safe-local-variable 'verilog-booleanp)
641 641
642(defcustom verilog-minimum-comment-distance 10 642(defcustom verilog-minimum-comment-distance 10
643 "*Minimum distance (in lines) between begin and end required before a comment. 643 "Minimum distance (in lines) between begin and end required before a comment.
644Setting this variable to zero results in every end acquiring a comment; the 644Setting this variable to zero results in every end acquiring a comment; the
645default avoids too many redundant comments in tight quarters." 645default avoids too many redundant comments in tight quarters."
646 :group 'verilog-mode-indent 646 :group 'verilog-mode-indent
@@ -648,7 +648,7 @@ default avoids too many redundant comments in tight quarters."
648(put 'verilog-minimum-comment-distance 'safe-local-variable 'integerp) 648(put 'verilog-minimum-comment-distance 'safe-local-variable 'integerp)
649 649
650(defcustom verilog-highlight-p1800-keywords nil 650(defcustom verilog-highlight-p1800-keywords nil
651 "*True means highlight words newly reserved by IEEE-1800. 651 "True means highlight words newly reserved by IEEE-1800.
652These will appear in `verilog-font-lock-p1800-face' in order to gently 652These will appear in `verilog-font-lock-p1800-face' in order to gently
653suggest changing where these words are used as variables to something else. 653suggest changing where these words are used as variables to something else.
654A nil value means highlight these words as appropriate for the SystemVerilog 654A nil value means highlight these words as appropriate for the SystemVerilog
@@ -659,7 +659,7 @@ to see the effect as font color choices are cached by Emacs."
659(put 'verilog-highlight-p1800-keywords 'safe-local-variable 'verilog-booleanp) 659(put 'verilog-highlight-p1800-keywords 'safe-local-variable 'verilog-booleanp)
660 660
661(defcustom verilog-highlight-grouping-keywords nil 661(defcustom verilog-highlight-grouping-keywords nil
662 "*True means highlight grouping keywords 'begin' and 'end' more dramatically. 662 "True means highlight grouping keywords 'begin' and 'end' more dramatically.
663If false, these words are in the `font-lock-type-face'; if True then they are in 663If false, these words are in the `font-lock-type-face'; if True then they are in
664`verilog-font-lock-ams-face'. Some find that special highlighting on these 664`verilog-font-lock-ams-face'. Some find that special highlighting on these
665grouping constructs allow the structure of the code to be understood at a glance." 665grouping constructs allow the structure of the code to be understood at a glance."
@@ -668,7 +668,7 @@ grouping constructs allow the structure of the code to be understood at a glance
668(put 'verilog-highlight-grouping-keywords 'safe-local-variable 'verilog-booleanp) 668(put 'verilog-highlight-grouping-keywords 'safe-local-variable 'verilog-booleanp)
669 669
670(defcustom verilog-highlight-modules nil 670(defcustom verilog-highlight-modules nil
671 "*True means highlight module statements for `verilog-load-file-at-point'. 671 "True means highlight module statements for `verilog-load-file-at-point'.
672When true, mousing over module names will allow jumping to the 672When true, mousing over module names will allow jumping to the
673module definition. If false, this is not supported. Setting 673module definition. If false, this is not supported. Setting
674this is experimental, and may lead to bad performance." 674this is experimental, and may lead to bad performance."
@@ -677,7 +677,7 @@ this is experimental, and may lead to bad performance."
677(put 'verilog-highlight-modules 'safe-local-variable 'verilog-booleanp) 677(put 'verilog-highlight-modules 'safe-local-variable 'verilog-booleanp)
678 678
679(defcustom verilog-highlight-includes t 679(defcustom verilog-highlight-includes t
680 "*True means highlight module statements for `verilog-load-file-at-point'. 680 "True means highlight module statements for `verilog-load-file-at-point'.
681When true, mousing over include file names will allow jumping to the 681When true, mousing over include file names will allow jumping to the
682file referenced. If false, this is not supported." 682file referenced. If false, this is not supported."
683 :group 'verilog-mode-indent 683 :group 'verilog-mode-indent
@@ -685,7 +685,7 @@ file referenced. If false, this is not supported."
685(put 'verilog-highlight-includes 'safe-local-variable 'verilog-booleanp) 685(put 'verilog-highlight-includes 'safe-local-variable 'verilog-booleanp)
686 686
687(defcustom verilog-auto-declare-nettype nil 687(defcustom verilog-auto-declare-nettype nil
688 "*Non-nil specifies the data type to use with `verilog-auto-input' etc. 688 "Non-nil specifies the data type to use with `verilog-auto-input' etc.
689Set this to \"wire\" if the Verilog code uses \"`default_nettype 689Set this to \"wire\" if the Verilog code uses \"`default_nettype
690none\". Note using `default_nettype none isn't recommended practice; this 690none\". Note using `default_nettype none isn't recommended practice; this
691mode is experimental." 691mode is experimental."
@@ -695,7 +695,7 @@ mode is experimental."
695(put 'verilog-auto-declare-nettype 'safe-local-variable `stringp) 695(put 'verilog-auto-declare-nettype 'safe-local-variable `stringp)
696 696
697(defcustom verilog-auto-wire-type nil 697(defcustom verilog-auto-wire-type nil
698 "*Non-nil specifies the data type to use with `verilog-auto-wire' etc. 698 "Non-nil specifies the data type to use with `verilog-auto-wire' etc.
699Set this to \"logic\" for SystemVerilog code, or use `verilog-auto-logic'." 699Set this to \"logic\" for SystemVerilog code, or use `verilog-auto-logic'."
700 :version "24.1" 700 :version "24.1"
701 :group 'verilog-mode-actions 701 :group 'verilog-mode-actions
@@ -703,21 +703,21 @@ Set this to \"logic\" for SystemVerilog code, or use `verilog-auto-logic'."
703(put 'verilog-auto-wire-type 'safe-local-variable `stringp) 703(put 'verilog-auto-wire-type 'safe-local-variable `stringp)
704 704
705(defcustom verilog-auto-endcomments t 705(defcustom verilog-auto-endcomments t
706 "*True means insert a comment /* ... */ after 'end's. 706 "True means insert a comment /* ... */ after 'end's.
707The name of the function or case will be set between the braces." 707The name of the function or case will be set between the braces."
708 :group 'verilog-mode-actions 708 :group 'verilog-mode-actions
709 :type 'boolean) 709 :type 'boolean)
710(put 'verilog-auto-endcomments 'safe-local-variable 'verilog-booleanp) 710(put 'verilog-auto-endcomments 'safe-local-variable 'verilog-booleanp)
711 711
712(defcustom verilog-auto-delete-trailing-whitespace nil 712(defcustom verilog-auto-delete-trailing-whitespace nil
713 "*True means to `delete-trailing-whitespace' in `verilog-auto'." 713 "True means to `delete-trailing-whitespace' in `verilog-auto'."
714 :version "24.1" 714 :version "24.1"
715 :group 'verilog-mode-actions 715 :group 'verilog-mode-actions
716 :type 'boolean) 716 :type 'boolean)
717(put 'verilog-auto-delete-trailing-whitespace 'safe-local-variable 'verilog-booleanp) 717(put 'verilog-auto-delete-trailing-whitespace 'safe-local-variable 'verilog-booleanp)
718 718
719(defcustom verilog-auto-ignore-concat nil 719(defcustom verilog-auto-ignore-concat nil
720 "*True means ignore signals in {...} concatenations for AUTOWIRE etc. 720 "True means ignore signals in {...} concatenations for AUTOWIRE etc.
721This will exclude signals referenced as pin connections in {...} 721This will exclude signals referenced as pin connections in {...}
722from AUTOWIRE, AUTOOUTPUT and friends. This flag should be set 722from AUTOWIRE, AUTOOUTPUT and friends. This flag should be set
723for backward compatibility only and not set in new designs; it 723for backward compatibility only and not set in new designs; it
@@ -727,7 +727,7 @@ may be removed in future versions."
727(put 'verilog-auto-ignore-concat 'safe-local-variable 'verilog-booleanp) 727(put 'verilog-auto-ignore-concat 'safe-local-variable 'verilog-booleanp)
728 728
729(defcustom verilog-auto-read-includes nil 729(defcustom verilog-auto-read-includes nil
730 "*True means to automatically read includes before AUTOs. 730 "True means to automatically read includes before AUTOs.
731This will do a `verilog-read-defines' and `verilog-read-includes' before 731This will do a `verilog-read-defines' and `verilog-read-includes' before
732each AUTO expansion. This makes it easier to embed defines and includes, 732each AUTO expansion. This makes it easier to embed defines and includes,
733but can result in very slow reading times if there are many or large 733but can result in very slow reading times if there are many or large
@@ -737,7 +737,7 @@ include files."
737(put 'verilog-auto-read-includes 'safe-local-variable 'verilog-booleanp) 737(put 'verilog-auto-read-includes 'safe-local-variable 'verilog-booleanp)
738 738
739(defcustom verilog-auto-save-policy nil 739(defcustom verilog-auto-save-policy nil
740 "*Non-nil indicates action to take when saving a Verilog buffer with AUTOs. 740 "Non-nil indicates action to take when saving a Verilog buffer with AUTOs.
741A value of `force' will always do a \\[verilog-auto] automatically if 741A value of `force' will always do a \\[verilog-auto] automatically if
742needed on every save. A value of `detect' will do \\[verilog-auto] 742needed on every save. A value of `detect' will do \\[verilog-auto]
743automatically when it thinks necessary. A value of `ask' will query the 743automatically when it thinks necessary. A value of `ask' will query the
@@ -750,7 +750,7 @@ sub-module's port list has changed."
750 :type '(choice (const nil) (const ask) (const detect) (const force))) 750 :type '(choice (const nil) (const ask) (const detect) (const force)))
751 751
752(defcustom verilog-auto-star-expand t 752(defcustom verilog-auto-star-expand t
753 "*Non-nil indicates to expand a SystemVerilog .* instance ports. 753 "Non-nil indicates to expand a SystemVerilog .* instance ports.
754They will be expanded in the same way as if there was a AUTOINST in the 754They will be expanded in the same way as if there was a AUTOINST in the
755instantiation. See also `verilog-auto-star' and `verilog-auto-star-save'." 755instantiation. See also `verilog-auto-star' and `verilog-auto-star-save'."
756 :group 'verilog-mode-actions 756 :group 'verilog-mode-actions
@@ -758,7 +758,7 @@ instantiation. See also `verilog-auto-star' and `verilog-auto-star-save'."
758(put 'verilog-auto-star-expand 'safe-local-variable 'verilog-booleanp) 758(put 'verilog-auto-star-expand 'safe-local-variable 'verilog-booleanp)
759 759
760(defcustom verilog-auto-star-save nil 760(defcustom verilog-auto-star-save nil
761 "*Non-nil indicates to save to disk SystemVerilog .* instance expansions. 761 "Non-nil indicates to save to disk SystemVerilog .* instance expansions.
762A nil value indicates direct connections will be removed before saving. 762A nil value indicates direct connections will be removed before saving.
763Only meaningful to those created due to `verilog-auto-star-expand' being set. 763Only meaningful to those created due to `verilog-auto-star-expand' being set.
764 764
@@ -775,7 +775,7 @@ always be saved."
775 "Text from file-local-variables during last evaluation.") 775 "Text from file-local-variables during last evaluation.")
776 776
777(defvar verilog-diff-function 'verilog-diff-report 777(defvar verilog-diff-function 'verilog-diff-report
778 "*Function to run when `verilog-diff-auto' detects differences. 778 "Function to run when `verilog-diff-auto' detects differences.
779Function takes three arguments, the original buffer, the 779Function takes three arguments, the original buffer, the
780difference buffer, and the point in original buffer with the 780difference buffer, and the point in original buffer with the
781first difference.") 781first difference.")
@@ -869,11 +869,11 @@ See `compilation-error-regexp-alist-alist' for the formatting. For XEmacs.")
869 ("^In file \\([^ \t]+\\)[ \t]+line[ \t]+\\([0-9]+\\):\n[^\n]*\n[^\n]*\n\\(Warning\\|Error\\|Failure\\)[^\n]*" 1 bold t) 869 ("^In file \\([^ \t]+\\)[ \t]+line[ \t]+\\([0-9]+\\):\n[^\n]*\n[^\n]*\n\\(Warning\\|Error\\|Failure\\)[^\n]*" 1 bold t)
870 ("^In file \\([^ \t]+\\)[ \t]+line[ \t]+\\([0-9]+\\):\n[^\n]*\n[^\n]*\n\\(Warning\\|Error\\|Failure\\)[^\n]*" 2 bold t) 870 ("^In file \\([^ \t]+\\)[ \t]+line[ \t]+\\([0-9]+\\):\n[^\n]*\n[^\n]*\n\\(Warning\\|Error\\|Failure\\)[^\n]*" 2 bold t)
871 ) 871 )
872 "*Keywords to also highlight in Verilog *compilation* buffers. 872 "Keywords to also highlight in Verilog *compilation* buffers.
873Only used in XEmacs; GNU Emacs uses `verilog-error-regexp-emacs-alist'.") 873Only used in XEmacs; GNU Emacs uses `verilog-error-regexp-emacs-alist'.")
874 874
875(defcustom verilog-library-flags '("") 875(defcustom verilog-library-flags '("")
876 "*List of standard Verilog arguments to use for /*AUTOINST*/. 876 "List of standard Verilog arguments to use for /*AUTOINST*/.
877These arguments are used to find files for `verilog-auto', and match 877These arguments are used to find files for `verilog-auto', and match
878the flags accepted by a standard Verilog-XL simulator. 878the flags accepted by a standard Verilog-XL simulator.
879 879
@@ -904,7 +904,7 @@ See also the variables mentioned above."
904(put 'verilog-library-flags 'safe-local-variable 'listp) 904(put 'verilog-library-flags 'safe-local-variable 'listp)
905 905
906(defcustom verilog-library-directories '(".") 906(defcustom verilog-library-directories '(".")
907 "*List of directories when looking for files for /*AUTOINST*/. 907 "List of directories when looking for files for /*AUTOINST*/.
908The directory may be relative to the current file, or absolute. 908The directory may be relative to the current file, or absolute.
909Environment variables are also expanded in the directory names. 909Environment variables are also expanded in the directory names.
910Having at least the current directory is a good idea. 910Having at least the current directory is a good idea.
@@ -927,7 +927,7 @@ and `verilog-library-extensions'."
927(put 'verilog-library-directories 'safe-local-variable 'listp) 927(put 'verilog-library-directories 'safe-local-variable 'listp)
928 928
929(defcustom verilog-library-files '() 929(defcustom verilog-library-files '()
930 "*List of files to search for modules. 930 "List of files to search for modules.
931AUTOINST will use this when it needs to resolve a module name. 931AUTOINST will use this when it needs to resolve a module name.
932This is a complete path, usually to a technology file with many standard 932This is a complete path, usually to a technology file with many standard
933cells defined in it. 933cells defined in it.
@@ -949,14 +949,14 @@ See also `verilog-library-flags', `verilog-library-directories'."
949(put 'verilog-library-files 'safe-local-variable 'listp) 949(put 'verilog-library-files 'safe-local-variable 'listp)
950 950
951(defcustom verilog-library-extensions '(".v" ".sv") 951(defcustom verilog-library-extensions '(".v" ".sv")
952 "*List of extensions to use when looking for files for /*AUTOINST*/. 952 "List of extensions to use when looking for files for /*AUTOINST*/.
953See also `verilog-library-flags', `verilog-library-directories'." 953See also `verilog-library-flags', `verilog-library-directories'."
954 :type '(repeat string) 954 :type '(repeat string)
955 :group 'verilog-mode-auto) 955 :group 'verilog-mode-auto)
956(put 'verilog-library-extensions 'safe-local-variable 'listp) 956(put 'verilog-library-extensions 'safe-local-variable 'listp)
957 957
958(defcustom verilog-active-low-regexp nil 958(defcustom verilog-active-low-regexp nil
959 "*If set, treat signals matching this regexp as active low. 959 "If set, treat signals matching this regexp as active low.
960This is used for AUTORESET and AUTOTIEOFF. For proper behavior, 960This is used for AUTORESET and AUTOTIEOFF. For proper behavior,
961you will probably also need `verilog-auto-reset-widths' set." 961you will probably also need `verilog-auto-reset-widths' set."
962 :group 'verilog-mode-auto 962 :group 'verilog-mode-auto
@@ -964,7 +964,7 @@ you will probably also need `verilog-auto-reset-widths' set."
964(put 'verilog-active-low-regexp 'safe-local-variable 'stringp) 964(put 'verilog-active-low-regexp 'safe-local-variable 'stringp)
965 965
966(defcustom verilog-auto-sense-include-inputs nil 966(defcustom verilog-auto-sense-include-inputs nil
967 "*If true, AUTOSENSE should include all inputs. 967 "If true, AUTOSENSE should include all inputs.
968If nil, only inputs that are NOT output signals in the same block are 968If nil, only inputs that are NOT output signals in the same block are
969included." 969included."
970 :group 'verilog-mode-auto 970 :group 'verilog-mode-auto
@@ -972,7 +972,7 @@ included."
972(put 'verilog-auto-sense-include-inputs 'safe-local-variable 'verilog-booleanp) 972(put 'verilog-auto-sense-include-inputs 'safe-local-variable 'verilog-booleanp)
973 973
974(defcustom verilog-auto-sense-defines-constant nil 974(defcustom verilog-auto-sense-defines-constant nil
975 "*If true, AUTOSENSE should assume all defines represent constants. 975 "If true, AUTOSENSE should assume all defines represent constants.
976When true, the defines will not be included in sensitivity lists. To 976When true, the defines will not be included in sensitivity lists. To
977maintain compatibility with other sites, this should be set at the bottom 977maintain compatibility with other sites, this should be set at the bottom
978of each Verilog file that requires it, rather than being set globally." 978of each Verilog file that requires it, rather than being set globally."
@@ -981,7 +981,7 @@ of each Verilog file that requires it, rather than being set globally."
981(put 'verilog-auto-sense-defines-constant 'safe-local-variable 'verilog-booleanp) 981(put 'verilog-auto-sense-defines-constant 'safe-local-variable 'verilog-booleanp)
982 982
983(defcustom verilog-auto-reset-blocking-in-non t 983(defcustom verilog-auto-reset-blocking-in-non t
984 "*If true, AUTORESET will reset those signals which were 984 "If true, AUTORESET will reset those signals which were
985assigned with blocking assignments (=) even in a block with 985assigned with blocking assignments (=) even in a block with
986non-blocking assignments (<=). 986non-blocking assignments (<=).
987 987
@@ -995,7 +995,7 @@ those temporaries reset. See example in `verilog-auto-reset'."
995(put 'verilog-auto-reset-blocking-in-non 'safe-local-variable 'verilog-booleanp) 995(put 'verilog-auto-reset-blocking-in-non 'safe-local-variable 'verilog-booleanp)
996 996
997(defcustom verilog-auto-reset-widths t 997(defcustom verilog-auto-reset-widths t
998 "*If true, AUTORESET should determine the width of signals. 998 "If true, AUTORESET should determine the width of signals.
999This is then used to set the width of the zero (32'h0 for example). This 999This is then used to set the width of the zero (32'h0 for example). This
1000is required by some lint tools that aren't smart enough to ignore widths of 1000is required by some lint tools that aren't smart enough to ignore widths of
1001the constant zero. This may result in ugly code when parameters determine 1001the constant zero. This may result in ugly code when parameters determine
@@ -1005,13 +1005,13 @@ the MSB or LSB of a signal inside an AUTORESET."
1005(put 'verilog-auto-reset-widths 'safe-local-variable 'verilog-booleanp) 1005(put 'verilog-auto-reset-widths 'safe-local-variable 'verilog-booleanp)
1006 1006
1007(defcustom verilog-assignment-delay "" 1007(defcustom verilog-assignment-delay ""
1008 "*Text used for delays in delayed assignments. Add a trailing space if set." 1008 "Text used for delays in delayed assignments. Add a trailing space if set."
1009 :group 'verilog-mode-auto 1009 :group 'verilog-mode-auto
1010 :type 'string) 1010 :type 'string)
1011(put 'verilog-assignment-delay 'safe-local-variable 'stringp) 1011(put 'verilog-assignment-delay 'safe-local-variable 'stringp)
1012 1012
1013(defcustom verilog-auto-arg-sort nil 1013(defcustom verilog-auto-arg-sort nil
1014 "*If set, AUTOARG signal names will be sorted, not in declaration order. 1014 "If set, AUTOARG signal names will be sorted, not in declaration order.
1015Declaration order is advantageous with order based instantiations 1015Declaration order is advantageous with order based instantiations
1016and is the default for backward compatibility. Sorted order 1016and is the default for backward compatibility. Sorted order
1017reduces changes when declarations are moved around in a file, and 1017reduces changes when declarations are moved around in a file, and
@@ -1023,7 +1023,7 @@ See also `verilog-auto-inst-sort'."
1023(put 'verilog-auto-arg-sort 'safe-local-variable 'verilog-booleanp) 1023(put 'verilog-auto-arg-sort 'safe-local-variable 'verilog-booleanp)
1024 1024
1025(defcustom verilog-auto-inst-dot-name nil 1025(defcustom verilog-auto-inst-dot-name nil
1026 "*If true, when creating ports with AUTOINST, use .name syntax. 1026 "If true, when creating ports with AUTOINST, use .name syntax.
1027This will use \".port\" instead of \".port(port)\" when possible. 1027This will use \".port\" instead of \".port(port)\" when possible.
1028This is only legal in SystemVerilog files, and will confuse older 1028This is only legal in SystemVerilog files, and will confuse older
1029simulators. Setting `verilog-auto-inst-vector' to nil may also 1029simulators. Setting `verilog-auto-inst-vector' to nil may also
@@ -1033,7 +1033,7 @@ be desirable to increase how often .name will be used."
1033(put 'verilog-auto-inst-dot-name 'safe-local-variable 'verilog-booleanp) 1033(put 'verilog-auto-inst-dot-name 'safe-local-variable 'verilog-booleanp)
1034 1034
1035(defcustom verilog-auto-inst-param-value nil 1035(defcustom verilog-auto-inst-param-value nil
1036 "*If set, AUTOINST will replace parameters with the parameter value. 1036 "If set, AUTOINST will replace parameters with the parameter value.
1037If nil, leave parameters as symbolic names. 1037If nil, leave parameters as symbolic names.
1038 1038
1039Parameters must be in Verilog 2001 format #(...), and if a parameter is not 1039Parameters must be in Verilog 2001 format #(...), and if a parameter is not
@@ -1070,7 +1070,7 @@ instead expand to:
1070(put 'verilog-auto-inst-param-value 'safe-local-variable 'verilog-booleanp) 1070(put 'verilog-auto-inst-param-value 'safe-local-variable 'verilog-booleanp)
1071 1071
1072(defcustom verilog-auto-inst-sort nil 1072(defcustom verilog-auto-inst-sort nil
1073 "*If set, AUTOINST signal names will be sorted, not in declaration order. 1073 "If set, AUTOINST signal names will be sorted, not in declaration order.
1074Also affects AUTOINSTPARAM. Declaration order is the default for 1074Also affects AUTOINSTPARAM. Declaration order is the default for
1075backward compatibility, and as some teams prefer signals that are 1075backward compatibility, and as some teams prefer signals that are
1076declared together to remain together. Sorted order reduces 1076declared together to remain together. Sorted order reduces
@@ -1083,7 +1083,7 @@ See also `verilog-auto-arg-sort'."
1083(put 'verilog-auto-inst-sort 'safe-local-variable 'verilog-booleanp) 1083(put 'verilog-auto-inst-sort 'safe-local-variable 'verilog-booleanp)
1084 1084
1085(defcustom verilog-auto-inst-vector t 1085(defcustom verilog-auto-inst-vector t
1086 "*If true, when creating default ports with AUTOINST, use bus subscripts. 1086 "If true, when creating default ports with AUTOINST, use bus subscripts.
1087If nil, skip the subscript when it matches the entire bus as declared in 1087If nil, skip the subscript when it matches the entire bus as declared in
1088the module (AUTOWIRE signals always are subscripted, you must manually 1088the module (AUTOWIRE signals always are subscripted, you must manually
1089declare the wire to have the subscripts removed.) Setting this to nil may 1089declare the wire to have the subscripts removed.) Setting this to nil may
@@ -1093,7 +1093,7 @@ speed up some simulators, but is less general and harder to read, so avoid."
1093(put 'verilog-auto-inst-vector 'safe-local-variable 'verilog-booleanp) 1093(put 'verilog-auto-inst-vector 'safe-local-variable 'verilog-booleanp)
1094 1094
1095(defcustom verilog-auto-inst-template-numbers nil 1095(defcustom verilog-auto-inst-template-numbers nil
1096 "*If true, when creating templated ports with AUTOINST, add a comment. 1096 "If true, when creating templated ports with AUTOINST, add a comment.
1097 1097
1098If t, the comment will add the line number of the template that 1098If t, the comment will add the line number of the template that
1099was used for that port declaration. This setting is suggested 1099was used for that port declaration. This setting is suggested
@@ -1110,34 +1110,34 @@ won't merge conflict."
1110 '(lambda (x) (memq x '(nil t lhs)))) 1110 '(lambda (x) (memq x '(nil t lhs))))
1111 1111
1112(defcustom verilog-auto-inst-column 40 1112(defcustom verilog-auto-inst-column 40
1113 "*Indent-to column number for net name part of AUTOINST created pin." 1113 "Indent-to column number for net name part of AUTOINST created pin."
1114 :group 'verilog-mode-indent 1114 :group 'verilog-mode-indent
1115 :type 'integer) 1115 :type 'integer)
1116(put 'verilog-auto-inst-column 'safe-local-variable 'integerp) 1116(put 'verilog-auto-inst-column 'safe-local-variable 'integerp)
1117 1117
1118(defcustom verilog-auto-input-ignore-regexp nil 1118(defcustom verilog-auto-input-ignore-regexp nil
1119 "*If set, when creating AUTOINPUT list, ignore signals matching this regexp. 1119 "If set, when creating AUTOINPUT list, ignore signals matching this regexp.
1120See the \\[verilog-faq] for examples on using this." 1120See the \\[verilog-faq] for examples on using this."
1121 :group 'verilog-mode-auto 1121 :group 'verilog-mode-auto
1122 :type 'string) 1122 :type 'string)
1123(put 'verilog-auto-input-ignore-regexp 'safe-local-variable 'stringp) 1123(put 'verilog-auto-input-ignore-regexp 'safe-local-variable 'stringp)
1124 1124
1125(defcustom verilog-auto-inout-ignore-regexp nil 1125(defcustom verilog-auto-inout-ignore-regexp nil
1126 "*If set, when creating AUTOINOUT list, ignore signals matching this regexp. 1126 "If set, when creating AUTOINOUT list, ignore signals matching this regexp.
1127See the \\[verilog-faq] for examples on using this." 1127See the \\[verilog-faq] for examples on using this."
1128 :group 'verilog-mode-auto 1128 :group 'verilog-mode-auto
1129 :type 'string) 1129 :type 'string)
1130(put 'verilog-auto-inout-ignore-regexp 'safe-local-variable 'stringp) 1130(put 'verilog-auto-inout-ignore-regexp 'safe-local-variable 'stringp)
1131 1131
1132(defcustom verilog-auto-output-ignore-regexp nil 1132(defcustom verilog-auto-output-ignore-regexp nil
1133 "*If set, when creating AUTOOUTPUT list, ignore signals matching this regexp. 1133 "If set, when creating AUTOOUTPUT list, ignore signals matching this regexp.
1134See the \\[verilog-faq] for examples on using this." 1134See the \\[verilog-faq] for examples on using this."
1135 :group 'verilog-mode-auto 1135 :group 'verilog-mode-auto
1136 :type 'string) 1136 :type 'string)
1137(put 'verilog-auto-output-ignore-regexp 'safe-local-variable 'stringp) 1137(put 'verilog-auto-output-ignore-regexp 'safe-local-variable 'stringp)
1138 1138
1139(defcustom verilog-auto-tieoff-declaration "wire" 1139(defcustom verilog-auto-tieoff-declaration "wire"
1140 "*Data type used for the declaration for AUTOTIEOFF. If \"wire\" then 1140 "Data type used for the declaration for AUTOTIEOFF. If \"wire\" then
1141create a wire, if \"assign\" create an assignment, else the data type for 1141create a wire, if \"assign\" create an assignment, else the data type for
1142variable creation." 1142variable creation."
1143 :version "24.1" 1143 :version "24.1"
@@ -1146,58 +1146,58 @@ variable creation."
1146(put 'verilog-auto-tieoff-declaration 'safe-local-variable 'stringp) 1146(put 'verilog-auto-tieoff-declaration 'safe-local-variable 'stringp)
1147 1147
1148(defcustom verilog-auto-tieoff-ignore-regexp nil 1148(defcustom verilog-auto-tieoff-ignore-regexp nil
1149 "*If set, when creating AUTOTIEOFF list, ignore signals matching this regexp. 1149 "If set, when creating AUTOTIEOFF list, ignore signals matching this regexp.
1150See the \\[verilog-faq] for examples on using this." 1150See the \\[verilog-faq] for examples on using this."
1151 :group 'verilog-mode-auto 1151 :group 'verilog-mode-auto
1152 :type 'string) 1152 :type 'string)
1153(put 'verilog-auto-tieoff-ignore-regexp 'safe-local-variable 'stringp) 1153(put 'verilog-auto-tieoff-ignore-regexp 'safe-local-variable 'stringp)
1154 1154
1155(defcustom verilog-auto-unused-ignore-regexp nil 1155(defcustom verilog-auto-unused-ignore-regexp nil
1156 "*If set, when creating AUTOUNUSED list, ignore signals matching this regexp. 1156 "If set, when creating AUTOUNUSED list, ignore signals matching this regexp.
1157See the \\[verilog-faq] for examples on using this." 1157See the \\[verilog-faq] for examples on using this."
1158 :group 'verilog-mode-auto 1158 :group 'verilog-mode-auto
1159 :type 'string) 1159 :type 'string)
1160(put 'verilog-auto-unused-ignore-regexp 'safe-local-variable 'stringp) 1160(put 'verilog-auto-unused-ignore-regexp 'safe-local-variable 'stringp)
1161 1161
1162(defcustom verilog-typedef-regexp nil 1162(defcustom verilog-typedef-regexp nil
1163 "*If non-nil, regular expression that matches Verilog-2001 typedef names. 1163 "If non-nil, regular expression that matches Verilog-2001 typedef names.
1164For example, \"_t$\" matches typedefs named with _t, as in the C language." 1164For example, \"_t$\" matches typedefs named with _t, as in the C language."
1165 :group 'verilog-mode-auto 1165 :group 'verilog-mode-auto
1166 :type 'string) 1166 :type 'string)
1167(put 'verilog-typedef-regexp 'safe-local-variable 'stringp) 1167(put 'verilog-typedef-regexp 'safe-local-variable 'stringp)
1168 1168
1169(defcustom verilog-mode-hook 'verilog-set-compile-command 1169(defcustom verilog-mode-hook 'verilog-set-compile-command
1170 "*Hook run after Verilog mode is loaded." 1170 "Hook run after Verilog mode is loaded."
1171 :type 'hook 1171 :type 'hook
1172 :group 'verilog-mode) 1172 :group 'verilog-mode)
1173 1173
1174(defcustom verilog-auto-hook nil 1174(defcustom verilog-auto-hook nil
1175 "*Hook run after `verilog-mode' updates AUTOs." 1175 "Hook run after `verilog-mode' updates AUTOs."
1176 :group 'verilog-mode-auto 1176 :group 'verilog-mode-auto
1177 :type 'hook) 1177 :type 'hook)
1178 1178
1179(defcustom verilog-before-auto-hook nil 1179(defcustom verilog-before-auto-hook nil
1180 "*Hook run before `verilog-mode' updates AUTOs." 1180 "Hook run before `verilog-mode' updates AUTOs."
1181 :group 'verilog-mode-auto 1181 :group 'verilog-mode-auto
1182 :type 'hook) 1182 :type 'hook)
1183 1183
1184(defcustom verilog-delete-auto-hook nil 1184(defcustom verilog-delete-auto-hook nil
1185 "*Hook run after `verilog-mode' deletes AUTOs." 1185 "Hook run after `verilog-mode' deletes AUTOs."
1186 :group 'verilog-mode-auto 1186 :group 'verilog-mode-auto
1187 :type 'hook) 1187 :type 'hook)
1188 1188
1189(defcustom verilog-before-delete-auto-hook nil 1189(defcustom verilog-before-delete-auto-hook nil
1190 "*Hook run before `verilog-mode' deletes AUTOs." 1190 "Hook run before `verilog-mode' deletes AUTOs."
1191 :group 'verilog-mode-auto 1191 :group 'verilog-mode-auto
1192 :type 'hook) 1192 :type 'hook)
1193 1193
1194(defcustom verilog-getopt-flags-hook nil 1194(defcustom verilog-getopt-flags-hook nil
1195 "*Hook run after `verilog-getopt-flags' determines the Verilog option lists." 1195 "Hook run after `verilog-getopt-flags' determines the Verilog option lists."
1196 :group 'verilog-mode-auto 1196 :group 'verilog-mode-auto
1197 :type 'hook) 1197 :type 'hook)
1198 1198
1199(defcustom verilog-before-getopt-flags-hook nil 1199(defcustom verilog-before-getopt-flags-hook nil
1200 "*Hook run before `verilog-getopt-flags' determines the Verilog option lists." 1200 "Hook run before `verilog-getopt-flags' determines the Verilog option lists."
1201 :group 'verilog-mode-auto 1201 :group 'verilog-mode-auto
1202 :type 'hook) 1202 :type 'hook)
1203 1203
@@ -1211,17 +1211,17 @@ For example, \"_t$\" matches typedefs named with _t, as in the C language."
1211;; Customization variables: 1211;; Customization variables:
1212;; 1212;;
1213(defvar verilog-date-scientific-format nil 1213(defvar verilog-date-scientific-format nil
1214 "*If non-nil, dates are written in scientific format (e.g. 1997/09/17). 1214 "If non-nil, dates are written in scientific format (e.g. 1997/09/17).
1215If nil, in European format (e.g. 17.09.1997). The brain-dead American 1215If nil, in European format (e.g. 17.09.1997). The brain-dead American
1216format (e.g. 09/17/1997) is not supported.") 1216format (e.g. 09/17/1997) is not supported.")
1217 1217
1218(defvar verilog-company nil 1218(defvar verilog-company nil
1219 "*Default name of Company for Verilog header. 1219 "Default name of Company for Verilog header.
1220If set will become buffer local.") 1220If set will become buffer local.")
1221(make-variable-buffer-local 'verilog-company) 1221(make-variable-buffer-local 'verilog-company)
1222 1222
1223(defvar verilog-project nil 1223(defvar verilog-project nil
1224 "*Default name of Project for Verilog header. 1224 "Default name of Project for Verilog header.
1225If set will become buffer local.") 1225If set will become buffer local.")
1226(make-variable-buffer-local 'verilog-project) 1226(make-variable-buffer-local 'verilog-project)
1227 1227
@@ -6686,7 +6686,7 @@ Region is defined by B and EDPOS."
6686(defvar verilog-buffer-to-use nil) 6686(defvar verilog-buffer-to-use nil)
6687(defvar verilog-flag nil) 6687(defvar verilog-flag nil)
6688(defvar verilog-toggle-completions nil 6688(defvar verilog-toggle-completions nil
6689 "*True means \\<verilog-mode-map>\\[verilog-complete-word] should try all possible completions one by one. 6689 "True means \\<verilog-mode-map>\\[verilog-complete-word] should try all possible completions one by one.
6690Repeated use of \\[verilog-complete-word] will show you all of them. 6690Repeated use of \\[verilog-complete-word] will show you all of them.
6691Normally, when there is more than one possible completion, 6691Normally, when there is more than one possible completion,
6692it displays a list of all possible completions.") 6692it displays a list of all possible completions.")
@@ -6701,13 +6701,13 @@ it displays a list of all possible completions.")
6701 "rtranif1" "semaphore" "time" "tran" "tranif0" "tranif1" "tri" "tri0" "tri1" 6701 "rtranif1" "semaphore" "time" "tran" "tranif0" "tranif1" "tri" "tri0" "tri1"
6702 "triand" "trior" "trireg" "wand" "wire" "wor" "xnor" "xor" 6702 "triand" "trior" "trireg" "wand" "wire" "wor" "xnor" "xor"
6703 ) 6703 )
6704 "*Keywords for types used when completing a word in a declaration or parmlist. 6704 "Keywords for types used when completing a word in a declaration or parmlist.
6705\(integer, real, reg...)") 6705\(integer, real, reg...)")
6706 6706
6707(defvar verilog-cpp-keywords 6707(defvar verilog-cpp-keywords
6708 '("module" "macromodule" "primitive" "timescale" "define" "ifdef" "ifndef" "else" 6708 '("module" "macromodule" "primitive" "timescale" "define" "ifdef" "ifndef" "else"
6709 "endif") 6709 "endif")
6710 "*Keywords to complete when at first word of a line in declarative scope. 6710 "Keywords to complete when at first word of a line in declarative scope.
6711\(initial, always, begin, assign...) 6711\(initial, always, begin, assign...)
6712The procedures and variables defined within the Verilog program 6712The procedures and variables defined within the Verilog program
6713will be completed at runtime and should not be added to this list.") 6713will be completed at runtime and should not be added to this list.")
@@ -6721,7 +6721,7 @@ will be completed at runtime and should not be added to this list.")
6721 "task" "endtask" "primitive" "endprimitive" 6721 "task" "endtask" "primitive" "endprimitive"
6722 ) 6722 )
6723 verilog-type-keywords) 6723 verilog-type-keywords)
6724 "*Keywords to complete when at first word of a line in declarative scope. 6724 "Keywords to complete when at first word of a line in declarative scope.
6725\(initial, always, begin, assign...) 6725\(initial, always, begin, assign...)
6726The procedures and variables defined within the Verilog program 6726The procedures and variables defined within the Verilog program
6727will be completed at runtime and should not be added to this list.") 6727will be completed at runtime and should not be added to this list.")
@@ -6732,28 +6732,28 @@ will be completed at runtime and should not be added to this list.")
6732 "endgenerate" "endinterface" "endpackage" "endspecify" "endtask" 6732 "endgenerate" "endinterface" "endpackage" "endspecify" "endtask"
6733 "for" "fork" "if" "join" "join_any" "join_none" "repeat" "return" 6733 "for" "fork" "if" "join" "join_any" "join_none" "repeat" "return"
6734 "while") 6734 "while")
6735 "*Keywords to complete when at first word of a line in behavioral scope. 6735 "Keywords to complete when at first word of a line in behavioral scope.
6736\(begin, if, then, else, for, fork...) 6736\(begin, if, then, else, for, fork...)
6737The procedures and variables defined within the Verilog program 6737The procedures and variables defined within the Verilog program
6738will be completed at runtime and should not be added to this list.") 6738will be completed at runtime and should not be added to this list.")
6739 6739
6740(defvar verilog-tf-keywords 6740(defvar verilog-tf-keywords
6741 '("begin" "break" "fork" "join" "join_any" "join_none" "case" "end" "endtask" "endfunction" "if" "else" "for" "while" "repeat") 6741 '("begin" "break" "fork" "join" "join_any" "join_none" "case" "end" "endtask" "endfunction" "if" "else" "for" "while" "repeat")
6742 "*Keywords to complete when at first word of a line in a task or function. 6742 "Keywords to complete when at first word of a line in a task or function.
6743\(begin, if, then, else, for, fork.) 6743\(begin, if, then, else, for, fork.)
6744The procedures and variables defined within the Verilog program 6744The procedures and variables defined within the Verilog program
6745will be completed at runtime and should not be added to this list.") 6745will be completed at runtime and should not be added to this list.")
6746 6746
6747(defvar verilog-case-keywords 6747(defvar verilog-case-keywords
6748 '("begin" "fork" "join" "join_any" "join_none" "case" "end" "endcase" "if" "else" "for" "repeat") 6748 '("begin" "fork" "join" "join_any" "join_none" "case" "end" "endcase" "if" "else" "for" "repeat")
6749 "*Keywords to complete when at first word of a line in case scope. 6749 "Keywords to complete when at first word of a line in case scope.
6750\(begin, if, then, else, for, fork...) 6750\(begin, if, then, else, for, fork...)
6751The procedures and variables defined within the Verilog program 6751The procedures and variables defined within the Verilog program
6752will be completed at runtime and should not be added to this list.") 6752will be completed at runtime and should not be added to this list.")
6753 6753
6754(defvar verilog-separator-keywords 6754(defvar verilog-separator-keywords
6755 '("else" "then" "begin") 6755 '("else" "then" "begin")
6756 "*Keywords to complete when NOT standing at the first word of a statement. 6756 "Keywords to complete when NOT standing at the first word of a statement.
6757\(else, then, begin...) 6757\(else, then, begin...)
6758Variables and function names defined within the Verilog program 6758Variables and function names defined within the Verilog program
6759will be completed at runtime and should not be added to this list.") 6759will be completed at runtime and should not be added to this list.")
@@ -6786,10 +6786,10 @@ will be completed at runtime and should not be added to this list.")
6786 ("tranif1" "inout" "inout") 6786 ("tranif1" "inout" "inout")
6787 ("xnor" "output") 6787 ("xnor" "output")
6788 ("xor" "output")) 6788 ("xor" "output"))
6789 "*Map of direction for each positional argument to each gate primitive.") 6789 "Map of direction for each positional argument to each gate primitive.")
6790 6790
6791(defvar verilog-gate-keywords (mapcar `car verilog-gate-ios) 6791(defvar verilog-gate-keywords (mapcar `car verilog-gate-ios)
6792 "*Keywords for gate primitives.") 6792 "Keywords for gate primitives.")
6793 6793
6794(defun verilog-string-diff (str1 str2) 6794(defun verilog-string-diff (str1 str2)
6795 "Return index of first letter where STR1 and STR2 differs." 6795 "Return index of first letter where STR1 and STR2 differs."
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index c9bf638bb59..9b7ee5d6aa0 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -198,7 +198,7 @@ Examples:
198 :group 'vhdl) 198 :group 'vhdl)
199 199
200(defcustom vhdl-indent-tabs-mode nil 200(defcustom vhdl-indent-tabs-mode nil
201 "*Non-nil means indentation can insert tabs. 201 "Non-nil means indentation can insert tabs.
202Overrides local variable `indent-tabs-mode'." 202Overrides local variable `indent-tabs-mode'."
203 :type 'boolean 203 :type 'boolean
204 :group 'vhdl-mode) 204 :group 'vhdl-mode)
@@ -322,7 +322,7 @@ Overrides local variable `indent-tabs-mode'."
322 ("^ *Compiling \"\\(.+\\)\" " 1) 322 ("^ *Compiling \"\\(.+\\)\" " 1)
323 nil) 323 nil)
324 ) 324 )
325 "*List of available VHDL compilers and their properties. 325 "List of available VHDL compilers and their properties.
326Each list entry specifies the following items for a compiler: 326Each list entry specifies the following items for a compiler:
327Compiler: 327Compiler:
328 Compiler name : name used in option `vhdl-compiler' to choose compiler 328 Compiler name : name used in option `vhdl-compiler' to choose compiler
@@ -429,7 +429,7 @@ NOTE: Activate new error and file message regexps and reflect the new setting
429 :group 'vhdl-compile) 429 :group 'vhdl-compile)
430 430
431(defcustom vhdl-compiler "ModelSim" 431(defcustom vhdl-compiler "ModelSim"
432 "*Specifies the VHDL compiler to be used for syntax analysis. 432 "Specifies the VHDL compiler to be used for syntax analysis.
433Select a compiler name from the ones defined in option `vhdl-compiler-alist'." 433Select a compiler name from the ones defined in option `vhdl-compiler-alist'."
434 :type (let ((alist vhdl-compiler-alist) list) 434 :type (let ((alist vhdl-compiler-alist) list)
435 (while alist 435 (while alist
@@ -439,7 +439,7 @@ Select a compiler name from the ones defined in option `vhdl-compiler-alist'."
439 :group 'vhdl-compile) 439 :group 'vhdl-compile)
440 440
441(defcustom vhdl-compile-use-local-error-regexp t 441(defcustom vhdl-compile-use-local-error-regexp t
442 "*Non-nil means use buffer-local `compilation-error-regexp-alist'. 442 "Non-nil means use buffer-local `compilation-error-regexp-alist'.
443In this case, only error message regexps for VHDL compilers are active if 443In this case, only error message regexps for VHDL compilers are active if
444compilation is started from a VHDL buffer. Otherwise, the error message 444compilation is started from a VHDL buffer. Otherwise, the error message
445regexps are appended to the predefined global regexps, and all regexps are 445regexps are appended to the predefined global regexps, and all regexps are
@@ -451,7 +451,7 @@ NOTE: Activate the new setting by restarting Emacs."
451 :group 'vhdl-compile) 451 :group 'vhdl-compile)
452 452
453(defcustom vhdl-makefile-generation-hook nil 453(defcustom vhdl-makefile-generation-hook nil
454 "*Functions to run at the end of Makefile generation. 454 "Functions to run at the end of Makefile generation.
455Allows to insert user specific parts into a Makefile. 455Allows to insert user specific parts into a Makefile.
456 456
457Example: 457Example:
@@ -462,7 +462,7 @@ Example:
462 :group 'vhdl-compile) 462 :group 'vhdl-compile)
463 463
464(defcustom vhdl-default-library "work" 464(defcustom vhdl-default-library "work"
465 "*Name of default library. 465 "Name of default library.
466Is overwritten by project settings if a project is active." 466Is overwritten by project settings if a project is active."
467 :type 'string 467 :type 'string
468 :group 'vhdl-compile) 468 :group 'vhdl-compile)
@@ -488,7 +488,7 @@ Is overwritten by project settings if a project is active."
488-- This is a multi-line project description 488-- This is a multi-line project description
489-- that can be used as a project dependent part of the file header. 489-- that can be used as a project dependent part of the file header.
490")) 490"))
491 "*List of projects and their properties. 491 "List of projects and their properties.
492 Name : name used in option `vhdl-project' to choose project 492 Name : name used in option `vhdl-project' to choose project
493 Title : title of project (single-line string) 493 Title : title of project (single-line string)
494 Default directory: default project directory (absolute path) 494 Default directory: default project directory (absolute path)
@@ -594,7 +594,7 @@ NOTE: Reflect the new setting in the choice list of option `vhdl-project'
594 :group 'vhdl-project) 594 :group 'vhdl-project)
595 595
596(defcustom vhdl-project nil 596(defcustom vhdl-project nil
597 "*Specifies the default for the current project. 597 "Specifies the default for the current project.
598Select a project name from the ones defined in option `vhdl-project-alist'. 598Select a project name from the ones defined in option `vhdl-project-alist'.
599Is used to determine the project title and description to be inserted in file 599Is used to determine the project title and description to be inserted in file
600headers and the source files/directories to be scanned in the hierarchy 600headers and the source files/directories to be scanned in the hierarchy
@@ -608,7 +608,7 @@ browser. The current project can also be changed temporarily in the menu."
608 :group 'vhdl-project) 608 :group 'vhdl-project)
609 609
610(defcustom vhdl-project-file-name '("\\1.prj") 610(defcustom vhdl-project-file-name '("\\1.prj")
611 "*List of file names/paths for importing/exporting project setups. 611 "List of file names/paths for importing/exporting project setups.
612\"\\1\" is replaced by the project name (SPC is replaced by `_'), \"\\2\" is 612\"\\1\" is replaced by the project name (SPC is replaced by `_'), \"\\2\" is
613replaced by the user name (allows to have user-specific project setups). 613replaced by the user name (allows to have user-specific project setups).
614The first entry is used as file name to import/export individual project 614The first entry is used as file name to import/export individual project
@@ -624,7 +624,7 @@ in global directories)."
624 :group 'vhdl-project) 624 :group 'vhdl-project)
625 625
626(defcustom vhdl-project-auto-load '(startup) 626(defcustom vhdl-project-auto-load '(startup)
627 "*Automatically load project setups from files. 627 "Automatically load project setups from files.
628All project setup files that match the file names specified in option 628All project setup files that match the file names specified in option
629`vhdl-project-file-name' are automatically loaded. The project of the 629`vhdl-project-file-name' are automatically loaded. The project of the
630\(alphabetically) last loaded setup of the first `vhdl-project-file-name' 630\(alphabetically) last loaded setup of the first `vhdl-project-file-name'
@@ -635,7 +635,7 @@ A project setup file can be obtained by exporting a project (see menu).
635 :group 'vhdl-project) 635 :group 'vhdl-project)
636 636
637(defcustom vhdl-project-sort t 637(defcustom vhdl-project-sort t
638 "*Non-nil means projects are displayed in alphabetical order." 638 "Non-nil means projects are displayed in alphabetical order."
639 :type 'boolean 639 :type 'boolean
640 :group 'vhdl-project) 640 :group 'vhdl-project)
641 641
@@ -648,7 +648,7 @@ A project setup file can be obtained by exporting a project (see menu).
648 :group 'vhdl-compose) 648 :group 'vhdl-compose)
649 649
650(defcustom vhdl-standard '(87 nil) 650(defcustom vhdl-standard '(87 nil)
651 "*VHDL standards used. 651 "VHDL standards used.
652Basic standard: 652Basic standard:
653 VHDL'87 : IEEE Std 1076-1987 653 VHDL'87 : IEEE Std 1076-1987
654 VHDL'93 : IEEE Std 1076-1993 654 VHDL'93 : IEEE Std 1076-1993
@@ -675,13 +675,13 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
675 :group 'vhdl-style) 675 :group 'vhdl-style)
676 676
677(defcustom vhdl-basic-offset 2 677(defcustom vhdl-basic-offset 2
678 "*Amount of basic offset used for indentation. 678 "Amount of basic offset used for indentation.
679This value is used by + and - symbols in `vhdl-offsets-alist'." 679This value is used by + and - symbols in `vhdl-offsets-alist'."
680 :type 'integer 680 :type 'integer
681 :group 'vhdl-style) 681 :group 'vhdl-style)
682 682
683(defcustom vhdl-upper-case-keywords nil 683(defcustom vhdl-upper-case-keywords nil
684 "*Non-nil means convert keywords to upper case. 684 "Non-nil means convert keywords to upper case.
685This is done when typed or expanded or by the fix case functions." 685This is done when typed or expanded or by the fix case functions."
686 :type 'boolean 686 :type 'boolean
687 :set (lambda (variable value) 687 :set (lambda (variable value)
@@ -689,7 +689,7 @@ This is done when typed or expanded or by the fix case functions."
689 :group 'vhdl-style) 689 :group 'vhdl-style)
690 690
691(defcustom vhdl-upper-case-types nil 691(defcustom vhdl-upper-case-types nil
692 "*Non-nil means convert standardized types to upper case. 692 "Non-nil means convert standardized types to upper case.
693This is done when expanded or by the fix case functions." 693This is done when expanded or by the fix case functions."
694 :type 'boolean 694 :type 'boolean
695 :set (lambda (variable value) 695 :set (lambda (variable value)
@@ -697,7 +697,7 @@ This is done when expanded or by the fix case functions."
697 :group 'vhdl-style) 697 :group 'vhdl-style)
698 698
699(defcustom vhdl-upper-case-attributes nil 699(defcustom vhdl-upper-case-attributes nil
700 "*Non-nil means convert standardized attributes to upper case. 700 "Non-nil means convert standardized attributes to upper case.
701This is done when expanded or by the fix case functions." 701This is done when expanded or by the fix case functions."
702 :type 'boolean 702 :type 'boolean
703 :set (lambda (variable value) 703 :set (lambda (variable value)
@@ -705,7 +705,7 @@ This is done when expanded or by the fix case functions."
705 :group 'vhdl-style) 705 :group 'vhdl-style)
706 706
707(defcustom vhdl-upper-case-enum-values nil 707(defcustom vhdl-upper-case-enum-values nil
708 "*Non-nil means convert standardized enumeration values to upper case. 708 "Non-nil means convert standardized enumeration values to upper case.
709This is done when expanded or by the fix case functions." 709This is done when expanded or by the fix case functions."
710 :type 'boolean 710 :type 'boolean
711 :set (lambda (variable value) 711 :set (lambda (variable value)
@@ -713,7 +713,7 @@ This is done when expanded or by the fix case functions."
713 :group 'vhdl-style) 713 :group 'vhdl-style)
714 714
715(defcustom vhdl-upper-case-constants t 715(defcustom vhdl-upper-case-constants t
716 "*Non-nil means convert standardized constants to upper case. 716 "Non-nil means convert standardized constants to upper case.
717This is done when expanded." 717This is done when expanded."
718 :type 'boolean 718 :type 'boolean
719 :set (lambda (variable value) 719 :set (lambda (variable value)
@@ -721,7 +721,7 @@ This is done when expanded."
721 :group 'vhdl-style) 721 :group 'vhdl-style)
722 722
723(defcustom vhdl-use-direct-instantiation 'standard 723(defcustom vhdl-use-direct-instantiation 'standard
724 "*Non-nil means use VHDL'93 direct component instantiation. 724 "Non-nil means use VHDL'93 direct component instantiation.
725 Never : never 725 Never : never
726 Standard: only in VHDL standards that allow it (VHDL'93 and higher) 726 Standard: only in VHDL standards that allow it (VHDL'93 and higher)
727 Always : always" 727 Always : always"
@@ -737,7 +737,7 @@ This is done when expanded."
737 737
738(defcustom vhdl-entity-file-name '(".*" . "\\&") 738(defcustom vhdl-entity-file-name '(".*" . "\\&")
739 (concat 739 (concat
740 "*Specifies how the entity file name is obtained. 740 "Specifies how the entity file name is obtained.
741The entity file name can be obtained by modifying the entity name (e.g. 741The entity file name can be obtained by modifying the entity name (e.g.
742attaching or stripping off a substring). The file extension is automatically 742attaching or stripping off a substring). The file extension is automatically
743taken from the file name of the current buffer." 743taken from the file name of the current buffer."
@@ -749,7 +749,7 @@ taken from the file name of the current buffer."
749 749
750(defcustom vhdl-architecture-file-name '("\\(.*\\) \\(.*\\)" . "\\1_\\2") 750(defcustom vhdl-architecture-file-name '("\\(.*\\) \\(.*\\)" . "\\1_\\2")
751 (concat 751 (concat
752 "*Specifies how the architecture file name is obtained. 752 "Specifies how the architecture file name is obtained.
753The architecture file name can be obtained by modifying the entity 753The architecture file name can be obtained by modifying the entity
754and/or architecture name (e.g. attaching or stripping off a substring). The 754and/or architecture name (e.g. attaching or stripping off a substring). The
755file extension is automatically taken from the file name of the current 755file extension is automatically taken from the file name of the current
@@ -764,7 +764,7 @@ access to both names (see default setting as example)."
764 764
765(defcustom vhdl-configuration-file-name '(".*" . "\\&") 765(defcustom vhdl-configuration-file-name '(".*" . "\\&")
766 (concat 766 (concat
767 "*Specifies how the configuration file name is obtained. 767 "Specifies how the configuration file name is obtained.
768The configuration file name can be obtained by modifying the configuration 768The configuration file name can be obtained by modifying the configuration
769name (e.g. attaching or stripping off a substring). The file extension is 769name (e.g. attaching or stripping off a substring). The file extension is
770automatically taken from the file name of the current buffer." 770automatically taken from the file name of the current buffer."
@@ -776,7 +776,7 @@ automatically taken from the file name of the current buffer."
776 776
777(defcustom vhdl-package-file-name '(".*" . "\\&") 777(defcustom vhdl-package-file-name '(".*" . "\\&")
778 (concat 778 (concat
779 "*Specifies how the package file name is obtained. 779 "Specifies how the package file name is obtained.
780The package file name can be obtained by modifying the package name (e.g. 780The package file name can be obtained by modifying the package name (e.g.
781attaching or stripping off a substring). The file extension is automatically 781attaching or stripping off a substring). The file extension is automatically
782taken from the file name of the current buffer. Package files can be created 782taken from the file name of the current buffer. Package files can be created
@@ -789,7 +789,7 @@ file name."
789 :group 'vhdl-compose) 789 :group 'vhdl-compose)
790 790
791(defcustom vhdl-file-name-case 'identity 791(defcustom vhdl-file-name-case 'identity
792 "*Specifies how to change case for obtaining file names. 792 "Specifies how to change case for obtaining file names.
793When deriving a file name from a VHDL unit name, case can be changed as 793When deriving a file name from a VHDL unit name, case can be changed as
794follows: 794follows:
795 As Is: case is not changed (taken as is) 795 As Is: case is not changed (taken as is)
@@ -809,7 +809,7 @@ follows:
809 :group 'vhdl) 809 :group 'vhdl)
810 810
811(defcustom vhdl-electric-keywords '(vhdl user) 811(defcustom vhdl-electric-keywords '(vhdl user)
812 "*Type of keywords for which electrification is enabled. 812 "Type of keywords for which electrification is enabled.
813 VHDL keywords: invoke built-in templates 813 VHDL keywords: invoke built-in templates
814 User keywords: invoke user models (see option `vhdl-model-alist')" 814 User keywords: invoke user models (see option `vhdl-model-alist')"
815 :type '(set (const :tag "VHDL keywords" vhdl) 815 :type '(set (const :tag "VHDL keywords" vhdl)
@@ -819,7 +819,7 @@ follows:
819 :group 'vhdl-template) 819 :group 'vhdl-template)
820 820
821(defcustom vhdl-optional-labels 'process 821(defcustom vhdl-optional-labels 'process
822 "*Constructs for which labels are to be queried. 822 "Constructs for which labels are to be queried.
823Template generators prompt for optional labels for: 823Template generators prompt for optional labels for:
824 None : no constructs 824 None : no constructs
825 Processes only: processes only (also procedurals in VHDL-AMS) 825 Processes only: processes only (also procedurals in VHDL-AMS)
@@ -830,7 +830,7 @@ Template generators prompt for optional labels for:
830 :group 'vhdl-template) 830 :group 'vhdl-template)
831 831
832(defcustom vhdl-insert-empty-lines 'unit 832(defcustom vhdl-insert-empty-lines 'unit
833 "*Specifies whether to insert empty lines in some templates. 833 "Specifies whether to insert empty lines in some templates.
834This improves readability of code. Empty lines are inserted in: 834This improves readability of code. Empty lines are inserted in:
835 None : no constructs 835 None : no constructs
836 Design units only: entities, architectures, configurations, packages only 836 Design units only: entities, architectures, configurations, packages only
@@ -845,7 +845,7 @@ Replaces option `vhdl-additional-empty-lines'."
845 :group 'vhdl-compose) 845 :group 'vhdl-compose)
846 846
847(defcustom vhdl-argument-list-indent nil 847(defcustom vhdl-argument-list-indent nil
848 "*Non-nil means indent argument lists relative to opening parenthesis. 848 "Non-nil means indent argument lists relative to opening parenthesis.
849That is, argument, association, and port lists start on the same line as the 849That is, argument, association, and port lists start on the same line as the
850opening parenthesis and subsequent lines are indented accordingly. 850opening parenthesis and subsequent lines are indented accordingly.
851Otherwise, lists start on a new line and are indented as normal code." 851Otherwise, lists start on a new line and are indented as normal code."
@@ -855,7 +855,7 @@ Otherwise, lists start on a new line and are indented as normal code."
855 :group 'vhdl-compose) 855 :group 'vhdl-compose)
856 856
857(defcustom vhdl-association-list-with-formals t 857(defcustom vhdl-association-list-with-formals t
858 "*Non-nil means write association lists with formal parameters. 858 "Non-nil means write association lists with formal parameters.
859Templates prompt for formal and actual parameters (ports/generics). 859Templates prompt for formal and actual parameters (ports/generics).
860When pasting component instantiations, formals are included. 860When pasting component instantiations, formals are included.
861If nil, only a list of actual parameters is entered." 861If nil, only a list of actual parameters is entered."
@@ -865,17 +865,17 @@ If nil, only a list of actual parameters is entered."
865 :group 'vhdl-compose) 865 :group 'vhdl-compose)
866 866
867(defcustom vhdl-conditions-in-parenthesis nil 867(defcustom vhdl-conditions-in-parenthesis nil
868 "*Non-nil means place parenthesis around condition expressions." 868 "Non-nil means place parenthesis around condition expressions."
869 :type 'boolean 869 :type 'boolean
870 :group 'vhdl-template) 870 :group 'vhdl-template)
871 871
872(defcustom vhdl-zero-string "'0'" 872(defcustom vhdl-zero-string "'0'"
873 "*String to use for a logic zero." 873 "String to use for a logic zero."
874 :type 'string 874 :type 'string
875 :group 'vhdl-template) 875 :group 'vhdl-template)
876 876
877(defcustom vhdl-one-string "'1'" 877(defcustom vhdl-one-string "'1'"
878 "*String to use for a logic one." 878 "String to use for a logic one."
879 :type 'string 879 :type 'string
880 :group 'vhdl-template) 880 :group 'vhdl-template)
881 881
@@ -906,7 +906,7 @@ If nil, only a list of actual parameters is entered."
906------------------------------------------------------------------------------- 906-------------------------------------------------------------------------------
907 907
908" 908"
909 "*String or file to insert as file header. 909 "String or file to insert as file header.
910If the string specifies an existing file name, the contents of the file is 910If the string specifies an existing file name, the contents of the file is
911inserted, otherwise the string itself is inserted as file header. 911inserted, otherwise the string itself is inserted as file header.
912Type `C-j' for newlines. 912Type `C-j' for newlines.
@@ -936,7 +936,7 @@ dependent part of the file header and can also contain the above keywords."
936 :group 'vhdl-header) 936 :group 'vhdl-header)
937 937
938(defcustom vhdl-file-footer "" 938(defcustom vhdl-file-footer ""
939 "*String or file to insert as file footer. 939 "String or file to insert as file footer.
940If the string specifies an existing file name, the contents of the file is 940If the string specifies an existing file name, the contents of the file is
941inserted, otherwise the string itself is inserted as file footer (i.e. at 941inserted, otherwise the string itself is inserted as file footer (i.e. at
942the end of the file). 942the end of the file).
@@ -946,7 +946,7 @@ The same keywords as in option `vhdl-file-header' can be used."
946 :group 'vhdl-header) 946 :group 'vhdl-header)
947 947
948(defcustom vhdl-company-name "" 948(defcustom vhdl-company-name ""
949 "*Name of company to insert in file header. 949 "Name of company to insert in file header.
950See option `vhdl-file-header'." 950See option `vhdl-file-header'."
951 :type 'string 951 :type 'string
952 :group 'vhdl-header) 952 :group 'vhdl-header)
@@ -955,14 +955,14 @@ See option `vhdl-file-header'."
955------------------------------------------------------------------------------- 955-------------------------------------------------------------------------------
956-- Copyright (c) <year> <company> 956-- Copyright (c) <year> <company>
957" 957"
958 "*Copyright string to insert in file header. 958 "Copyright string to insert in file header.
959Can be multi-line string (type `C-j' for newline) and contain other file 959Can be multi-line string (type `C-j' for newline) and contain other file
960header keywords (see option `vhdl-file-header')." 960header keywords (see option `vhdl-file-header')."
961 :type 'string 961 :type 'string
962 :group 'vhdl-header) 962 :group 'vhdl-header)
963 963
964(defcustom vhdl-platform-spec "" 964(defcustom vhdl-platform-spec ""
965 "*Specification of VHDL platform to insert in file header. 965 "Specification of VHDL platform to insert in file header.
966The platform specification should contain names and versions of the 966The platform specification should contain names and versions of the
967simulation and synthesis tools used. 967simulation and synthesis tools used.
968See option `vhdl-file-header'." 968See option `vhdl-file-header'."
@@ -970,7 +970,7 @@ See option `vhdl-file-header'."
970 :group 'vhdl-header) 970 :group 'vhdl-header)
971 971
972(defcustom vhdl-date-format "%Y-%m-%d" 972(defcustom vhdl-date-format "%Y-%m-%d"
973 "*Specifies the date format to use in the header. 973 "Specifies the date format to use in the header.
974This string is passed as argument to the command `format-time-string'. 974This string is passed as argument to the command `format-time-string'.
975For more information on format strings, see the documentation for the 975For more information on format strings, see the documentation for the
976`format-time-string' command (C-h f `format-time-string')." 976`format-time-string' command (C-h f `format-time-string')."
@@ -978,7 +978,7 @@ For more information on format strings, see the documentation for the
978 :group 'vhdl-header) 978 :group 'vhdl-header)
979 979
980(defcustom vhdl-modify-date-prefix-string "-- Last update: " 980(defcustom vhdl-modify-date-prefix-string "-- Last update: "
981 "*Prefix string of modification date in VHDL file header. 981 "Prefix string of modification date in VHDL file header.
982If actualization of the modification date is called (menu, 982If actualization of the modification date is called (menu,
983`\\[vhdl-template-modify]'), this string is searched and the rest 983`\\[vhdl-template-modify]'), this string is searched and the rest
984of the line replaced by the current date." 984of the line replaced by the current date."
@@ -986,7 +986,7 @@ of the line replaced by the current date."
986 :group 'vhdl-header) 986 :group 'vhdl-header)
987 987
988(defcustom vhdl-modify-date-on-saving t 988(defcustom vhdl-modify-date-on-saving t
989 "*Non-nil means update the modification date when the buffer is saved. 989 "Non-nil means update the modification date when the buffer is saved.
990Calls function `\\[vhdl-template-modify]'). 990Calls function `\\[vhdl-template-modify]').
991 991
992NOTE: Activate the new setting in a VHDL buffer by using the menu entry 992NOTE: Activate the new setting in a VHDL buffer by using the menu entry
@@ -1000,26 +1000,26 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1000 :group 'vhdl-template) 1000 :group 'vhdl-template)
1001 1001
1002(defcustom vhdl-reset-kind 'async 1002(defcustom vhdl-reset-kind 'async
1003 "*Specifies which kind of reset to use in sequential processes." 1003 "Specifies which kind of reset to use in sequential processes."
1004 :type '(choice (const :tag "None" none) 1004 :type '(choice (const :tag "None" none)
1005 (const :tag "Synchronous" sync) 1005 (const :tag "Synchronous" sync)
1006 (const :tag "Asynchronous" async)) 1006 (const :tag "Asynchronous" async))
1007 :group 'vhdl-sequential-process) 1007 :group 'vhdl-sequential-process)
1008 1008
1009(defcustom vhdl-reset-active-high nil 1009(defcustom vhdl-reset-active-high nil
1010 "*Non-nil means reset in sequential processes is active high. 1010 "Non-nil means reset in sequential processes is active high.
1011Otherwise, reset is active low." 1011Otherwise, reset is active low."
1012 :type 'boolean 1012 :type 'boolean
1013 :group 'vhdl-sequential-process) 1013 :group 'vhdl-sequential-process)
1014 1014
1015(defcustom vhdl-clock-rising-edge t 1015(defcustom vhdl-clock-rising-edge t
1016 "*Non-nil means rising edge of clock triggers sequential processes. 1016 "Non-nil means rising edge of clock triggers sequential processes.
1017Otherwise, falling edge triggers." 1017Otherwise, falling edge triggers."
1018 :type 'boolean 1018 :type 'boolean
1019 :group 'vhdl-sequential-process) 1019 :group 'vhdl-sequential-process)
1020 1020
1021(defcustom vhdl-clock-edge-condition 'standard 1021(defcustom vhdl-clock-edge-condition 'standard
1022 "*Syntax of the clock edge condition. 1022 "Syntax of the clock edge condition.
1023 Standard: \"clk'event and clk = '1'\" 1023 Standard: \"clk'event and clk = '1'\"
1024 Function: \"rising_edge(clk)\"" 1024 Function: \"rising_edge(clk)\""
1025 :type '(choice (const :tag "Standard" standard) 1025 :type '(choice (const :tag "Standard" standard)
@@ -1027,12 +1027,12 @@ Otherwise, falling edge triggers."
1027 :group 'vhdl-sequential-process) 1027 :group 'vhdl-sequential-process)
1028 1028
1029(defcustom vhdl-clock-name "" 1029(defcustom vhdl-clock-name ""
1030 "*Name of clock signal to use in templates." 1030 "Name of clock signal to use in templates."
1031 :type 'string 1031 :type 'string
1032 :group 'vhdl-sequential-process) 1032 :group 'vhdl-sequential-process)
1033 1033
1034(defcustom vhdl-reset-name "" 1034(defcustom vhdl-reset-name ""
1035 "*Name of reset signal to use in templates." 1035 "Name of reset signal to use in templates."
1036 :type 'string 1036 :type 'string
1037 :group 'vhdl-sequential-process) 1037 :group 'vhdl-sequential-process)
1038 1038
@@ -1054,7 +1054,7 @@ begin -- process <label>
1054 end if; 1054 end if;
1055end process <label>;" 1055end process <label>;"
1056 "e" "")) 1056 "e" ""))
1057 "*List of user models. 1057 "List of user models.
1058VHDL models (templates) can be specified by the user in this list. They can be 1058VHDL models (templates) can be specified by the user in this list. They can be
1059invoked from the menu, through key bindings (`C-c C-m ...'), or by keyword 1059invoked from the menu, through key bindings (`C-c C-m ...'), or by keyword
1060electrification (i.e. overriding existing or creating new keywords, see 1060electrification (i.e. overriding existing or creating new keywords, see
@@ -1103,7 +1103,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1103 1103
1104(defcustom vhdl-compose-architecture-name '(".*" . "str") 1104(defcustom vhdl-compose-architecture-name '(".*" . "str")
1105 (concat 1105 (concat
1106 "*Specifies how the component architecture name is obtained. 1106 "Specifies how the component architecture name is obtained.
1107The component architecture name can be obtained by modifying the entity name 1107The component architecture name can be obtained by modifying the entity name
1108\(e.g. attaching or stripping off a substring). 1108\(e.g. attaching or stripping off a substring).
1109If TO STRING is empty, the architecture name is queried." 1109If TO STRING is empty, the architecture name is queried."
@@ -1115,7 +1115,7 @@ If TO STRING is empty, the architecture name is queried."
1115(defcustom vhdl-compose-configuration-name 1115(defcustom vhdl-compose-configuration-name
1116 '("\\(.*\\) \\(.*\\)" . "\\1_\\2_cfg") 1116 '("\\(.*\\) \\(.*\\)" . "\\1_\\2_cfg")
1117 (concat 1117 (concat
1118 "*Specifies how the configuration name is obtained. 1118 "Specifies how the configuration name is obtained.
1119The configuration name can be obtained by modifying the entity and/or 1119The configuration name can be obtained by modifying the entity and/or
1120architecture name (e.g. attaching or stripping off a substring). The string 1120architecture name (e.g. attaching or stripping off a substring). The string
1121that is matched against the regexp is the concatenation of the entity and the 1121that is matched against the regexp is the concatenation of the entity and the
@@ -1129,7 +1129,7 @@ default setting as example)."
1129(defcustom vhdl-components-package-name 1129(defcustom vhdl-components-package-name
1130 '((".*" . "\\&_components") . "components") 1130 '((".*" . "\\&_components") . "components")
1131 (concat 1131 (concat
1132 "*Specifies how the name for the components package is obtained. 1132 "Specifies how the name for the components package is obtained.
1133The components package is a package containing all component declarations for 1133The components package is a package containing all component declarations for
1134the current design. Its name can be obtained by modifying the project name 1134the current design. Its name can be obtained by modifying the project name
1135\(e.g. attaching or stripping off a substring). If no project is defined, the 1135\(e.g. attaching or stripping off a substring). If no project is defined, the
@@ -1142,19 +1142,19 @@ DIRECTORY entry is chosen."
1142 :group 'vhdl-compose) 1142 :group 'vhdl-compose)
1143 1143
1144(defcustom vhdl-use-components-package nil 1144(defcustom vhdl-use-components-package nil
1145 "*Non-nil means use a separate components package for component declarations. 1145 "Non-nil means use a separate components package for component declarations.
1146Otherwise, component declarations are inserted and searched for in the 1146Otherwise, component declarations are inserted and searched for in the
1147architecture declarative parts." 1147architecture declarative parts."
1148 :type 'boolean 1148 :type 'boolean
1149 :group 'vhdl-compose) 1149 :group 'vhdl-compose)
1150 1150
1151(defcustom vhdl-compose-include-header t 1151(defcustom vhdl-compose-include-header t
1152 "*Non-nil means include a header in automatically generated files." 1152 "Non-nil means include a header in automatically generated files."
1153 :type 'boolean 1153 :type 'boolean
1154 :group 'vhdl-compose) 1154 :group 'vhdl-compose)
1155 1155
1156(defcustom vhdl-compose-create-files 'single 1156(defcustom vhdl-compose-create-files 'single
1157 "*Specifies whether new files should be created for the new component. 1157 "Specifies whether new files should be created for the new component.
1158The component's entity and architecture are inserted: 1158The component's entity and architecture are inserted:
1159 None : in current buffer 1159 None : in current buffer
1160 Single file : in new single file 1160 Single file : in new single file
@@ -1167,14 +1167,14 @@ The file names are obtained from variables `vhdl-entity-file-name' and
1167 :group 'vhdl-compose) 1167 :group 'vhdl-compose)
1168 1168
1169(defcustom vhdl-compose-configuration-create-file nil 1169(defcustom vhdl-compose-configuration-create-file nil
1170 "*Specifies whether a new file should be created for the configuration. 1170 "Specifies whether a new file should be created for the configuration.
1171If non-nil, a new file is created for the configuration. 1171If non-nil, a new file is created for the configuration.
1172The file name is obtained from variable `vhdl-configuration-file-name'." 1172The file name is obtained from variable `vhdl-configuration-file-name'."
1173 :type 'boolean 1173 :type 'boolean
1174 :group 'vhdl-compose) 1174 :group 'vhdl-compose)
1175 1175
1176(defcustom vhdl-compose-configuration-hierarchical t 1176(defcustom vhdl-compose-configuration-hierarchical t
1177 "*Specifies whether hierarchical configurations should be created. 1177 "Specifies whether hierarchical configurations should be created.
1178If non-nil, automatically created configurations are hierarchical and include 1178If non-nil, automatically created configurations are hierarchical and include
1179the whole hierarchy of subcomponents. Otherwise the configuration only 1179the whole hierarchy of subcomponents. Otherwise the configuration only
1180includes one level of subcomponents." 1180includes one level of subcomponents."
@@ -1182,7 +1182,7 @@ includes one level of subcomponents."
1182 :group 'vhdl-compose) 1182 :group 'vhdl-compose)
1183 1183
1184(defcustom vhdl-compose-configuration-use-subconfiguration t 1184(defcustom vhdl-compose-configuration-use-subconfiguration t
1185 "*Specifies whether subconfigurations should be used inside configurations. 1185 "Specifies whether subconfigurations should be used inside configurations.
1186If non-nil, automatically created configurations use configurations in binding 1186If non-nil, automatically created configurations use configurations in binding
1187indications for subcomponents, if such configurations exist. Otherwise, 1187indications for subcomponents, if such configurations exist. Otherwise,
1188entities are used in binding indications for subcomponents." 1188entities are used in binding indications for subcomponents."
@@ -1196,22 +1196,22 @@ entities are used in binding indications for subcomponents."
1196 :group 'vhdl-compose) 1196 :group 'vhdl-compose)
1197 1197
1198(defcustom vhdl-include-port-comments nil 1198(defcustom vhdl-include-port-comments nil
1199 "*Non-nil means include port comments when a port is pasted." 1199 "Non-nil means include port comments when a port is pasted."
1200 :type 'boolean 1200 :type 'boolean
1201 :group 'vhdl-port) 1201 :group 'vhdl-port)
1202 1202
1203(defcustom vhdl-include-direction-comments nil 1203(defcustom vhdl-include-direction-comments nil
1204 "*Non-nil means include port direction in instantiations as comments." 1204 "Non-nil means include port direction in instantiations as comments."
1205 :type 'boolean 1205 :type 'boolean
1206 :group 'vhdl-port) 1206 :group 'vhdl-port)
1207 1207
1208(defcustom vhdl-include-type-comments nil 1208(defcustom vhdl-include-type-comments nil
1209 "*Non-nil means include generic/port type in instantiations as comments." 1209 "Non-nil means include generic/port type in instantiations as comments."
1210 :type 'boolean 1210 :type 'boolean
1211 :group 'vhdl-port) 1211 :group 'vhdl-port)
1212 1212
1213(defcustom vhdl-include-group-comments 'never 1213(defcustom vhdl-include-group-comments 'never
1214 "*Specifies whether to include group comments and spacings. 1214 "Specifies whether to include group comments and spacings.
1215The comments and empty lines between groups of ports are pasted: 1215The comments and empty lines between groups of ports are pasted:
1216 Never : never 1216 Never : never
1217 Declarations: in entity/component/constant/signal declarations only 1217 Declarations: in entity/component/constant/signal declarations only
@@ -1223,7 +1223,7 @@ The comments and empty lines between groups of ports are pasted:
1223 1223
1224(defcustom vhdl-actual-port-name '(".*" . "\\&") 1224(defcustom vhdl-actual-port-name '(".*" . "\\&")
1225 (concat 1225 (concat
1226 "*Specifies how actual port names are obtained from formal port names. 1226 "Specifies how actual port names are obtained from formal port names.
1227In a component instantiation, an actual port name can be obtained by 1227In a component instantiation, an actual port name can be obtained by
1228modifying the formal port name (e.g. attaching or stripping off a substring)." 1228modifying the formal port name (e.g. attaching or stripping off a substring)."
1229 vhdl-name-doc-string) 1229 vhdl-name-doc-string)
@@ -1233,7 +1233,7 @@ modifying the formal port name (e.g. attaching or stripping off a substring)."
1233 1233
1234(defcustom vhdl-instance-name '(".*" . "\\&_%d") 1234(defcustom vhdl-instance-name '(".*" . "\\&_%d")
1235 (concat 1235 (concat
1236 "*Specifies how an instance name is obtained. 1236 "Specifies how an instance name is obtained.
1237The instance name can be obtained by modifying the name of the component to be 1237The instance name can be obtained by modifying the name of the component to be
1238instantiated (e.g. attaching or stripping off a substring). \"%d\" is replaced 1238instantiated (e.g. attaching or stripping off a substring). \"%d\" is replaced
1239by a unique number (starting with 1). 1239by a unique number (starting with 1).
@@ -1250,7 +1250,7 @@ If TO STRING is empty, the instance name is queried."
1250 1250
1251(defcustom vhdl-testbench-entity-name '(".*" . "\\&_tb") 1251(defcustom vhdl-testbench-entity-name '(".*" . "\\&_tb")
1252 (concat 1252 (concat
1253 "*Specifies how the testbench entity name is obtained. 1253 "Specifies how the testbench entity name is obtained.
1254The entity name of a testbench can be obtained by modifying the name of 1254The entity name of a testbench can be obtained by modifying the name of
1255the component to be tested (e.g. attaching or stripping off a substring)." 1255the component to be tested (e.g. attaching or stripping off a substring)."
1256 vhdl-name-doc-string) 1256 vhdl-name-doc-string)
@@ -1260,7 +1260,7 @@ the component to be tested (e.g. attaching or stripping off a substring)."
1260 1260
1261(defcustom vhdl-testbench-architecture-name '(".*" . "") 1261(defcustom vhdl-testbench-architecture-name '(".*" . "")
1262 (concat 1262 (concat
1263 "*Specifies how the testbench architecture name is obtained. 1263 "Specifies how the testbench architecture name is obtained.
1264The testbench architecture name can be obtained by modifying the name of 1264The testbench architecture name can be obtained by modifying the name of
1265the component to be tested (e.g. attaching or stripping off a substring). 1265the component to be tested (e.g. attaching or stripping off a substring).
1266If TO STRING is empty, the architecture name is queried." 1266If TO STRING is empty, the architecture name is queried."
@@ -1271,7 +1271,7 @@ If TO STRING is empty, the architecture name is queried."
1271 1271
1272(defcustom vhdl-testbench-configuration-name vhdl-compose-configuration-name 1272(defcustom vhdl-testbench-configuration-name vhdl-compose-configuration-name
1273 (concat 1273 (concat
1274 "*Specifies how the testbench configuration name is obtained. 1274 "Specifies how the testbench configuration name is obtained.
1275The configuration name of a testbench can be obtained by modifying the entity 1275The configuration name of a testbench can be obtained by modifying the entity
1276and/or architecture name (e.g. attaching or stripping off a substring). The 1276and/or architecture name (e.g. attaching or stripping off a substring). The
1277string that is matched against the regexp is the concatenation of the entity 1277string that is matched against the regexp is the concatenation of the entity
@@ -1284,7 +1284,7 @@ names (see default setting as example)."
1284 1284
1285(defcustom vhdl-testbench-dut-name '(".*" . "DUT") 1285(defcustom vhdl-testbench-dut-name '(".*" . "DUT")
1286 (concat 1286 (concat
1287 "*Specifies how a DUT instance name is obtained. 1287 "Specifies how a DUT instance name is obtained.
1288The design-under-test instance name (i.e. the component instantiated in the 1288The design-under-test instance name (i.e. the component instantiated in the
1289testbench) can be obtained by modifying the component name (e.g. attaching 1289testbench) can be obtained by modifying the component name (e.g. attaching
1290or stripping off a substring)." 1290or stripping off a substring)."
@@ -1294,7 +1294,7 @@ or stripping off a substring)."
1294 :group 'vhdl-testbench) 1294 :group 'vhdl-testbench)
1295 1295
1296(defcustom vhdl-testbench-include-header t 1296(defcustom vhdl-testbench-include-header t
1297 "*Non-nil means include a header in automatically generated files." 1297 "Non-nil means include a header in automatically generated files."
1298 :type 'boolean 1298 :type 'boolean
1299 :group 'vhdl-testbench) 1299 :group 'vhdl-testbench)
1300 1300
@@ -1302,7 +1302,7 @@ or stripping off a substring)."
1302 -- clock 1302 -- clock
1303 signal Clk : std_logic := '1'; 1303 signal Clk : std_logic := '1';
1304" 1304"
1305 "*String or file to be inserted in the testbench declarative part. 1305 "String or file to be inserted in the testbench declarative part.
1306If the string specifies an existing file name, the contents of the file is 1306If the string specifies an existing file name, the contents of the file is
1307inserted, otherwise the string itself is inserted in the testbench 1307inserted, otherwise the string itself is inserted in the testbench
1308architecture before the BEGIN keyword. 1308architecture before the BEGIN keyword.
@@ -1322,7 +1322,7 @@ Type `C-j' for newlines."
1322 wait until Clk = '1'; 1322 wait until Clk = '1';
1323 end process WaveGen_Proc; 1323 end process WaveGen_Proc;
1324" 1324"
1325 "*String or file to be inserted in the testbench statement part. 1325 "String or file to be inserted in the testbench statement part.
1326If the string specifies an existing file name, the contents of the file is 1326If the string specifies an existing file name, the contents of the file is
1327inserted, otherwise the string itself is inserted in the testbench 1327inserted, otherwise the string itself is inserted in the testbench
1328architecture before the END keyword. 1328architecture before the END keyword.
@@ -1331,22 +1331,22 @@ Type `C-j' for newlines."
1331 :group 'vhdl-testbench) 1331 :group 'vhdl-testbench)
1332 1332
1333(defcustom vhdl-testbench-initialize-signals nil 1333(defcustom vhdl-testbench-initialize-signals nil
1334 "*Non-nil means initialize signals with `0' when declared in testbench." 1334 "Non-nil means initialize signals with `0' when declared in testbench."
1335 :type 'boolean 1335 :type 'boolean
1336 :group 'vhdl-testbench) 1336 :group 'vhdl-testbench)
1337 1337
1338(defcustom vhdl-testbench-include-library t 1338(defcustom vhdl-testbench-include-library t
1339 "*Non-nil means a library/use clause for std_logic_1164 is included." 1339 "Non-nil means a library/use clause for std_logic_1164 is included."
1340 :type 'boolean 1340 :type 'boolean
1341 :group 'vhdl-testbench) 1341 :group 'vhdl-testbench)
1342 1342
1343(defcustom vhdl-testbench-include-configuration t 1343(defcustom vhdl-testbench-include-configuration t
1344 "*Non-nil means a testbench configuration is attached at the end." 1344 "Non-nil means a testbench configuration is attached at the end."
1345 :type 'boolean 1345 :type 'boolean
1346 :group 'vhdl-testbench) 1346 :group 'vhdl-testbench)
1347 1347
1348(defcustom vhdl-testbench-create-files 'single 1348(defcustom vhdl-testbench-create-files 'single
1349 "*Specifies whether new files should be created for the testbench. 1349 "Specifies whether new files should be created for the testbench.
1350testbench entity and architecture are inserted: 1350testbench entity and architecture are inserted:
1351 None : in current buffer 1351 None : in current buffer
1352 Single file : in new single file 1352 Single file : in new single file
@@ -1360,7 +1360,7 @@ and `vhdl-testbench-architecture-file-name'."
1360 1360
1361(defcustom vhdl-testbench-entity-file-name vhdl-entity-file-name 1361(defcustom vhdl-testbench-entity-file-name vhdl-entity-file-name
1362 (concat 1362 (concat
1363 "*Specifies how the testbench entity file name is obtained. 1363 "Specifies how the testbench entity file name is obtained.
1364The entity file name can be obtained by modifying the testbench entity name 1364The entity file name can be obtained by modifying the testbench entity name
1365\(e.g. attaching or stripping off a substring). The file extension is 1365\(e.g. attaching or stripping off a substring). The file extension is
1366automatically taken from the file name of the current buffer. Testbench 1366automatically taken from the file name of the current buffer. Testbench
@@ -1373,7 +1373,7 @@ absolute path to the file name."
1373 1373
1374(defcustom vhdl-testbench-architecture-file-name vhdl-architecture-file-name 1374(defcustom vhdl-testbench-architecture-file-name vhdl-architecture-file-name
1375 (concat 1375 (concat
1376 "*Specifies how the testbench architecture file name is obtained. 1376 "Specifies how the testbench architecture file name is obtained.
1377The architecture file name can be obtained by modifying the testbench entity 1377The architecture file name can be obtained by modifying the testbench entity
1378and/or architecture name (e.g. attaching or stripping off a substring). The 1378and/or architecture name (e.g. attaching or stripping off a substring). The
1379string that is matched against the regexp is the concatenation of the entity 1379string that is matched against the regexp is the concatenation of the entity
@@ -1392,17 +1392,17 @@ name."
1392 :group 'vhdl) 1392 :group 'vhdl)
1393 1393
1394(defcustom vhdl-self-insert-comments t 1394(defcustom vhdl-self-insert-comments t
1395 "*Non-nil means various templates automatically insert help comments." 1395 "Non-nil means various templates automatically insert help comments."
1396 :type 'boolean 1396 :type 'boolean
1397 :group 'vhdl-comment) 1397 :group 'vhdl-comment)
1398 1398
1399(defcustom vhdl-prompt-for-comments t 1399(defcustom vhdl-prompt-for-comments t
1400 "*Non-nil means various templates prompt for user definable comments." 1400 "Non-nil means various templates prompt for user definable comments."
1401 :type 'boolean 1401 :type 'boolean
1402 :group 'vhdl-comment) 1402 :group 'vhdl-comment)
1403 1403
1404(defcustom vhdl-inline-comment-column 40 1404(defcustom vhdl-inline-comment-column 40
1405 "*Column to indent and align inline comments to. 1405 "Column to indent and align inline comments to.
1406Overrides local option `comment-column'. 1406Overrides local option `comment-column'.
1407 1407
1408NOTE: Activate the new setting in a VHDL buffer by using the menu entry 1408NOTE: Activate the new setting in a VHDL buffer by using the menu entry
@@ -1411,7 +1411,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1411 :group 'vhdl-comment) 1411 :group 'vhdl-comment)
1412 1412
1413(defcustom vhdl-end-comment-column 79 1413(defcustom vhdl-end-comment-column 79
1414 "*End of comment column. 1414 "End of comment column.
1415Comments that exceed this column number are wrapped. 1415Comments that exceed this column number are wrapped.
1416 1416
1417NOTE: Activate the new setting in a VHDL buffer by using the menu entry 1417NOTE: Activate the new setting in a VHDL buffer by using the menu entry
@@ -1427,19 +1427,19 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1427 :group 'vhdl) 1427 :group 'vhdl)
1428 1428
1429(defcustom vhdl-auto-align t 1429(defcustom vhdl-auto-align t
1430 "*Non-nil means align some templates automatically after generation." 1430 "Non-nil means align some templates automatically after generation."
1431 :type 'boolean 1431 :type 'boolean
1432 :group 'vhdl-align) 1432 :group 'vhdl-align)
1433 1433
1434(defcustom vhdl-align-groups t 1434(defcustom vhdl-align-groups t
1435 "*Non-nil means align groups of code lines separately. 1435 "Non-nil means align groups of code lines separately.
1436A group of code lines is a region of consecutive lines between two lines that 1436A group of code lines is a region of consecutive lines between two lines that
1437match the regexp in option `vhdl-align-group-separate'." 1437match the regexp in option `vhdl-align-group-separate'."
1438 :type 'boolean 1438 :type 'boolean
1439 :group 'vhdl-align) 1439 :group 'vhdl-align)
1440 1440
1441(defcustom vhdl-align-group-separate "^\\s-*$" 1441(defcustom vhdl-align-group-separate "^\\s-*$"
1442 "*Regexp for matching a line that separates groups of lines for alignment. 1442 "Regexp for matching a line that separates groups of lines for alignment.
1443Examples: 1443Examples:
1444 \"^\\s-*$\": matches an empty line 1444 \"^\\s-*$\": matches an empty line
1445 \"^\\s-*\\(--.*\\)?$\": matches an empty line or a comment-only line" 1445 \"^\\s-*\\(--.*\\)?$\": matches an empty line or a comment-only line"
@@ -1447,7 +1447,7 @@ Examples:
1447 :group 'vhdl-align) 1447 :group 'vhdl-align)
1448 1448
1449(defcustom vhdl-align-same-indent t 1449(defcustom vhdl-align-same-indent t
1450 "*Non-nil means align blocks with same indent separately. 1450 "Non-nil means align blocks with same indent separately.
1451When a region or the entire buffer is aligned, the code is divided into 1451When a region or the entire buffer is aligned, the code is divided into
1452blocks of same indent which are aligned separately (except for argument/port 1452blocks of same indent which are aligned separately (except for argument/port
1453lists). This gives nicer alignment in most cases. 1453lists). This gives nicer alignment in most cases.
@@ -1461,7 +1461,7 @@ Option `vhdl-align-groups' still applies within these blocks."
1461 :group 'vhdl) 1461 :group 'vhdl)
1462 1462
1463(defcustom vhdl-highlight-keywords t 1463(defcustom vhdl-highlight-keywords t
1464 "*Non-nil means highlight VHDL keywords and other standardized words. 1464 "Non-nil means highlight VHDL keywords and other standardized words.
1465The following faces are used: 1465The following faces are used:
1466 `font-lock-keyword-face' : keywords 1466 `font-lock-keyword-face' : keywords
1467 `font-lock-type-face' : standardized types 1467 `font-lock-type-face' : standardized types
@@ -1477,7 +1477,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1477 :group 'vhdl-highlight) 1477 :group 'vhdl-highlight)
1478 1478
1479(defcustom vhdl-highlight-names t 1479(defcustom vhdl-highlight-names t
1480 "*Non-nil means highlight declaration names and construct labels. 1480 "Non-nil means highlight declaration names and construct labels.
1481The following faces are used: 1481The following faces are used:
1482 `font-lock-function-name-face' : names in declarations of units, 1482 `font-lock-function-name-face' : names in declarations of units,
1483 subprograms, components, as well as labels of VHDL constructs 1483 subprograms, components, as well as labels of VHDL constructs
@@ -1494,7 +1494,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1494 :group 'vhdl-highlight) 1494 :group 'vhdl-highlight)
1495 1495
1496(defcustom vhdl-highlight-special-words nil 1496(defcustom vhdl-highlight-special-words nil
1497 "*Non-nil means highlight words with special syntax. 1497 "Non-nil means highlight words with special syntax.
1498The words with syntax and color specified in option `vhdl-special-syntax-alist' 1498The words with syntax and color specified in option `vhdl-special-syntax-alist'
1499are highlighted accordingly. 1499are highlighted accordingly.
1500Can be used for visual support of naming conventions. 1500Can be used for visual support of naming conventions.
@@ -1507,7 +1507,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1507 :group 'vhdl-highlight) 1507 :group 'vhdl-highlight)
1508 1508
1509(defcustom vhdl-highlight-forbidden-words nil 1509(defcustom vhdl-highlight-forbidden-words nil
1510 "*Non-nil means highlight forbidden words. 1510 "Non-nil means highlight forbidden words.
1511The reserved words specified in option `vhdl-forbidden-words' or having the 1511The reserved words specified in option `vhdl-forbidden-words' or having the
1512syntax specified in option `vhdl-forbidden-syntax' are highlighted in a 1512syntax specified in option `vhdl-forbidden-syntax' are highlighted in a
1513warning color (face `vhdl-font-lock-reserved-words-face') to indicate not to 1513warning color (face `vhdl-font-lock-reserved-words-face') to indicate not to
@@ -1522,7 +1522,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1522 :group 'vhdl-highlight) 1522 :group 'vhdl-highlight)
1523 1523
1524(defcustom vhdl-highlight-verilog-keywords nil 1524(defcustom vhdl-highlight-verilog-keywords nil
1525 "*Non-nil means highlight Verilog keywords as reserved words. 1525 "Non-nil means highlight Verilog keywords as reserved words.
1526Verilog keywords are highlighted in a warning color (face 1526Verilog keywords are highlighted in a warning color (face
1527`vhdl-font-lock-reserved-words-face') to indicate not to use them. 1527`vhdl-font-lock-reserved-words-face') to indicate not to use them.
1528 1528
@@ -1535,7 +1535,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1535 :group 'vhdl-highlight) 1535 :group 'vhdl-highlight)
1536 1536
1537(defcustom vhdl-highlight-translate-off nil 1537(defcustom vhdl-highlight-translate-off nil
1538 "*Non-nil means background-highlight code excluded from translation. 1538 "Non-nil means background-highlight code excluded from translation.
1539That is, all code between \"-- pragma translate_off\" and 1539That is, all code between \"-- pragma translate_off\" and
1540\"-- pragma translate_on\" is highlighted using a different background color 1540\"-- pragma translate_on\" is highlighted using a different background color
1541\(face `vhdl-font-lock-translate-off-face'). 1541\(face `vhdl-font-lock-translate-off-face').
@@ -1549,7 +1549,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1549 :group 'vhdl-highlight) 1549 :group 'vhdl-highlight)
1550 1550
1551(defcustom vhdl-highlight-case-sensitive nil 1551(defcustom vhdl-highlight-case-sensitive nil
1552 "*Non-nil means consider case for highlighting. 1552 "Non-nil means consider case for highlighting.
1553Possible trade-off: 1553Possible trade-off:
1554 non-nil also upper-case VHDL words are highlighted, but case of words with 1554 non-nil also upper-case VHDL words are highlighted, but case of words with
1555 special syntax is not considered 1555 special syntax is not considered
@@ -1566,7 +1566,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1566 '(("generic/constant" "\\w+_[cg]" "Gold3" "BurlyWood1") 1566 '(("generic/constant" "\\w+_[cg]" "Gold3" "BurlyWood1")
1567 ("type" "\\w+_t" "ForestGreen" "PaleGreen") 1567 ("type" "\\w+_t" "ForestGreen" "PaleGreen")
1568 ("variable" "\\w+_v" "Grey50" "Grey80")) 1568 ("variable" "\\w+_v" "Grey50" "Grey80"))
1569 "*List of special syntax to be highlighted. 1569 "List of special syntax to be highlighted.
1570If option `vhdl-highlight-special-words' is non-nil, words with the specified 1570If option `vhdl-highlight-special-words' is non-nil, words with the specified
1571syntax (as regular expression) are highlighted in the corresponding color. 1571syntax (as regular expression) are highlighted in the corresponding color.
1572 1572
@@ -1599,7 +1599,7 @@ NOTE: Activate a changed regexp in a VHDL buffer by re-fontifying it (menu
1599 :group 'vhdl-highlight) 1599 :group 'vhdl-highlight)
1600 1600
1601(defcustom vhdl-forbidden-words '() 1601(defcustom vhdl-forbidden-words '()
1602 "*List of forbidden words to be highlighted. 1602 "List of forbidden words to be highlighted.
1603If option `vhdl-highlight-forbidden-words' is non-nil, these reserved 1603If option `vhdl-highlight-forbidden-words' is non-nil, these reserved
1604words are highlighted in a warning color to indicate not to use them. 1604words are highlighted in a warning color to indicate not to use them.
1605 1605
@@ -1612,7 +1612,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1612 :group 'vhdl-highlight) 1612 :group 'vhdl-highlight)
1613 1613
1614(defcustom vhdl-forbidden-syntax "" 1614(defcustom vhdl-forbidden-syntax ""
1615 "*Syntax of forbidden words to be highlighted. 1615 "Syntax of forbidden words to be highlighted.
1616If option `vhdl-highlight-forbidden-words' is non-nil, words with this 1616If option `vhdl-highlight-forbidden-words' is non-nil, words with this
1617syntax are highlighted in a warning color to indicate not to use them. 1617syntax are highlighted in a warning color to indicate not to use them.
1618Can be used to highlight too long identifiers (e.g. \"\\w\\w\\w\\w\\w\\w\\w\\w\\w\\w+\" 1618Can be used to highlight too long identifiers (e.g. \"\\w\\w\\w\\w\\w\\w\\w\\w\\w\\w+\"
@@ -1627,7 +1627,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1627 :group 'vhdl-highlight) 1627 :group 'vhdl-highlight)
1628 1628
1629(defcustom vhdl-directive-keywords '("pragma" "synopsys") 1629(defcustom vhdl-directive-keywords '("pragma" "synopsys")
1630 "*List of compiler directive keywords recognized for highlighting. 1630 "List of compiler directive keywords recognized for highlighting.
1631 1631
1632NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu 1632NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1633 entry \"Fontify Buffer\")." 1633 entry \"Fontify Buffer\")."
@@ -1643,13 +1643,13 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu
1643 :group 'vhdl) 1643 :group 'vhdl)
1644 1644
1645(defcustom vhdl-speedbar-auto-open nil 1645(defcustom vhdl-speedbar-auto-open nil
1646 "*Non-nil means automatically open speedbar at startup. 1646 "Non-nil means automatically open speedbar at startup.
1647Alternatively, the speedbar can be opened from the VHDL menu." 1647Alternatively, the speedbar can be opened from the VHDL menu."
1648 :type 'boolean 1648 :type 'boolean
1649 :group 'vhdl-speedbar) 1649 :group 'vhdl-speedbar)
1650 1650
1651(defcustom vhdl-speedbar-display-mode 'files 1651(defcustom vhdl-speedbar-display-mode 'files
1652 "*Specifies the default displaying mode when opening speedbar. 1652 "Specifies the default displaying mode when opening speedbar.
1653Alternatively, the displaying mode can be selected from the speedbar menu or 1653Alternatively, the displaying mode can be selected from the speedbar menu or
1654by typing `f' (files), `h' (directory hierarchy) or `H' (project hierarchy)." 1654by typing `f' (files), `h' (directory hierarchy) or `H' (project hierarchy)."
1655 :type '(choice (const :tag "Files" files) 1655 :type '(choice (const :tag "Files" files)
@@ -1658,7 +1658,7 @@ by typing `f' (files), `h' (directory hierarchy) or `H' (project hierarchy)."
1658 :group 'vhdl-speedbar) 1658 :group 'vhdl-speedbar)
1659 1659
1660(defcustom vhdl-speedbar-scan-limit '(10000000 (1000000 50)) 1660(defcustom vhdl-speedbar-scan-limit '(10000000 (1000000 50))
1661 "*Limits scanning of large files and netlists. 1661 "Limits scanning of large files and netlists.
1662Design units: maximum file size to scan for design units 1662Design units: maximum file size to scan for design units
1663Hierarchy (instances of subcomponents): 1663Hierarchy (instances of subcomponents):
1664 File size: maximum file size to scan for instances (in bytes) 1664 File size: maximum file size to scan for instances (in bytes)
@@ -1685,18 +1685,18 @@ prevent the scanning of large netlists."
1685 :group 'vhdl-speedbar) 1685 :group 'vhdl-speedbar)
1686 1686
1687(defcustom vhdl-speedbar-jump-to-unit t 1687(defcustom vhdl-speedbar-jump-to-unit t
1688 "*Non-nil means jump to the design unit code when opened in a buffer. 1688 "Non-nil means jump to the design unit code when opened in a buffer.
1689The buffer cursor position is left unchanged otherwise." 1689The buffer cursor position is left unchanged otherwise."
1690 :type 'boolean 1690 :type 'boolean
1691 :group 'vhdl-speedbar) 1691 :group 'vhdl-speedbar)
1692 1692
1693(defcustom vhdl-speedbar-update-on-saving t 1693(defcustom vhdl-speedbar-update-on-saving t
1694 "*Automatically update design hierarchy when buffer is saved." 1694 "Automatically update design hierarchy when buffer is saved."
1695 :type 'boolean 1695 :type 'boolean
1696 :group 'vhdl-speedbar) 1696 :group 'vhdl-speedbar)
1697 1697
1698(defcustom vhdl-speedbar-save-cache '(hierarchy display) 1698(defcustom vhdl-speedbar-save-cache '(hierarchy display)
1699 "*Automatically save modified hierarchy caches when exiting Emacs. 1699 "Automatically save modified hierarchy caches when exiting Emacs.
1700 Hierarchy: design hierarchy information 1700 Hierarchy: design hierarchy information
1701 Display: displaying information (which design units to expand)" 1701 Display: displaying information (which design units to expand)"
1702 :type '(set (const :tag "Hierarchy" hierarchy) 1702 :type '(set (const :tag "Hierarchy" hierarchy)
@@ -1704,7 +1704,7 @@ The buffer cursor position is left unchanged otherwise."
1704 :group 'vhdl-speedbar) 1704 :group 'vhdl-speedbar)
1705 1705
1706(defcustom vhdl-speedbar-cache-file-name ".emacs-vhdl-cache-\\1-\\2" 1706(defcustom vhdl-speedbar-cache-file-name ".emacs-vhdl-cache-\\1-\\2"
1707 "*Name of file for saving hierarchy cache. 1707 "Name of file for saving hierarchy cache.
1708\"\\1\" is replaced by the project name if a project is specified, 1708\"\\1\" is replaced by the project name if a project is specified,
1709\"directory\" otherwise. \"\\2\" is replaced by the user name (allows for 1709\"directory\" otherwise. \"\\2\" is replaced by the user name (allows for
1710different users to have cache files in the same directory). Can also have 1710different users to have cache files in the same directory). Can also have
@@ -1718,20 +1718,20 @@ an absolute path (i.e. all caches can be stored in one global directory)."
1718 :group 'vhdl) 1718 :group 'vhdl)
1719 1719
1720(defcustom vhdl-index-menu nil 1720(defcustom vhdl-index-menu nil
1721 "*Non-nil means add an index menu for a source file when loading. 1721 "Non-nil means add an index menu for a source file when loading.
1722Alternatively, the speedbar can be used. Note that the index menu scans a file 1722Alternatively, the speedbar can be used. Note that the index menu scans a file
1723when it is opened, while speedbar only scans the file upon request." 1723when it is opened, while speedbar only scans the file upon request."
1724 :type 'boolean 1724 :type 'boolean
1725 :group 'vhdl-menu) 1725 :group 'vhdl-menu)
1726 1726
1727(defcustom vhdl-source-file-menu nil 1727(defcustom vhdl-source-file-menu nil
1728 "*Non-nil means add a menu of all source files in current directory. 1728 "Non-nil means add a menu of all source files in current directory.
1729Alternatively, the speedbar can be used." 1729Alternatively, the speedbar can be used."
1730 :type 'boolean 1730 :type 'boolean
1731 :group 'vhdl-menu) 1731 :group 'vhdl-menu)
1732 1732
1733(defcustom vhdl-hideshow-menu nil 1733(defcustom vhdl-hideshow-menu nil
1734 "*Non-nil means add hideshow menu and functionality at startup. 1734 "Non-nil means add hideshow menu and functionality at startup.
1735Hideshow can also be enabled from the VHDL Mode menu. 1735Hideshow can also be enabled from the VHDL Mode menu.
1736Hideshow allows hiding code of various VHDL constructs. 1736Hideshow allows hiding code of various VHDL constructs.
1737 1737
@@ -1741,7 +1741,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1741 :group 'vhdl-menu) 1741 :group 'vhdl-menu)
1742 1742
1743(defcustom vhdl-hide-all-init nil 1743(defcustom vhdl-hide-all-init nil
1744 "*Non-nil means hide all design units initially after a file is loaded." 1744 "Non-nil means hide all design units initially after a file is loaded."
1745 :type 'boolean 1745 :type 'boolean
1746 :group 'vhdl-menu) 1746 :group 'vhdl-menu)
1747 1747
@@ -1751,7 +1751,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1751 :group 'vhdl) 1751 :group 'vhdl)
1752 1752
1753(defcustom vhdl-print-two-column t 1753(defcustom vhdl-print-two-column t
1754 "*Non-nil means print code in two columns and landscape format. 1754 "Non-nil means print code in two columns and landscape format.
1755Adjusts settings in a way that PostScript printing (\"File\" menu, `ps-print') 1755Adjusts settings in a way that PostScript printing (\"File\" menu, `ps-print')
1756prints VHDL files in a nice two-column landscape style. 1756prints VHDL files in a nice two-column landscape style.
1757 1757
@@ -1761,7 +1761,7 @@ NOTE: Activate the new setting by restarting Emacs.
1761 :group 'vhdl-print) 1761 :group 'vhdl-print)
1762 1762
1763(defcustom vhdl-print-customize-faces t 1763(defcustom vhdl-print-customize-faces t
1764 "*Non-nil means use an optimized set of faces for PostScript printing. 1764 "Non-nil means use an optimized set of faces for PostScript printing.
1765 1765
1766NOTE: Activate the new setting by restarting Emacs. 1766NOTE: Activate the new setting by restarting Emacs.
1767 Overrides `ps-print' settings locally." 1767 Overrides `ps-print' settings locally."
@@ -1774,7 +1774,7 @@ NOTE: Activate the new setting by restarting Emacs.
1774 :group 'vhdl) 1774 :group 'vhdl)
1775 1775
1776(defcustom vhdl-intelligent-tab t 1776(defcustom vhdl-intelligent-tab t
1777 "*Non-nil means `TAB' does indentation, word completion and tab insertion. 1777 "Non-nil means `TAB' does indentation, word completion and tab insertion.
1778That is, if preceding character is part of a word then complete word, 1778That is, if preceding character is part of a word then complete word,
1779else if not at beginning of line then insert tab, 1779else if not at beginning of line then insert tab,
1780else if last command was a `TAB' or `RET' then dedent one step, 1780else if last command was a `TAB' or `RET' then dedent one step,
@@ -1788,28 +1788,28 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1788 :group 'vhdl-misc) 1788 :group 'vhdl-misc)
1789 1789
1790(defcustom vhdl-indent-syntax-based t 1790(defcustom vhdl-indent-syntax-based t
1791 "*Non-nil means indent lines of code based on their syntactic context. 1791 "Non-nil means indent lines of code based on their syntactic context.
1792Otherwise, a line is indented like the previous nonblank line. This can be 1792Otherwise, a line is indented like the previous nonblank line. This can be
1793useful in large files where syntax-based indentation gets very slow." 1793useful in large files where syntax-based indentation gets very slow."
1794 :type 'boolean 1794 :type 'boolean
1795 :group 'vhdl-misc) 1795 :group 'vhdl-misc)
1796 1796
1797(defcustom vhdl-word-completion-case-sensitive nil 1797(defcustom vhdl-word-completion-case-sensitive nil
1798 "*Non-nil means word completion using `TAB' is case sensitive. 1798 "Non-nil means word completion using `TAB' is case sensitive.
1799That is, `TAB' completes words that start with the same letters and case. 1799That is, `TAB' completes words that start with the same letters and case.
1800Otherwise, case is ignored." 1800Otherwise, case is ignored."
1801 :type 'boolean 1801 :type 'boolean
1802 :group 'vhdl-misc) 1802 :group 'vhdl-misc)
1803 1803
1804(defcustom vhdl-word-completion-in-minibuffer t 1804(defcustom vhdl-word-completion-in-minibuffer t
1805 "*Non-nil enables word completion in minibuffer (for template prompts). 1805 "Non-nil enables word completion in minibuffer (for template prompts).
1806 1806
1807NOTE: Activate the new setting by restarting Emacs." 1807NOTE: Activate the new setting by restarting Emacs."
1808 :type 'boolean 1808 :type 'boolean
1809 :group 'vhdl-misc) 1809 :group 'vhdl-misc)
1810 1810
1811(defcustom vhdl-underscore-is-part-of-word nil 1811(defcustom vhdl-underscore-is-part-of-word nil
1812 "*Non-nil means consider the underscore character `_' as part of word. 1812 "Non-nil means consider the underscore character `_' as part of word.
1813An identifier containing underscores is then treated as a single word in 1813An identifier containing underscores is then treated as a single word in
1814select and move operations. All parts of an identifier separated by underscore 1814select and move operations. All parts of an identifier separated by underscore
1815are treated as single words otherwise. 1815are treated as single words otherwise.
@@ -1844,24 +1844,24 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
1844;; Internal variables 1844;; Internal variables
1845 1845
1846(defvar vhdl-menu-max-size 20 1846(defvar vhdl-menu-max-size 20
1847 "*Specifies the maximum size of a menu before splitting it into submenus.") 1847 "Specifies the maximum size of a menu before splitting it into submenus.")
1848 1848
1849(defvar vhdl-progress-interval 1 1849(defvar vhdl-progress-interval 1
1850 "*Interval used to update progress status during long operations. 1850 "Interval used to update progress status during long operations.
1851If a number, percentage complete gets updated after each interval of 1851If a number, percentage complete gets updated after each interval of
1852that many seconds. To inhibit all messages, set this option to nil.") 1852that many seconds. To inhibit all messages, set this option to nil.")
1853 1853
1854(defvar vhdl-inhibit-startup-warnings-p nil 1854(defvar vhdl-inhibit-startup-warnings-p nil
1855 "*If non-nil, inhibits start up compatibility warnings.") 1855 "If non-nil, inhibits start up compatibility warnings.")
1856 1856
1857(defvar vhdl-strict-syntax-p nil 1857(defvar vhdl-strict-syntax-p nil
1858 "*If non-nil, all syntactic symbols must be found in `vhdl-offsets-alist'. 1858 "If non-nil, all syntactic symbols must be found in `vhdl-offsets-alist'.
1859If the syntactic symbol for a particular line does not match a symbol 1859If the syntactic symbol for a particular line does not match a symbol
1860in the offsets alist, an error is generated, otherwise no error is 1860in the offsets alist, an error is generated, otherwise no error is
1861reported and the syntactic symbol is ignored.") 1861reported and the syntactic symbol is ignored.")
1862 1862
1863(defvar vhdl-echo-syntactic-information-p nil 1863(defvar vhdl-echo-syntactic-information-p nil
1864 "*If non-nil, syntactic info is echoed when the line is indented.") 1864 "If non-nil, syntactic info is echoed when the line is indented.")
1865 1865
1866(defconst vhdl-offsets-alist-default 1866(defconst vhdl-offsets-alist-default
1867 '((string . -1000) 1867 '((string . -1000)
@@ -1889,7 +1889,7 @@ Do not change this constant! See the variable `vhdl-offsets-alist' for
1889more information.") 1889more information.")
1890 1890
1891(defvar vhdl-offsets-alist (copy-alist vhdl-offsets-alist-default) 1891(defvar vhdl-offsets-alist (copy-alist vhdl-offsets-alist-default)
1892 "*Association list of syntactic element symbols and indentation offsets. 1892 "Association list of syntactic element symbols and indentation offsets.
1893As described below, each cons cell in this list has the form: 1893As described below, each cons cell in this list has the form:
1894 1894
1895 (SYNTACTIC-SYMBOL . OFFSET) 1895 (SYNTACTIC-SYMBOL . OFFSET)
@@ -1950,7 +1950,7 @@ Here is the current list of valid syntactic element symbols:
1950 package-body -- inside a package body") 1950 package-body -- inside a package body")
1951 1951
1952(defvar vhdl-comment-only-line-offset 0 1952(defvar vhdl-comment-only-line-offset 0
1953 "*Extra offset for line which contains only the start of a comment. 1953 "Extra offset for line which contains only the start of a comment.
1954Can contain an integer or a cons cell of the form: 1954Can contain an integer or a cons cell of the form:
1955 1955
1956 (NON-ANCHORED-OFFSET . ANCHORED-OFFSET) 1956 (NON-ANCHORED-OFFSET . ANCHORED-OFFSET)
@@ -1961,7 +1961,7 @@ the amount of offset to give column-zero anchored comment-only lines.
1961Just an integer as value is equivalent to (<val> . 0)") 1961Just an integer as value is equivalent to (<val> . 0)")
1962 1962
1963(defvar vhdl-special-indent-hook nil 1963(defvar vhdl-special-indent-hook nil
1964 "*Hook for user defined special indentation adjustments. 1964 "Hook for user defined special indentation adjustments.
1965This hook gets called after a line is indented by the mode.") 1965This hook gets called after a line is indented by the mode.")
1966 1966
1967(defvar vhdl-style-alist 1967(defvar vhdl-style-alist
@@ -2003,7 +2003,7 @@ your style, only those that are different from the default.")
2003 (setq vhdl-style-alist (cons default vhdl-style-alist)))) 2003 (setq vhdl-style-alist (cons default vhdl-style-alist))))
2004 2004
2005(defvar vhdl-mode-hook nil 2005(defvar vhdl-mode-hook nil
2006 "*Hook called by `vhdl-mode'.") 2006 "Hook called by `vhdl-mode'.")
2007 2007
2008 2008
2009;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 2009;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 1f50910330c..f9d83da1a3a 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -48,7 +48,7 @@
48 "Name of xscheme buffer that we're currently interacting with.") 48 "Name of xscheme buffer that we're currently interacting with.")
49 49
50(defvar xscheme-expressions-ring-max 30 50(defvar xscheme-expressions-ring-max 30
51 "*Maximum length of Scheme expressions ring.") 51 "Maximum length of Scheme expressions ring.")
52 52
53(defvar xscheme-expressions-ring nil 53(defvar xscheme-expressions-ring nil
54 "List of expressions recently transmitted to the Scheme process.") 54 "List of expressions recently transmitted to the Scheme process.")
@@ -116,12 +116,12 @@ from being inserted into the process-buffer.")
116 :group 'lisp) 116 :group 'lisp)
117 117
118(defcustom scheme-band-name nil 118(defcustom scheme-band-name nil
119 "*Band loaded by the `run-scheme' command." 119 "Band loaded by the `run-scheme' command."
120 :type '(choice (const nil) string) 120 :type '(choice (const nil) string)
121 :group 'xscheme) 121 :group 'xscheme)
122 122
123(defcustom scheme-program-arguments nil 123(defcustom scheme-program-arguments nil
124 "*Arguments passed to the Scheme program by the `run-scheme' command." 124 "Arguments passed to the Scheme program by the `run-scheme' command."
125 :type '(choice (const nil) string) 125 :type '(choice (const nil) string)
126 :group 'xscheme) 126 :group 'xscheme)
127 127
diff --git a/lisp/simple.el b/lisp/simple.el
index 64356ce8aa7..9fab1d6dd86 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2150,7 +2150,7 @@ of `history-length', which see.")
2150 "Switch used to have the shell execute its command line argument.") 2150 "Switch used to have the shell execute its command line argument.")
2151 2151
2152(defvar shell-command-default-error-buffer nil 2152(defvar shell-command-default-error-buffer nil
2153 "*Buffer name for `shell-command' and `shell-command-on-region' error output. 2153 "Buffer name for `shell-command' and `shell-command-on-region' error output.
2154This buffer is used when `shell-command' or `shell-command-on-region' 2154This buffer is used when `shell-command' or `shell-command-on-region'
2155is run interactively. A value of nil means that output to stderr and 2155is run interactively. A value of nil means that output to stderr and
2156stdout will be intermixed in the output stream.") 2156stdout will be intermixed in the output stream.")
@@ -5321,7 +5321,7 @@ Returns t if it really did any work."
5321 t))) 5321 t)))
5322 5322
5323(defvar comment-line-break-function 'comment-indent-new-line 5323(defvar comment-line-break-function 'comment-indent-new-line
5324 "*Mode-specific function which line breaks and continues a comment. 5324 "Mode-specific function which line breaks and continues a comment.
5325This function is called during auto-filling when a comment syntax 5325This function is called during auto-filling when a comment syntax
5326is defined. 5326is defined.
5327The function should take a single optional argument, which is a flag 5327The function should take a single optional argument, which is a flag
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 5838915b1f5..328f795ecd2 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -37,7 +37,7 @@
37 37
38 38
39(defvar skeleton-transformation-function 'identity 39(defvar skeleton-transformation-function 'identity
40 "*If non-nil, function applied to literal strings before they are inserted. 40 "If non-nil, function applied to literal strings before they are inserted.
41It should take strings and characters and return them transformed, or nil 41It should take strings and characters and return them transformed, or nil
42which means no transformation. 42which means no transformation.
43Typical examples might be `upcase' or `capitalize'.") 43Typical examples might be `upcase' or `capitalize'.")
@@ -95,11 +95,11 @@ skeleton elements.")
95(defvar skeleton-subprompt 95(defvar skeleton-subprompt
96 (substitute-command-keys 96 (substitute-command-keys
97 "RET, \\<minibuffer-local-map>\\[abort-recursive-edit] or \\[help-command]") 97 "RET, \\<minibuffer-local-map>\\[abort-recursive-edit] or \\[help-command]")
98 "*Replacement for %s in prompts of recursive subskeletons.") 98 "Replacement for %s in prompts of recursive subskeletons.")
99 99
100 100
101(defvar skeleton-debug nil 101(defvar skeleton-debug nil
102 "*If non-nil `define-skeleton' will override previous definition.") 102 "If non-nil `define-skeleton' will override previous definition.")
103 103
104(defvar skeleton-positions nil 104(defvar skeleton-positions nil
105 "List of positions marked with @, after skeleton insertion. 105 "List of positions marked with @, after skeleton insertion.
@@ -468,13 +468,13 @@ automatically, and you are prompted to fill in the variable parts.")))
468;; Variables and command for automatically inserting pairs like () or "". 468;; Variables and command for automatically inserting pairs like () or "".
469 469
470(defvar skeleton-pair nil 470(defvar skeleton-pair nil
471 "*If this is nil pairing is turned off, no matter what else is set. 471 "If this is nil pairing is turned off, no matter what else is set.
472Otherwise modes with `skeleton-pair-insert-maybe' on some keys 472Otherwise modes with `skeleton-pair-insert-maybe' on some keys
473will attempt to insert pairs of matching characters.") 473will attempt to insert pairs of matching characters.")
474 474
475 475
476(defvar skeleton-pair-on-word nil 476(defvar skeleton-pair-on-word nil
477 "*If this is nil, paired insertion is inhibited before or inside a word.") 477 "If this is nil, paired insertion is inhibited before or inside a word.")
478 478
479 479
480(defvar skeleton-pair-filter-function (lambda () nil) 480(defvar skeleton-pair-filter-function (lambda () nil)
diff --git a/lisp/subr.el b/lisp/subr.el
index 497809a23e8..a6ad67283be 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1968,7 +1968,7 @@ It can be retrieved with `(process-get PROCESS PROPNAME)'."
1968;;;; Input and display facilities. 1968;;;; Input and display facilities.
1969 1969
1970(defvar read-quoted-char-radix 8 1970(defvar read-quoted-char-radix 8
1971 "*Radix for \\[quoted-insert] and other uses of `read-quoted-char'. 1971 "Radix for \\[quoted-insert] and other uses of `read-quoted-char'.
1972Legitimate radix values are 8, 10 and 16.") 1972Legitimate radix values are 8, 10 and 16.")
1973 1973
1974(custom-declare-variable-early 1974(custom-declare-variable-early
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 72ae44bb60d..dedbfcbf338 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -349,7 +349,7 @@ Example:
349 349
350 350
351(defvar artist-pointer-shape (if (eq window-system 'x) x-pointer-crosshair nil) 351(defvar artist-pointer-shape (if (eq window-system 'x) x-pointer-crosshair nil)
352 "*If in X Windows, use this pointer shape while drawing with the mouse.") 352 "If in X Windows, use this pointer shape while drawing with the mouse.")
353 353
354 354
355(defcustom artist-text-renderer-function 'artist-figlet 355(defcustom artist-text-renderer-function 'artist-figlet
@@ -397,13 +397,13 @@ Example:
397 ;; This is a defvar, not a defcustom, since the custom 397 ;; This is a defvar, not a defcustom, since the custom
398 ;; package shows lists of characters as a lists of integers, 398 ;; package shows lists of characters as a lists of integers,
399 ;; which is confusing 399 ;; which is confusing
400 "*Characters (``color'') to use when spraying. 400 "Characters (``color'') to use when spraying.
401They should be ordered from the ``lightest'' to the ``heaviest'' 401They should be ordered from the ``lightest'' to the ``heaviest''
402since spraying replaces a light character with the next heavier one.") 402since spraying replaces a light character with the next heavier one.")
403 403
404 404
405(defvar artist-spray-new-char ?. 405(defvar artist-spray-new-char ?.
406 "*Initial character to use when spraying. 406 "Initial character to use when spraying.
407This character is used if spraying upon a character that is not in 407This character is used if spraying upon a character that is not in
408`artist-spray-chars'. The character defined by this variable should 408`artist-spray-chars'. The character defined by this variable should
409be in `artist-spray-chars', or spraying will behave strangely.") 409be in `artist-spray-chars', or spraying will behave strangely.")
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 01733f97042..c8881fa5f9d 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -137,7 +137,7 @@ with the cdr.")
137 137
138 138
139(defcustom bib-auto-capitalize t 139(defcustom bib-auto-capitalize t
140 "*True to automatically capitalize appropriate fields in Bib mode." 140 "True to automatically capitalize appropriate fields in Bib mode."
141 :type 'boolean 141 :type 'boolean
142 :group 'bib) 142 :group 'bib)
143 143
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index a873680a8c8..87a32ad47a9 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -917,7 +917,7 @@ to the directories specified in `bibtex-string-file-path'."
917 :type '(repeat file)) 917 :type '(repeat file))
918 918
919(defvar bibtex-string-file-path (getenv "BIBINPUTS") 919(defvar bibtex-string-file-path (getenv "BIBINPUTS")
920 "*Colon separated list of paths to search for `bibtex-string-files'.") 920 "Colon separated list of paths to search for `bibtex-string-files'.")
921 921
922(defcustom bibtex-files nil 922(defcustom bibtex-files nil
923 "List of BibTeX files that are searched for entry keys. 923 "List of BibTeX files that are searched for entry keys.
@@ -931,7 +931,7 @@ See also `bibtex-search-entry-globally'."
931 directory file))) 931 directory file)))
932 932
933(defvar bibtex-file-path (getenv "BIBINPUTS") 933(defvar bibtex-file-path (getenv "BIBINPUTS")
934 "*Colon separated list of paths to search for `bibtex-files'.") 934 "Colon separated list of paths to search for `bibtex-files'.")
935 935
936(defcustom bibtex-search-entry-globally nil 936(defcustom bibtex-search-entry-globally nil
937 "If non-nil, interactive calls of `bibtex-search-entry' search globally. 937 "If non-nil, interactive calls of `bibtex-search-entry' search globally.
@@ -1614,7 +1614,7 @@ Initialized by `bibtex-set-dialect'.")
1614 ,@(mapcar (lambda (matcher) 1614 ,@(mapcar (lambda (matcher)
1615 `((lambda (bound) (bibtex-font-lock-cite ',matcher bound)))) 1615 `((lambda (bound) (bibtex-font-lock-cite ',matcher bound))))
1616 bibtex-cite-matcher-alist)) 1616 bibtex-cite-matcher-alist))
1617 "*Default expressions to highlight in BibTeX mode.") 1617 "Default expressions to highlight in BibTeX mode.")
1618 1618
1619(defvar bibtex-font-lock-url-regexp 1619(defvar bibtex-font-lock-url-regexp
1620 ;; Assume that field names begin at the beginning of a line. 1620 ;; Assume that field names begin at the beginning of a line.
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 930fda0626b..24967ded154 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -436,7 +436,7 @@ like <img alt=\"Some thing.\">."
436 436
437;; dash character machinery 437;; dash character machinery
438(defvar flyspell-consider-dash-as-word-delimiter-flag nil 438(defvar flyspell-consider-dash-as-word-delimiter-flag nil
439 "*Non-nil means that the `-' char is considered as a word delimiter.") 439 "Non-nil means that the `-' char is considered as a word delimiter.")
440(make-variable-buffer-local 'flyspell-consider-dash-as-word-delimiter-flag) 440(make-variable-buffer-local 'flyspell-consider-dash-as-word-delimiter-flag)
441(defvar flyspell-dash-dictionary nil) 441(defvar flyspell-dash-dictionary nil)
442(make-variable-buffer-local 'flyspell-dash-dictionary) 442(make-variable-buffer-local 'flyspell-dash-dictionary)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 75e8bd5a87d..74c32817734 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -277,13 +277,13 @@ full featured `looking-back' function is missing."
277;;; ******* THIS FILE IS WRITTEN FOR ISPELL VERSION 3.1+ 277;;; ******* THIS FILE IS WRITTEN FOR ISPELL VERSION 3.1+
278 278
279(defcustom ispell-highlight-p 'block 279(defcustom ispell-highlight-p 'block
280 "*Highlight spelling errors when non-nil. 280 "Highlight spelling errors when non-nil.
281When set to `block', assumes a block cursor with TTY displays." 281When set to `block', assumes a block cursor with TTY displays."
282 :type '(choice (const block) (const :tag "off" nil) (const :tag "on" t)) 282 :type '(choice (const block) (const :tag "off" nil) (const :tag "on" t))
283 :group 'ispell) 283 :group 'ispell)
284 284
285(defcustom ispell-lazy-highlight (boundp 'lazy-highlight-cleanup) 285(defcustom ispell-lazy-highlight (boundp 'lazy-highlight-cleanup)
286 "*Controls the lazy-highlighting of spelling errors. 286 "Controls the lazy-highlighting of spelling errors.
287When non-nil, all text in the buffer matching the current spelling 287When non-nil, all text in the buffer matching the current spelling
288error is highlighted lazily using isearch lazy highlighting (see 288error is highlighted lazily using isearch lazy highlighting (see
289`lazy-highlight-initial-delay' and `lazy-highlight-interval')." 289`lazy-highlight-initial-delay' and `lazy-highlight-interval')."
@@ -293,7 +293,7 @@ error is highlighted lazily using isearch lazy highlighting (see
293 :version "22.1") 293 :version "22.1")
294 294
295(defcustom ispell-highlight-face (if ispell-lazy-highlight 'isearch 'highlight) 295(defcustom ispell-highlight-face (if ispell-lazy-highlight 'isearch 'highlight)
296 "*The face used for Ispell highlighting. For Emacsen with overlays. 296 "The face used for Ispell highlighting. For Emacsen with overlays.
297Possible values are `highlight', `modeline', `secondary-selection', 297Possible values are `highlight', `modeline', `secondary-selection',
298`region', and `underline'. 298`region', and `underline'.
299This variable can be set by the user to whatever face they desire. 299This variable can be set by the user to whatever face they desire.
@@ -303,7 +303,7 @@ slightly different."
303 :group 'ispell) 303 :group 'ispell)
304 304
305(defcustom ispell-check-comments t 305(defcustom ispell-check-comments t
306 "*Spelling of comments checked when non-nil. 306 "Spelling of comments checked when non-nil.
307When set to `exclusive', ONLY comments are checked. (For code comments). 307When set to `exclusive', ONLY comments are checked. (For code comments).
308Warning! Not checking comments, when a comment start is embedded in strings, 308Warning! Not checking comments, when a comment start is embedded in strings,
309may produce undesired results." 309may produce undesired results."
@@ -314,13 +314,13 @@ may produce undesired results."
314 (lambda (a) (memq a '(nil t exclusive)))) 314 (lambda (a) (memq a '(nil t exclusive))))
315 315
316(defcustom ispell-query-replace-choices nil 316(defcustom ispell-query-replace-choices nil
317 "*Corrections made throughout region when non-nil. 317 "Corrections made throughout region when non-nil.
318Uses `query-replace' (\\[query-replace]) for corrections." 318Uses `query-replace' (\\[query-replace]) for corrections."
319 :type 'boolean 319 :type 'boolean
320 :group 'ispell) 320 :group 'ispell)
321 321
322(defcustom ispell-skip-tib nil 322(defcustom ispell-skip-tib nil
323 "*Does not spell check `tib' bibliography references when non-nil. 323 "Does not spell check `tib' bibliography references when non-nil.
324Skips any text between strings matching regular expressions 324Skips any text between strings matching regular expressions
325`ispell-tib-ref-beginning' and `ispell-tib-ref-end'. 325`ispell-tib-ref-beginning' and `ispell-tib-ref-end'.
326 326
@@ -337,13 +337,13 @@ That includes the [.5mm] type of number..."
337 "Regexp matching the end of a Tib reference.") 337 "Regexp matching the end of a Tib reference.")
338 338
339(defcustom ispell-keep-choices-win t 339(defcustom ispell-keep-choices-win t
340 "*If non-nil, keep the `*Choices*' window for the entire spelling session. 340 "If non-nil, keep the `*Choices*' window for the entire spelling session.
341This minimizes redisplay thrashing." 341This minimizes redisplay thrashing."
342 :type 'boolean 342 :type 'boolean
343 :group 'ispell) 343 :group 'ispell)
344 344
345(defcustom ispell-choices-win-default-height 2 345(defcustom ispell-choices-win-default-height 2
346 "*The default size of the `*Choices*' window, including the mode line. 346 "The default size of the `*Choices*' window, including the mode line.
347Must be greater than 1." 347Must be greater than 1."
348 :type 'integer 348 :type 'integer
349 :group 'ispell) 349 :group 'ispell)
@@ -366,18 +366,18 @@ Must be greater than 1."
366 ((file-readable-p "/usr/share/lib/dict/words") 366 ((file-readable-p "/usr/share/lib/dict/words")
367 "/usr/share/lib/dict/words") 367 "/usr/share/lib/dict/words")
368 ((file-readable-p "/sys/dict") "/sys/dict")) 368 ((file-readable-p "/sys/dict") "/sys/dict"))
369 "*Alternate plain word-list dictionary for spelling help." 369 "Alternate plain word-list dictionary for spelling help."
370 :type '(choice file (const :tag "None" nil)) 370 :type '(choice file (const :tag "None" nil))
371 :group 'ispell) 371 :group 'ispell)
372 372
373(defcustom ispell-complete-word-dict nil 373(defcustom ispell-complete-word-dict nil
374 "*Plain word-list dictionary used for word completion if 374 "Plain word-list dictionary used for word completion if
375different from `ispell-alternate-dictionary'." 375different from `ispell-alternate-dictionary'."
376 :type '(choice file (const :tag "None" nil)) 376 :type '(choice file (const :tag "None" nil))
377 :group 'ispell) 377 :group 'ispell)
378 378
379(defcustom ispell-message-dictionary-alist nil 379(defcustom ispell-message-dictionary-alist nil
380 "*List used by `ispell-message' to select a new dictionary. 380 "List used by `ispell-message' to select a new dictionary.
381It consists of pairs (REGEXP . DICTIONARY). If REGEXP is found 381It consists of pairs (REGEXP . DICTIONARY). If REGEXP is found
382in the message headers, `ispell-local-dictionary' will be set to 382in the message headers, `ispell-local-dictionary' will be set to
383DICTIONARY if `ispell-local-dictionary' is not buffer-local. 383DICTIONARY if `ispell-local-dictionary' is not buffer-local.
@@ -389,7 +389,7 @@ E.g. you may use the following value:
389 389
390 390
391(defcustom ispell-message-fcc-skip 50000 391(defcustom ispell-message-fcc-skip 50000
392 "*Query before saving Fcc message copy if attachment larger than this value. 392 "Query before saving Fcc message copy if attachment larger than this value.
393Always stores Fcc copy of message when nil." 393Always stores Fcc copy of message when nil."
394 :type '(choice integer (const :tag "off" nil)) 394 :type '(choice integer (const :tag "off" nil))
395 :group 'ispell) 395 :group 'ispell)
@@ -423,13 +423,13 @@ This must be an absolute file name."
423 :group 'ispell) 423 :group 'ispell)
424 424
425(defcustom ispell-look-p (file-exists-p ispell-look-command) 425(defcustom ispell-look-p (file-exists-p ispell-look-command)
426 "*Non-nil means use `look' rather than `grep'. 426 "Non-nil means use `look' rather than `grep'.
427Default is based on whether `look' seems to be available." 427Default is based on whether `look' seems to be available."
428 :type 'boolean 428 :type 'boolean
429 :group 'ispell) 429 :group 'ispell)
430 430
431(defcustom ispell-have-new-look nil 431(defcustom ispell-have-new-look nil
432 "*Non-nil means use the `-r' option (regexp) when running `look'." 432 "Non-nil means use the `-r' option (regexp) when running `look'."
433 :type 'boolean 433 :type 'boolean
434 :group 'ispell) 434 :group 'ispell)
435 435
@@ -445,13 +445,13 @@ When nil, Emacs uses pipes."
445 :group 'ispell) 445 :group 'ispell)
446 446
447(defcustom ispell-following-word nil 447(defcustom ispell-following-word nil
448 "*Non-nil means `ispell-word' checks the word around or after point. 448 "Non-nil means `ispell-word' checks the word around or after point.
449Otherwise `ispell-word' checks the preceding word." 449Otherwise `ispell-word' checks the preceding word."
450 :type 'boolean 450 :type 'boolean
451 :group 'ispell) 451 :group 'ispell)
452 452
453(defcustom ispell-help-in-bufferp nil 453(defcustom ispell-help-in-bufferp nil
454 "*Non-nil means display interactive keymap help in a buffer. 454 "Non-nil means display interactive keymap help in a buffer.
455The following values are supported: 455The following values are supported:
456 nil Expand the minibuffer and display a short help message 456 nil Expand the minibuffer and display a short help message
457 there for a couple of seconds. 457 there for a couple of seconds.
@@ -463,12 +463,12 @@ The following values are supported:
463 :group 'ispell) 463 :group 'ispell)
464 464
465(defcustom ispell-quietly nil 465(defcustom ispell-quietly nil
466 "*Non-nil means suppress messages in `ispell-word'." 466 "Non-nil means suppress messages in `ispell-word'."
467 :type 'boolean 467 :type 'boolean
468 :group 'ispell) 468 :group 'ispell)
469 469
470(defcustom ispell-format-word-function (function upcase) 470(defcustom ispell-format-word-function (function upcase)
471 "*Formatting function for displaying word being spell checked. 471 "Formatting function for displaying word being spell checked.
472The function must take one string argument and return a string." 472The function must take one string argument and return a string."
473 :type 'function 473 :type 'function
474 :group 'ispell) 474 :group 'ispell)
@@ -484,7 +484,7 @@ window system by evaluating the following on startup to set this variable:
484 484
485;;;###autoload 485;;;###autoload
486(defcustom ispell-personal-dictionary nil 486(defcustom ispell-personal-dictionary nil
487 "*File name of your personal spelling dictionary, or nil. 487 "File name of your personal spelling dictionary, or nil.
488If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or 488If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or
489\"~/.aspell.LANG.pws\" for aspell) is used, where DICTNAME is the name of your 489\"~/.aspell.LANG.pws\" for aspell) is used, where DICTNAME is the name of your
490default dictionary and LANG the two letter language code." 490default dictionary and LANG the two letter language code."
@@ -493,7 +493,7 @@ default dictionary and LANG the two letter language code."
493 :group 'ispell) 493 :group 'ispell)
494 494
495(defcustom ispell-silently-savep nil 495(defcustom ispell-silently-savep nil
496 "*When non-nil, save personal dictionary without asking for confirmation." 496 "When non-nil, save personal dictionary without asking for confirmation."
497 :type 'boolean 497 :type 'boolean
498 :group 'ispell) 498 :group 'ispell)
499 499
@@ -527,7 +527,7 @@ is automatically set when defined in the file with either
527 :group 'ispell) 527 :group 'ispell)
528 528
529(defcustom ispell-extra-args nil 529(defcustom ispell-extra-args nil
530 "*If non-nil, a list of extra switches to pass to the Ispell program. 530 "If non-nil, a list of extra switches to pass to the Ispell program.
531For example, (\"-W\" \"3\") to cause it to accept all 1-3 character 531For example, (\"-W\" \"3\") to cause it to accept all 1-3 character
532words as correct. See also `ispell-dictionary-alist', which may be used 532words as correct. See also `ispell-dictionary-alist', which may be used
533for language-specific arguments." 533for language-specific arguments."
@@ -537,7 +537,7 @@ for language-specific arguments."
537 537
538 538
539(defcustom ispell-skip-html 'use-mode-name 539(defcustom ispell-skip-html 'use-mode-name
540 "*Indicates whether ispell should skip spell checking of SGML markup. 540 "Indicates whether ispell should skip spell checking of SGML markup.
541If t, always skip SGML markup; if nil, never skip; if non-t and non-nil, 541If t, always skip SGML markup; if nil, never skip; if non-t and non-nil,
542guess whether SGML markup should be skipped according to the name of the 542guess whether SGML markup should be skipped according to the name of the
543buffer's major mode." 543buffer's major mode."
@@ -549,7 +549,7 @@ buffer's major mode."
549 549
550 550
551(defcustom ispell-local-dictionary-alist nil 551(defcustom ispell-local-dictionary-alist nil
552 "*List of local or customized dictionary definitions. 552 "List of local or customized dictionary definitions.
553These can override the values in `ispell-dictionary-alist'. 553These can override the values in `ispell-dictionary-alist'.
554 554
555To make permanent changes to your dictionary definitions, you 555To make permanent changes to your dictionary definitions, you
@@ -1470,7 +1470,7 @@ Valid forms include:
1470 ("list" ispell-tex-arg-end 2) 1470 ("list" ispell-tex-arg-end 2)
1471 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}") 1471 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}")
1472 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}")))) 1472 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}"))))
1473 "*Lists of regions to be skipped in TeX mode. 1473 "Lists of regions to be skipped in TeX mode.
1474First list is used raw. 1474First list is used raw.
1475Second list has key placed inside \\begin{}. 1475Second list has key placed inside \\begin{}.
1476 1476
@@ -1489,7 +1489,7 @@ for skipping in latex mode.")
1489 ("<[tT][tT]/" "/") 1489 ("<[tT][tT]/" "/")
1490 ("<[^ \t\n>]" ">") 1490 ("<[^ \t\n>]" ">")
1491 ("&[^ \t\n;]" "[; \t\n]")) 1491 ("&[^ \t\n;]" "[; \t\n]"))
1492 "*Lists of start and end keys to skip in HTML buffers. 1492 "Lists of start and end keys to skip in HTML buffers.
1493Same format as `ispell-skip-region-alist'. 1493Same format as `ispell-skip-region-alist'.
1494Note - substrings of other matches must come last 1494Note - substrings of other matches must come last
1495 (e.g. \"<[tT][tT]/\" and \"<[^ \\t\\n>]\").") 1495 (e.g. \"<[tT][tT]/\" and \"<[^ \\t\\n>]\").")
@@ -1513,7 +1513,7 @@ local variable syntax.")
1513Ispell is then restarted because the local words could conflict.") 1513Ispell is then restarted because the local words could conflict.")
1514 1514
1515(defvar ispell-parser 'use-mode-name 1515(defvar ispell-parser 'use-mode-name
1516 "*Indicates whether ispell should parse the current buffer as TeX Code. 1516 "Indicates whether ispell should parse the current buffer as TeX Code.
1517Special value `use-mode-name' tries to guess using the name of `major-mode'. 1517Special value `use-mode-name' tries to guess using the name of `major-mode'.
1518Default parser is `nroff'. 1518Default parser is `nroff'.
1519Currently the only other valid parser is `tex'. 1519Currently the only other valid parser is `tex'.
@@ -3530,7 +3530,7 @@ Don't read buffer-local settings or word lists."
3530 ;; Matches commonly used "cut" boundaries 3530 ;; Matches commonly used "cut" boundaries
3531 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)") 3531 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)")
3532 "\\|") 3532 "\\|")
3533 "*Text beyond which `ispell-message' will not spell-check. 3533 "Text beyond which `ispell-message' will not spell-check.
3534If it is a string, limit is the first occurrence of that regular expression. 3534If it is a string, limit is the first occurrence of that regular expression.
3535Otherwise, it must be a function which is called to get the limit.") 3535Otherwise, it must be a function which is called to get the limit.")
3536(put 'ispell-message-text-end 'risky-local-variable t) 3536(put 'ispell-message-text-end 'risky-local-variable t)
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index b473019643a..62fa68ca793 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -64,7 +64,7 @@
64 :group 'wp) 64 :group 'wp)
65 65
66(defcustom r2b-trace-on nil 66(defcustom r2b-trace-on nil
67 "*Non-nil means trace conversion." 67 "Non-nil means trace conversion."
68 :type 'boolean 68 :type 'boolean
69 :group 'refbib) 69 :group 'refbib)
70 70
@@ -128,7 +128,7 @@ in `r2b-proceedings-list' (although it wouldn't cause an error)."
128This is in addition to the `r2b-capitalize-title-stop-words'.") 128This is in addition to the `r2b-capitalize-title-stop-words'.")
129 129
130(defcustom r2b-delimit-with-quote t 130(defcustom r2b-delimit-with-quote t
131 "*If true, then use \" to delimit fields, otherwise use braces." 131 "If true, then use \" to delimit fields, otherwise use braces."
132 :type 'boolean 132 :type 'boolean
133 :group 'refbib) 133 :group 'refbib)
134 134
@@ -204,12 +204,12 @@ This is in addition to the `r2b-capitalize-title-stop-words'.")
204 (buffer-substring (match-beginning exp) (match-end exp))) 204 (buffer-substring (match-beginning exp) (match-end exp)))
205 205
206(defcustom r2b-out-buf-name "*Out*" 206(defcustom r2b-out-buf-name "*Out*"
207 "*Name of buffer for output from refer-to-bibtex." 207 "Name of buffer for output from refer-to-bibtex."
208 :type 'string 208 :type 'string
209 :group 'refbib) 209 :group 'refbib)
210 210
211(defcustom r2b-log-name "*Log*" 211(defcustom r2b-log-name "*Log*"
212 "*Name of buffer for logs errors from refer-to-bibtex." 212 "Name of buffer for logs errors from refer-to-bibtex."
213 :type 'string 213 :type 'string
214 :group 'refbib) 214 :group 'refbib)
215 215
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index ebda25ea932..b1e426c5566 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -316,7 +316,7 @@ With argument, actually select the window showing the cross reference."
316 (run-hooks 'reftex-display-copied-context-hook))))) 316 (run-hooks 'reftex-display-copied-context-hook)))))
317 317
318(defvar reftex-use-itimer-in-xemacs nil 318(defvar reftex-use-itimer-in-xemacs nil
319 "*Non-nil means use the idle timers in XEmacs for crossref display. 319 "Non-nil means use the idle timers in XEmacs for crossref display.
320Currently, idle timer restart is broken and we use the post-command-hook.") 320Currently, idle timer restart is broken and we use the post-command-hook.")
321 321
322(defun reftex-toggle-auto-view-crossref () 322(defun reftex-toggle-auto-view-crossref ()
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 98135b7ce24..4c875a35b3e 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -294,7 +294,7 @@ select the nearest entry with the correct new level."
294 (symbol :tag "function " my-level-func))))) 294 (symbol :tag "function " my-level-func)))))
295 295
296(defcustom reftex-toc-max-level 100 296(defcustom reftex-toc-max-level 100
297 "*The maximum level of toc entries which will be included in the TOC. 297 "The maximum level of toc entries which will be included in the TOC.
298Section headings with a bigger level will be ignored. In RefTeX, chapters 298Section headings with a bigger level will be ignored. In RefTeX, chapters
299are level 1, sections are level 2 etc. 299are level 1, sections are level 2 etc.
300This variable can be changed from within the *toc* buffer with the `t' key." 300This variable can be changed from within the *toc* buffer with the `t' key."
@@ -302,7 +302,7 @@ This variable can be changed from within the *toc* buffer with the `t' key."
302 :type 'integer) 302 :type 'integer)
303 303
304(defcustom reftex-part-resets-chapter nil 304(defcustom reftex-part-resets-chapter nil
305 "*Non-nil means, \\part is like any other sectioning command. 305 "Non-nil means, \\part is like any other sectioning command.
306This means, part numbers will be included in the numbering of chapters, and 306This means, part numbers will be included in the numbering of chapters, and
307chapter counters will be reset for each part. 307chapter counters will be reset for each part.
308When nil (the default), parts are special, do not reset the chapter counter 308When nil (the default), parts are special, do not reset the chapter counter
@@ -312,7 +312,7 @@ and also do not show up in chapter numbers."
312 312
313 313
314(defcustom reftex-auto-recenter-toc 'frame 314(defcustom reftex-auto-recenter-toc 'frame
315 "*Non-nil means, turn automatic recentering of *TOC* window on. 315 "Non-nil means, turn automatic recentering of *TOC* window on.
316When active, the *TOC* window will always show the section you 316When active, the *TOC* window will always show the section you
317are currently working in. Recentering happens whenever Emacs is idle for 317are currently working in. Recentering happens whenever Emacs is idle for
318more than `reftex-idle-time' seconds. 318more than `reftex-idle-time' seconds.
@@ -335,12 +335,12 @@ This feature can be turned on and off from the menu
335 (const :tag "in dedicated frame only" frame))) 335 (const :tag "in dedicated frame only" frame)))
336 336
337(defcustom reftex-toc-split-windows-horizontally nil 337(defcustom reftex-toc-split-windows-horizontally nil
338 "*Non-nil means, create TOC window by splitting window horizontally." 338 "Non-nil means, create TOC window by splitting window horizontally."
339 :group 'reftex-table-of-contents-browser 339 :group 'reftex-table-of-contents-browser
340 :type 'boolean) 340 :type 'boolean)
341 341
342(defcustom reftex-toc-split-windows-fraction .3 342(defcustom reftex-toc-split-windows-fraction .3
343 "*Fraction of the width or height of the frame to be used for TOC window. 343 "Fraction of the width or height of the frame to be used for TOC window.
344See also `reftex-toc-split-windows-horizontally'." 344See also `reftex-toc-split-windows-horizontally'."
345 :group 'reftex-table-of-contents-browser 345 :group 'reftex-table-of-contents-browser
346 :type 'number) 346 :type 'number)
@@ -349,7 +349,7 @@ See also `reftex-toc-split-windows-horizontally'."
349 "This variable is obsolete, use `reftex-toc-split-windows-fraction' instead.") 349 "This variable is obsolete, use `reftex-toc-split-windows-fraction' instead.")
350 350
351(defcustom reftex-toc-keep-other-windows t 351(defcustom reftex-toc-keep-other-windows t
352 "*Non-nil means, split the selected window to display the *toc* buffer. 352 "Non-nil means, split the selected window to display the *toc* buffer.
353This helps to keep the window configuration, but makes the *toc* small. 353This helps to keep the window configuration, but makes the *toc* small.
354When nil, all other windows except the selected one will be deleted, so 354When nil, all other windows except the selected one will be deleted, so
355that the *toc* window fills half the frame." 355that the *toc* window fills half the frame."
@@ -357,25 +357,25 @@ that the *toc* window fills half the frame."
357 :type 'boolean) 357 :type 'boolean)
358 358
359(defcustom reftex-toc-include-file-boundaries nil 359(defcustom reftex-toc-include-file-boundaries nil
360 "*Non-nil means, include file boundaries in *toc* buffer. 360 "Non-nil means, include file boundaries in *toc* buffer.
361This flag can be toggled from within the *toc* buffer with the `F' key." 361This flag can be toggled from within the *toc* buffer with the `F' key."
362 :group 'reftex-table-of-contents-browser 362 :group 'reftex-table-of-contents-browser
363 :type 'boolean) 363 :type 'boolean)
364 364
365(defcustom reftex-toc-include-labels nil 365(defcustom reftex-toc-include-labels nil
366 "*Non-nil means, include labels in *toc* buffer. 366 "Non-nil means, include labels in *toc* buffer.
367This flag can be toggled from within the *toc* buffer with the `l' key." 367This flag can be toggled from within the *toc* buffer with the `l' key."
368 :group 'reftex-table-of-contents-browser 368 :group 'reftex-table-of-contents-browser
369 :type 'boolean) 369 :type 'boolean)
370 370
371(defcustom reftex-toc-include-index-entries nil 371(defcustom reftex-toc-include-index-entries nil
372 "*Non-nil means, include index entries in *toc* buffer. 372 "Non-nil means, include index entries in *toc* buffer.
373This flag can be toggled from within the *toc* buffer with the `i' key." 373This flag can be toggled from within the *toc* buffer with the `i' key."
374 :group 'reftex-table-of-contents-browser 374 :group 'reftex-table-of-contents-browser
375 :type 'boolean) 375 :type 'boolean)
376 376
377(defcustom reftex-toc-confirm-promotion 2 377(defcustom reftex-toc-confirm-promotion 2
378 "*Non-nil means, promotion/demotion commands first prompt for confirmation. 378 "Non-nil means, promotion/demotion commands first prompt for confirmation.
379When nil, the command is executed immediately. When this is an integer 379When nil, the command is executed immediately. When this is an integer
380N, ask for confirmation only if N or more section commands are going to be 380N, ask for confirmation only if N or more section commands are going to be
381changed." 381changed."
@@ -386,21 +386,21 @@ changed."
386 (number :tag "When more than N sections" :value 2))) 386 (number :tag "When more than N sections" :value 2)))
387 387
388(defcustom reftex-toc-include-context nil 388(defcustom reftex-toc-include-context nil
389 "*Non-nil means, include context with labels in the *toc* buffer. 389 "Non-nil means, include context with labels in the *toc* buffer.
390Context will only be shown when labels are visible as well. 390Context will only be shown when labels are visible as well.
391This flag can be toggled from within the *toc* buffer with the `c' key." 391This flag can be toggled from within the *toc* buffer with the `c' key."
392 :group 'reftex-table-of-contents-browser 392 :group 'reftex-table-of-contents-browser
393 :type 'boolean) 393 :type 'boolean)
394 394
395(defcustom reftex-toc-follow-mode nil 395(defcustom reftex-toc-follow-mode nil
396 "*Non-nil means, point in *toc* buffer will cause other window to follow. 396 "Non-nil means, point in *toc* buffer will cause other window to follow.
397The other window will show the corresponding part of the document. 397The other window will show the corresponding part of the document.
398This flag can be toggled from within the *toc* buffer with the `f' key." 398This flag can be toggled from within the *toc* buffer with the `f' key."
399 :group 'reftex-table-of-contents-browser 399 :group 'reftex-table-of-contents-browser
400 :type 'boolean) 400 :type 'boolean)
401 401
402(defcustom reftex-revisit-to-follow nil 402(defcustom reftex-revisit-to-follow nil
403 "*Non-nil means, follow-mode will revisit files if necessary. 403 "Non-nil means, follow-mode will revisit files if necessary.
404When nil, follow-mode will be suspended for stuff in unvisited files." 404When nil, follow-mode will be suspended for stuff in unvisited files."
405 :group 'reftex-table-of-contents-browser 405 :group 'reftex-table-of-contents-browser
406 :group 'reftex-referencing-labels 406 :group 'reftex-referencing-labels
@@ -940,7 +940,7 @@ This is used to string together whole reference sets, like
940 :type '(repeat (cons (character) (string)))) 940 :type '(repeat (cons (character) (string))))
941 941
942(defcustom reftex-vref-is-default nil 942(defcustom reftex-vref-is-default nil
943 "*Non-nil means, the varioref macro \\vref is used as default. 943 "Non-nil means, the varioref macro \\vref is used as default.
944In the selection buffer, the `v' key toggles the reference macro between 944In the selection buffer, the `v' key toggles the reference macro between
945`\\ref' and `\\vref'. The value of this variable determines the default 945`\\ref' and `\\vref'. The value of this variable determines the default
946which is active when entering the selection process. 946which is active when entering the selection process.
@@ -951,7 +951,7 @@ the label types for which it should be true."
951;;;###autoload(put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) 951;;;###autoload(put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
952 952
953(defcustom reftex-fref-is-default nil 953(defcustom reftex-fref-is-default nil
954 "*Non-nil means, the fancyref macro \\fref is used as default. 954 "Non-nil means, the fancyref macro \\fref is used as default.
955In the selection buffer, the `V' key toggles the reference macro between 955In the selection buffer, the `V' key toggles the reference macro between
956`\\ref', `\\fref' and `\\Fref'. The value of this variable determines 956`\\ref', `\\fref' and `\\Fref'. The value of this variable determines
957the default which is active when entering the selection process. 957the default which is active when entering the selection process.
@@ -962,13 +962,13 @@ the label types for which it should be true."
962;;;###autoload(put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) 962;;;###autoload(put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
963 963
964(defcustom reftex-level-indent 2 964(defcustom reftex-level-indent 2
965 "*Number of spaces to be used for indentation per section level." 965 "Number of spaces to be used for indentation per section level."
966 :group 'reftex-referencing-labels 966 :group 'reftex-referencing-labels
967 :type 'integer) 967 :type 'integer)
968;;;###autoload(put 'reftex-level-indent 'safe-local-variable 'integerp) 968;;;###autoload(put 'reftex-level-indent 'safe-local-variable 'integerp)
969 969
970(defcustom reftex-guess-label-type t 970(defcustom reftex-guess-label-type t
971 "*Non-nil means, `reftex-reference' will try to guess the label type. 971 "Non-nil means, `reftex-reference' will try to guess the label type.
972To do that, RefTeX will look at the word before the cursor and compare it with 972To do that, RefTeX will look at the word before the cursor and compare it with
973the words given in `reftex-label-alist'. When it finds a match, RefTeX will 973the words given in `reftex-label-alist'. When it finds a match, RefTeX will
974immediately offer the correct label menu - otherwise it will prompt you for 974immediately offer the correct label menu - otherwise it will prompt you for
@@ -1009,7 +1009,7 @@ string to insert into the buffer."
1009 1009
1010(defvar reftex-bibfile-ignore-list nil) ; compatibility 1010(defvar reftex-bibfile-ignore-list nil) ; compatibility
1011(defcustom reftex-bibfile-ignore-regexps nil 1011(defcustom reftex-bibfile-ignore-regexps nil
1012 "*List of regular expressions to exclude files in \\bibliography{..}. 1012 "List of regular expressions to exclude files in \\bibliography{..}.
1013File names matched by these regexps will not be parsed by RefTeX. 1013File names matched by these regexps will not be parsed by RefTeX.
1014Intended for files which contain only `@string' macro definitions and the 1014Intended for files which contain only `@string' macro definitions and the
1015like, which are ignored by RefTeX anyway." 1015like, which are ignored by RefTeX anyway."
@@ -1018,7 +1018,7 @@ like, which are ignored by RefTeX anyway."
1018 :type '(repeat (regexp))) 1018 :type '(repeat (regexp)))
1019 1019
1020(defcustom reftex-default-bibliography nil 1020(defcustom reftex-default-bibliography nil
1021 "*List of BibTeX database files which should be used if none are specified. 1021 "List of BibTeX database files which should be used if none are specified.
1022When `reftex-citation' is called from a document which has neither a 1022When `reftex-citation' is called from a document which has neither a
1023`\\bibliography{..}' statement nor a `thebibliography' environment, 1023`\\bibliography{..}' statement nor a `thebibliography' environment,
1024RefTeX will scan these files instead. Intended for using `reftex-citation' 1024RefTeX will scan these files instead. Intended for using `reftex-citation'
@@ -1028,7 +1028,7 @@ path."
1028 :type '(repeat (file))) 1028 :type '(repeat (file)))
1029 1029
1030(defcustom reftex-sort-bibtex-matches 'reverse-year 1030(defcustom reftex-sort-bibtex-matches 'reverse-year
1031 "*Sorting of the entries found in BibTeX databases by reftex-citation. 1031 "Sorting of the entries found in BibTeX databases by reftex-citation.
1032Possible values: 1032Possible values:
1033nil Do not sort entries. 1033nil Do not sort entries.
1034'author Sort entries by author name. 1034'author Sort entries by author name.
@@ -1041,7 +1041,7 @@ nil Do not sort entries.
1041 (const :tag "by year, reversed" reverse-year))) 1041 (const :tag "by year, reversed" reverse-year)))
1042 1042
1043(defcustom reftex-cite-format 'default 1043(defcustom reftex-cite-format 'default
1044 "*The format of citations to be inserted into the buffer. 1044 "The format of citations to be inserted into the buffer.
1045It can be a string or an alist or a symbol. In the simplest case this 1045It can be a string or an alist or a symbol. In the simplest case this
1046is just the string \"\\cite{%l}\", which is also the default. See the 1046is just the string \"\\cite{%l}\", which is also the default. See the
1047definition of `reftex-cite-format-builtin' for more complex examples. 1047definition of `reftex-cite-format-builtin' for more complex examples.
@@ -1105,7 +1105,7 @@ E.g.: (setq reftex-cite-format 'natbib)"
1105 (string :tag "Format string" ""))))) 1105 (string :tag "Format string" "")))))
1106 1106
1107(defcustom reftex-cite-prompt-optional-args 'maybe 1107(defcustom reftex-cite-prompt-optional-args 'maybe
1108 "*Non-nil means, prompt for empty optional arguments in cite macros. 1108 "Non-nil means, prompt for empty optional arguments in cite macros.
1109When an entry in `reftex-cite-format' ist given with square brackets to 1109When an entry in `reftex-cite-format' ist given with square brackets to
1110indicate optional arguments (for example \\cite[][]{%l}), RefTeX can 1110indicate optional arguments (for example \\cite[][]{%l}), RefTeX can
1111prompt for values. Possible values are: 1111prompt for values. Possible values are:
@@ -1123,7 +1123,7 @@ the buffer. See `reftex-cite-cleanup-optional-args'."
1123 (const :tag "Never" nil))) 1123 (const :tag "Never" nil)))
1124 1124
1125(defcustom reftex-cite-cleanup-optional-args t 1125(defcustom reftex-cite-cleanup-optional-args t
1126 "*Non-nil means, remove unnecessary empty optional arguments in cite macros. 1126 "Non-nil means, remove unnecessary empty optional arguments in cite macros.
1127The cite macros provided by some packages (for example 1127The cite macros provided by some packages (for example
1128natbib) allow specifying two optional arguments, one for a prefix to 1128natbib) allow specifying two optional arguments, one for a prefix to
1129the citation, and a second for a postfix. When only one optional 1129the citation, and a second for a postfix. When only one optional
@@ -1141,7 +1141,7 @@ can be turned off."
1141 :type 'boolean) 1141 :type 'boolean)
1142 1142
1143(defcustom reftex-comment-citations nil 1143(defcustom reftex-comment-citations nil
1144 "*Non-nil means add a comment for each citation describing the full entry. 1144 "Non-nil means add a comment for each citation describing the full entry.
1145The comment is formatted according to `reftex-cite-comment-format'." 1145The comment is formatted according to `reftex-cite-comment-format'."
1146 :group 'reftex-citation-support 1146 :group 'reftex-citation-support
1147 :type 'boolean) 1147 :type 'boolean)
@@ -1195,7 +1195,7 @@ should return the string to insert into the buffer."
1195 :group 'reftex) 1195 :group 'reftex)
1196 1196
1197(defcustom reftex-support-index t 1197(defcustom reftex-support-index t
1198 "*Non-nil means, index entries are parsed as well. 1198 "Non-nil means, index entries are parsed as well.
1199Index support is resource intensive and the internal structure holding the 1199Index support is resource intensive and the internal structure holding the
1200parsed information can become quite big. Therefore it can be turned off. 1200parsed information can become quite big. Therefore it can be turned off.
1201When this is nil and you execute a command which requires index support, 1201When this is nil and you execute a command which requires index support,
@@ -1354,7 +1354,7 @@ has higher priority than this logical `or'."
1354 :type 'regexp) 1354 :type 'regexp)
1355 1355
1356(defcustom reftex-index-phrases-search-whole-words t 1356(defcustom reftex-index-phrases-search-whole-words t
1357 "*Non-nil means phrases search will look for whole words, not subwords. 1357 "Non-nil means phrases search will look for whole words, not subwords.
1358This works by requiring word boundaries at the beginning and end of 1358This works by requiring word boundaries at the beginning and end of
1359the search string. When the search phrase already has a non-word-char 1359the search string. When the search phrase already has a non-word-char
1360at one of these points, no word boundary is required there." 1360at one of these points, no word boundary is required there."
@@ -1362,7 +1362,7 @@ at one of these points, no word boundary is required there."
1362 :type 'boolean) 1362 :type 'boolean)
1363 1363
1364(defcustom reftex-index-phrases-case-fold-search t 1364(defcustom reftex-index-phrases-case-fold-search t
1365 "*Non-nil means, searching for index phrases will ignore case." 1365 "Non-nil means, searching for index phrases will ignore case."
1366 :group 'reftex-index-support 1366 :group 'reftex-index-support
1367 :type 'boolean) 1367 :type 'boolean)
1368 1368
@@ -1375,7 +1375,7 @@ If the function returns nil, the current match is skipped."
1375 (function))) 1375 (function)))
1376 1376
1377(defcustom reftex-index-phrases-skip-indexed-matches nil 1377(defcustom reftex-index-phrases-skip-indexed-matches nil
1378 "*Non-nil means, skip matches which appear to be indexed already. 1378 "Non-nil means, skip matches which appear to be indexed already.
1379When doing global indexing from the phrases buffer, searches for some 1379When doing global indexing from the phrases buffer, searches for some
1380phrases may match at places where that phrase was already indexed. In 1380phrases may match at places where that phrase was already indexed. In
1381particular when indexing an already processed document again, this 1381particular when indexing an already processed document again, this
@@ -1387,7 +1387,7 @@ be ignored."
1387 :type 'boolean) 1387 :type 'boolean)
1388 1388
1389(defcustom reftex-index-phrases-wrap-long-lines nil 1389(defcustom reftex-index-phrases-wrap-long-lines nil
1390 "*Non-nil means, when indexing from the phrases buffer, wrap lines. 1390 "Non-nil means, when indexing from the phrases buffer, wrap lines.
1391Inserting indexing commands in a line makes the line longer - often 1391Inserting indexing commands in a line makes the line longer - often
1392so long that it does not fit onto the screen. When this variable is 1392so long that it does not fit onto the screen. When this variable is
1393non-nil, newlines will be added as necessary before and/or after the 1393non-nil, newlines will be added as necessary before and/or after the
@@ -1397,7 +1397,7 @@ phrase and its index command will always end up on a single line."
1397 :type 'boolean) 1397 :type 'boolean)
1398 1398
1399(defcustom reftex-index-phrases-sort-prefers-entry nil 1399(defcustom reftex-index-phrases-sort-prefers-entry nil
1400 "*Non-nil means when sorting phrase lines, the explicit index entry is used. 1400 "Non-nil means when sorting phrase lines, the explicit index entry is used.
1401Phrase lines in the phrases buffer contain a search phrase, and 1401Phrase lines in the phrases buffer contain a search phrase, and
1402sorting is normally based on these. Some phrase lines also have 1402sorting is normally based on these. Some phrase lines also have
1403an explicit index argument specified. When this variable is non-nil, 1403an explicit index argument specified. When this variable is non-nil,
@@ -1406,7 +1406,7 @@ the index argument will be used for sorting."
1406 :type 'boolean) 1406 :type 'boolean)
1407 1407
1408(defcustom reftex-index-phrases-sort-in-blocks t 1408(defcustom reftex-index-phrases-sort-in-blocks t
1409 "*Non-nil means, empty and comment lines separate phrase buffer into blocks. 1409 "Non-nil means, empty and comment lines separate phrase buffer into blocks.
1410Sorting will then preserve blocks, so that lines are re-arranged only 1410Sorting will then preserve blocks, so that lines are re-arranged only
1411within blocks." 1411within blocks."
1412 :group 'reftex-index-support 1412 :group 'reftex-index-support
@@ -1425,13 +1425,13 @@ to that section."
1425 :type '(string :tag "Capital letters")) 1425 :type '(string :tag "Capital letters"))
1426 1426
1427(defcustom reftex-index-include-context nil 1427(defcustom reftex-index-include-context nil
1428 "*Non-nil means, display the index definition context in the index buffer. 1428 "Non-nil means, display the index definition context in the index buffer.
1429This flag may also be toggled from the index buffer with the `c' key." 1429This flag may also be toggled from the index buffer with the `c' key."
1430 :group 'reftex-index-support 1430 :group 'reftex-index-support
1431 :type 'boolean) 1431 :type 'boolean)
1432 1432
1433(defcustom reftex-index-follow-mode nil 1433(defcustom reftex-index-follow-mode nil
1434 "*Non-nil means, point in *Index* buffer will cause other window to follow. 1434 "Non-nil means, point in *Index* buffer will cause other window to follow.
1435The other window will show the corresponding part of the document. 1435The other window will show the corresponding part of the document.
1436This flag can be toggled from within the *Index* buffer with the `f' key." 1436This flag can be toggled from within the *Index* buffer with the `f' key."
1437 :group 'reftex-table-of-contents-browser 1437 :group 'reftex-table-of-contents-browser
@@ -1463,7 +1463,7 @@ which subgroup of the match should be highlighted."
1463 (integer :tag "Highlight Group")))) 1463 (integer :tag "Highlight Group"))))
1464 1464
1465(defcustom reftex-auto-view-crossref t 1465(defcustom reftex-auto-view-crossref t
1466 "*Non-nil means, initially turn automatic viewing of crossref info on. 1466 "Non-nil means, initially turn automatic viewing of crossref info on.
1467Automatic viewing of crossref info normally uses the echo area. 1467Automatic viewing of crossref info normally uses the echo area.
1468Whenever point is idle for more than `reftex-idle-time' seconds on the 1468Whenever point is idle for more than `reftex-idle-time' seconds on the
1469argument of a \\ref or \\cite macro, and no other message is being 1469argument of a \\ref or \\cite macro, and no other message is being
@@ -1478,20 +1478,20 @@ This feature can be turned on and off from the menu
1478 (const :tag "in Other Window" window))) 1478 (const :tag "in Other Window" window)))
1479 1479
1480(defcustom reftex-idle-time 1.2 1480(defcustom reftex-idle-time 1.2
1481 "*Time (secs) Emacs has to be idle before automatic crossref display is done. 1481 "Time (secs) Emacs has to be idle before automatic crossref display is done.
1482Applies also to toc recentering." 1482Applies also to toc recentering."
1483 :group 'reftex-viewing-cross-references 1483 :group 'reftex-viewing-cross-references
1484 :type 'number) 1484 :type 'number)
1485 1485
1486(defcustom reftex-revisit-to-echo nil 1486(defcustom reftex-revisit-to-echo nil
1487 "*Non-nil means, automatic citation display will revisit files if necessary. 1487 "Non-nil means, automatic citation display will revisit files if necessary.
1488When nil, citation display in echo area will only be active for cached 1488When nil, citation display in echo area will only be active for cached
1489entries and for BibTeX database files with live associated buffers." 1489entries and for BibTeX database files with live associated buffers."
1490 :group 'reftex-viewing-cross-references 1490 :group 'reftex-viewing-cross-references
1491 :type 'boolean) 1491 :type 'boolean)
1492 1492
1493(defcustom reftex-cache-cite-echo t 1493(defcustom reftex-cache-cite-echo t
1494 "*Non-nil means, the information displayed in the echo area for cite macros 1494 "Non-nil means, the information displayed in the echo area for cite macros
1495is cached and even saved along with the parsing information. The cache 1495is cached and even saved along with the parsing information. The cache
1496survives document scans. In order to clear it, use M-x reftex-reset-mode." 1496survives document scans. In order to clear it, use M-x reftex-reset-mode."
1497 :group 'reftex-viewing-cross-references 1497 :group 'reftex-viewing-cross-references
@@ -1511,7 +1511,7 @@ for X-Symbol, but may have other uses as well."
1511 :group 'reftex) 1511 :group 'reftex)
1512 1512
1513(defcustom reftex-texpath-environment-variables '("TEXINPUTS") 1513(defcustom reftex-texpath-environment-variables '("TEXINPUTS")
1514 "*List of specifications how to retrieve the search path for TeX files. 1514 "List of specifications how to retrieve the search path for TeX files.
1515Several entries are possible. 1515Several entries are possible.
1516- If an element is the name of an environment variable, its content is used. 1516- If an element is the name of an environment variable, its content is used.
1517- If an element starts with an exclamation mark, it is used as a command 1517- If an element starts with an exclamation mark, it is used as a command
@@ -1526,7 +1526,7 @@ See also `reftex-use-external-file-finders'."
1526 :type '(repeat (string :tag "Specification"))) 1526 :type '(repeat (string :tag "Specification")))
1527 1527
1528(defcustom reftex-bibpath-environment-variables '("BIBINPUTS" "TEXBIB") 1528(defcustom reftex-bibpath-environment-variables '("BIBINPUTS" "TEXBIB")
1529 "*List of specifications how to retrieve search path for .bib database files. 1529 "List of specifications how to retrieve search path for .bib database files.
1530Several entries are possible. 1530Several entries are possible.
1531- If an element is the name of an environment variable, its content is used. 1531- If an element is the name of an environment variable, its content is used.
1532- If an element starts with an exclamation mark, it is used as a command 1532- If an element starts with an exclamation mark, it is used as a command
@@ -1543,7 +1543,7 @@ See also `reftex-use-external-file-finders'."
1543 1543
1544(defcustom reftex-file-extensions '(("tex" . (".tex" ".ltx")) 1544(defcustom reftex-file-extensions '(("tex" . (".tex" ".ltx"))
1545 ("bib" . (".bib"))) 1545 ("bib" . (".bib")))
1546 "*Association list with file extensions for different file types. 1546 "Association list with file extensions for different file types.
1547This is a list of items, each item is like: (TYPE . (DEF-EXT OTHER-EXT ...)) 1547This is a list of items, each item is like: (TYPE . (DEF-EXT OTHER-EXT ...))
1548 1548
1549TYPE: File type like \"bib\" or \"tex\". 1549TYPE: File type like \"bib\" or \"tex\".
@@ -1572,7 +1572,7 @@ Note that if you are using external file finders, this option has no effect."
1572 :type 'boolean) 1572 :type 'boolean)
1573 1573
1574(defcustom reftex-search-unrecursed-path-first t 1574(defcustom reftex-search-unrecursed-path-first t
1575 "*Non-nil means, search all specified directories before trying recursion. 1575 "Non-nil means, search all specified directories before trying recursion.
1576Thus, in a path \".//:/tex/\", search first \"./\", then \"/tex/\" and then 1576Thus, in a path \".//:/tex/\", search first \"./\", then \"/tex/\" and then
1577all subdirectories of \"./\". If this option is nil, the subdirectories of 1577all subdirectories of \"./\". If this option is nil, the subdirectories of
1578\"./\" are searched before \"/tex/\". This is mainly for speed - most of the 1578\"./\" are searched before \"/tex/\". This is mainly for speed - most of the
@@ -1583,7 +1583,7 @@ in wrong sequence."
1583 :type 'boolean) 1583 :type 'boolean)
1584 1584
1585(defcustom reftex-use-external-file-finders nil 1585(defcustom reftex-use-external-file-finders nil
1586 "*Non-nil means, use external programs to find files. 1586 "Non-nil means, use external programs to find files.
1587Normally, RefTeX searches the paths given in the environment variables 1587Normally, RefTeX searches the paths given in the environment variables
1588TEXINPUTS and BIBINPUTS to find TeX files and BibTeX database files. 1588TEXINPUTS and BIBINPUTS to find TeX files and BibTeX database files.
1589With this option turned on, it calls an external program specified in the 1589With this option turned on, it calls an external program specified in the
@@ -1595,7 +1595,7 @@ the variables `reftex-texpath-environment-variables' and
1595 1595
1596(defcustom reftex-external-file-finders '(("tex" . "kpsewhich -format=.tex %f") 1596(defcustom reftex-external-file-finders '(("tex" . "kpsewhich -format=.tex %f")
1597 ("bib" . "kpsewhich -format=.bib %f")) 1597 ("bib" . "kpsewhich -format=.bib %f"))
1598 "*Association list with external programs to call for finding files. 1598 "Association list with external programs to call for finding files.
1599Each entry is a cons cell (TYPE . PROGRAM). 1599Each entry is a cons cell (TYPE . PROGRAM).
1600TYPE is either \"tex\" or \"bib\". PROGRAM is the external program to use with 1600TYPE is either \"tex\" or \"bib\". PROGRAM is the external program to use with
1601any arguments. %f will be replaced by the name of the file to be found. 1601any arguments. %f will be replaced by the name of the file to be found.
@@ -1612,7 +1612,7 @@ Only relevant when `reftex-use-external-file-finders' is non-nil."
1612 :group 'reftex) 1612 :group 'reftex)
1613 1613
1614(defcustom reftex-keep-temporary-buffers 1 1614(defcustom reftex-keep-temporary-buffers 1
1615 "*Non-nil means, keep buffers created for parsing and lookup. 1615 "Non-nil means, keep buffers created for parsing and lookup.
1616RefTeX sometimes needs to visit files related to the current document. 1616RefTeX sometimes needs to visit files related to the current document.
1617We distinguish files visited for 1617We distinguish files visited for
1618PARSING: Parts of a multifile document loaded when (re)-parsing the document. 1618PARSING: Parts of a multifile document loaded when (re)-parsing the document.
@@ -1637,7 +1637,7 @@ upon the variable `reftex-initialize-temporary-buffers'."
1637 (const :tag "Keep lookup buffers only" 1))) 1637 (const :tag "Keep lookup buffers only" 1)))
1638 1638
1639(defcustom reftex-initialize-temporary-buffers nil 1639(defcustom reftex-initialize-temporary-buffers nil
1640 "*Non-nil means do initializations even when visiting file temporarily. 1640 "Non-nil means do initializations even when visiting file temporarily.
1641When nil, RefTeX may turn off find-file hooks and other stuff to briefly 1641When nil, RefTeX may turn off find-file hooks and other stuff to briefly
1642visit a file. 1642visit a file.
1643When t, the full default initializations are done (find-file-hook etc.). 1643When t, the full default initializations are done (find-file-hook etc.).
@@ -1651,14 +1651,14 @@ do a minimal initialization."
1651 (function-item)))) 1651 (function-item))))
1652 1652
1653(defcustom reftex-no-include-regexps '("\\.pstex_t\\'") 1653(defcustom reftex-no-include-regexps '("\\.pstex_t\\'")
1654 "*List of regular expressions to exclude certain input files from parsing. 1654 "List of regular expressions to exclude certain input files from parsing.
1655If the name of a file included via \\include or \\input is matched by any 1655If the name of a file included via \\include or \\input is matched by any
1656of the regular expressions in this list, that file is not parsed by RefTeX." 1656of the regular expressions in this list, that file is not parsed by RefTeX."
1657 :group 'reftex-optimizations-for-large-documents 1657 :group 'reftex-optimizations-for-large-documents
1658 :type '(repeat (regexp))) 1658 :type '(repeat (regexp)))
1659 1659
1660(defcustom reftex-enable-partial-scans nil 1660(defcustom reftex-enable-partial-scans nil
1661 "*Non-nil means, re-parse only 1 file when asked to re-parse. 1661 "Non-nil means, re-parse only 1 file when asked to re-parse.
1662Re-parsing is normally requested with a `C-u' prefix to many RefTeX commands, 1662Re-parsing is normally requested with a `C-u' prefix to many RefTeX commands,
1663or with the `r' key in menus. When this option is t in a multifile document, 1663or with the `r' key in menus. When this option is t in a multifile document,
1664we will only parse the current buffer, or the file associated with the label 1664we will only parse the current buffer, or the file associated with the label
@@ -1669,7 +1669,7 @@ in menus."
1669 :type 'boolean) 1669 :type 'boolean)
1670 1670
1671(defcustom reftex-allow-automatic-rescan t 1671(defcustom reftex-allow-automatic-rescan t
1672 "*Non-nil means, RefTeX may rescan the document when this seems necessary. 1672 "Non-nil means, RefTeX may rescan the document when this seems necessary.
1673Currently this applies only to rescanning after label insertion, when 1673Currently this applies only to rescanning after label insertion, when
1674the new label cannot be inserted correctly into the internal label 1674the new label cannot be inserted correctly into the internal label
1675list." 1675list."
@@ -1677,7 +1677,7 @@ list."
1677 :type 'boolean) 1677 :type 'boolean)
1678 1678
1679(defcustom reftex-save-parse-info nil 1679(defcustom reftex-save-parse-info nil
1680 "*Non-nil means, save information gathered with parsing in a file. 1680 "Non-nil means, save information gathered with parsing in a file.
1681The file MASTER.rel in the same directory as MASTER.tex is used to save the 1681The file MASTER.rel in the same directory as MASTER.tex is used to save the
1682information. When this variable is t, 1682information. When this variable is t,
1683- accessing the parsing information for the first time in an editing session 1683- accessing the parsing information for the first time in an editing session
@@ -1688,13 +1688,13 @@ information. When this variable is t,
1688 :type 'boolean) 1688 :type 'boolean)
1689 1689
1690(defcustom reftex-parse-file-extension ".rel" 1690(defcustom reftex-parse-file-extension ".rel"
1691 "*File extension for the file in which parser information is stored. 1691 "File extension for the file in which parser information is stored.
1692This extension is added to the base name of the master file." 1692This extension is added to the base name of the master file."
1693 :group 'reftex-optimizations-for-large-documents 1693 :group 'reftex-optimizations-for-large-documents
1694 :type 'string) 1694 :type 'string)
1695 1695
1696(defcustom reftex-use-multiple-selection-buffers nil 1696(defcustom reftex-use-multiple-selection-buffers nil
1697 "*Non-nil means use a separate selection buffer for each label type. 1697 "Non-nil means use a separate selection buffer for each label type.
1698These buffers are kept from one selection to the next and need not to be 1698These buffers are kept from one selection to the next and need not to be
1699created for each use - so the menu generally comes up faster. The 1699created for each use - so the menu generally comes up faster. The
1700selection buffers will be erased (and therefore updated) automatically 1700selection buffers will be erased (and therefore updated) automatically
@@ -1705,7 +1705,7 @@ when new labels in its category are added. See the variable
1705 :type 'boolean) 1705 :type 'boolean)
1706 1706
1707(defcustom reftex-auto-update-selection-buffers t 1707(defcustom reftex-auto-update-selection-buffers t
1708 "*Non-nil means, selection buffers will be updated automatically. 1708 "Non-nil means, selection buffers will be updated automatically.
1709When a new label is defined with `reftex-label', all selection buffers 1709When a new label is defined with `reftex-label', all selection buffers
1710associated with that label category are emptied, in order to force an 1710associated with that label category are emptied, in order to force an
1711update upon next use. When nil, the buffers are left alone and have to be 1711update upon next use. When nil, the buffers are left alone and have to be
@@ -1724,14 +1724,14 @@ The value of this variable will only have any effect when
1724 :group 'reftex) 1724 :group 'reftex)
1725 1725
1726(defcustom reftex-use-fonts t 1726(defcustom reftex-use-fonts t
1727 "*Non-nil means, use fonts in *toc* and selection buffers. 1727 "Non-nil means, use fonts in *toc* and selection buffers.
1728Font-lock must be loaded as well to actually get fontified display. 1728Font-lock must be loaded as well to actually get fontified display.
1729When changing this option, a rescan may be necessary to activate the change." 1729When changing this option, a rescan may be necessary to activate the change."
1730 :group 'reftex-fontification-configurations 1730 :group 'reftex-fontification-configurations
1731 :type 'boolean) 1731 :type 'boolean)
1732 1732
1733(defcustom reftex-refontify-context 1 1733(defcustom reftex-refontify-context 1
1734 "*Non-nil means, re-fontify the context in the label menu with font-lock. 1734 "Non-nil means, re-fontify the context in the label menu with font-lock.
1735This slightly slows down the creation of the label menu. It is only necessary 1735This slightly slows down the creation of the label menu. It is only necessary
1736when you definitely want the context fontified. 1736when you definitely want the context fontified.
1737 1737
@@ -1748,7 +1748,7 @@ The option is ignored when `reftex-use-fonts' is nil."
1748 (const :tag "When necessary" 1))) 1748 (const :tag "When necessary" 1)))
1749 1749
1750(defcustom reftex-highlight-selection 'cursor 1750(defcustom reftex-highlight-selection 'cursor
1751 "*Non-nil mean, highlight selected text in selection and *toc* buffers. 1751 "Non-nil mean, highlight selected text in selection and *toc* buffers.
1752Normally, the text near the cursor is the selected text, and it is 1752Normally, the text near the cursor is the selected text, and it is
1753highlighted. This is the entry most keys in the selection and *toc* 1753highlighted. This is the entry most keys in the selection and *toc*
1754buffers act on. However, if you mainly use the mouse to select an 1754buffers act on. However, if you mainly use the mouse to select an
@@ -1861,7 +1861,7 @@ bindings with this prefix bound to `reftex-extra-bindings-map'."
1861 :type 'boolean) 1861 :type 'boolean)
1862 1862
1863(defcustom reftex-plug-into-AUCTeX nil 1863(defcustom reftex-plug-into-AUCTeX nil
1864 "*Plug-in flags for AUCTeX interface. 1864 "Plug-in flags for AUCTeX interface.
1865This variable is a list of 4 boolean flags. When a flag is non-nil, 1865This variable is a list of 4 boolean flags. When a flag is non-nil,
1866RefTeX will 1866RefTeX will
1867 1867
@@ -1896,7 +1896,7 @@ may require a restart of Emacs in order to become effective."
1896 ))) 1896 )))
1897 1897
1898(defcustom reftex-allow-detached-macro-args nil 1898(defcustom reftex-allow-detached-macro-args nil
1899 "*Non-nil means, allow arguments of macros to be detached by whitespace. 1899 "Non-nil means, allow arguments of macros to be detached by whitespace.
1900When this is t, `aaa' will be considered as argument of \\bb in the following 1900When this is t, `aaa' will be considered as argument of \\bb in the following
1901construct: \\bbb [xxx] {aaa}." 1901construct: \\bbb [xxx] {aaa}."
1902 :group 'reftex-miscellaneous-configurations 1902 :group 'reftex-miscellaneous-configurations
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 09f6b6b7cf2..46ba2cf8599 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -292,7 +292,7 @@ Any terminating `>' or `/' is not matched.")
292;; for font-lock, but must be defvar'ed after 292;; for font-lock, but must be defvar'ed after
293;; sgml-font-lock-keywords-1 and sgml-font-lock-keywords-2 above 293;; sgml-font-lock-keywords-1 and sgml-font-lock-keywords-2 above
294(defvar sgml-font-lock-keywords sgml-font-lock-keywords-1 294(defvar sgml-font-lock-keywords sgml-font-lock-keywords-1
295 "*Rules for highlighting SGML code. See also `sgml-tag-face-alist'.") 295 "Rules for highlighting SGML code. See also `sgml-tag-face-alist'.")
296 296
297(defconst sgml-syntax-propertize-function 297(defconst sgml-syntax-propertize-function
298 (syntax-propertize-rules 298 (syntax-propertize-rules
@@ -1843,7 +1843,7 @@ This takes effect when first loading the library.")
1843 ("u") 1843 ("u")
1844 ("var") 1844 ("var")
1845 ("wbr" t))) 1845 ("wbr" t)))
1846 "*Value of `sgml-tag-alist' for HTML mode.") 1846 "Value of `sgml-tag-alist' for HTML mode.")
1847 1847
1848(defvar html-tag-help 1848(defvar html-tag-help
1849 `(,@sgml-tag-help 1849 `(,@sgml-tag-help
@@ -1936,7 +1936,7 @@ This takes effect when first loading the library.")
1936 ("ul" . "Unordered list") 1936 ("ul" . "Unordered list")
1937 ("var" . "Math variable face") 1937 ("var" . "Math variable face")
1938 ("wbr" . "Enable <br> within <nobr>")) 1938 ("wbr" . "Enable <br> within <nobr>"))
1939 "*Value of `sgml-tag-help' for HTML mode.") 1939 "Value of `sgml-tag-help' for HTML mode.")
1940 1940
1941 1941
1942;;;###autoload 1942;;;###autoload
@@ -2010,7 +2010,7 @@ To work around that, do:
2010 2010
2011(defvar html-imenu-regexp 2011(defvar html-imenu-regexp
2012 "\\s-*<h\\([1-9]\\)[^\n<>]*>\\(<[^\n<>]*>\\)*\\s-*\\([^\n<>]*\\)" 2012 "\\s-*<h\\([1-9]\\)[^\n<>]*>\\(<[^\n<>]*>\\)*\\s-*\\([^\n<>]*\\)"
2013 "*A regular expression matching a head line to be added to the menu. 2013 "A regular expression matching a head line to be added to the menu.
2014The first `match-string' should be a number from 1-9. 2014The first `match-string' should be a number from 1-9.
2015The second `match-string' matches extra tags and is ignored. 2015The second `match-string' matches extra tags and is ignored.
2016The third `match-string' will be the used in the menu.") 2016The third `match-string' will be the used in the menu.")
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index e98d78ad439..0463ac52b1e 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -844,7 +844,7 @@ simply by any key input."
844(defvar table-disable-menu (null (and (locate-library "easymenu") 844(defvar table-disable-menu (null (and (locate-library "easymenu")
845 (require 'easymenu) 845 (require 'easymenu)
846 (fboundp 'easy-menu-add-item))) 846 (fboundp 'easy-menu-add-item)))
847 "*When non-nil, use of menu by table package is disabled. 847 "When non-nil, use of menu by table package is disabled.
848It must be set before loading this package `table.el' for the first 848It must be set before loading this package `table.el' for the first
849time.") 849time.")
850 850
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index c5cad045c3f..9472d7df879 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -265,7 +265,7 @@ Deleted when the \\[tex-region] or \\[tex-buffer] is next run, or when the
265tex shell terminates.") 265tex 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
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 3ec59ebcd3e..d318a97d377 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -93,7 +93,7 @@ If optional argument HERE is non-nil, insert info at point."
93 (@unnumberedsubsubsec . @unnumberedsubsec) 93 (@unnumberedsubsubsec . @unnumberedsubsec)
94 (@subsubheading . @subheading) 94 (@subsubheading . @subheading)
95 (@appendixsubsubsec . @appendixsubsec)) 95 (@appendixsubsubsec . @appendixsubsec))
96 "*An alist of next higher levels for chapters, sections, etc... 96 "An alist of next higher levels for chapters, sections, etc...
97For example, section to chapter, subsection to section. 97For example, section to chapter, subsection to section.
98Used by `texinfo-raise-lower-sections'. 98Used by `texinfo-raise-lower-sections'.
99The keys specify types of section; the values correspond to the next 99The keys specify types of section; the values correspond to the next
@@ -121,7 +121,7 @@ higher types.")
121 (@unnumberedsubsubsec . @unnumberedsubsubsec) 121 (@unnumberedsubsubsec . @unnumberedsubsubsec)
122 (@subsubheading . @subsubheading) 122 (@subsubheading . @subsubheading)
123 (@appendixsubsubsec . @appendixsubsubsec)) 123 (@appendixsubsubsec . @appendixsubsubsec))
124 "*An alist of next lower levels for chapters, sections, etc... 124 "An alist of next lower levels for chapters, sections, etc...
125For example, chapter to section, section to subsection. 125For example, chapter to section, section to subsection.
126Used by `texinfo-raise-lower-sections'. 126Used by `texinfo-raise-lower-sections'.
127The keys specify types of section; the values correspond to the next 127The keys specify types of section; the values correspond to the next
@@ -174,7 +174,7 @@ and don't split the file if large. You can use `Info-tagify' and
174 "done. Now save it." "done."))))) 174 "done. Now save it." "done.")))))
175 175
176(defvar texinfo-region-buffer-name "*Info Region*" 176(defvar texinfo-region-buffer-name "*Info Region*"
177 "*Name of the temporary buffer used by \\[texinfo-format-region].") 177 "Name of the temporary buffer used by \\[texinfo-format-region].")
178 178
179(defvar texinfo-pre-format-hook nil 179(defvar texinfo-pre-format-hook nil
180 "Hook called before the conversion of the Texinfo file to Info format. 180 "Hook called before the conversion of the Texinfo file to Info format.
@@ -1918,7 +1918,7 @@ Used by @refill indenting command to avoid indenting within lists, etc.")
1918;; Texinfo commands. 1918;; Texinfo commands.
1919 1919
1920(defvar texinfo-extra-inter-column-width 0 1920(defvar texinfo-extra-inter-column-width 0
1921 "*Number of extra spaces between entries (columns) in @multitable.") 1921 "Number of extra spaces between entries (columns) in @multitable.")
1922 1922
1923(defvar texinfo-multitable-buffer-name "*multitable-temporary-buffer*") 1923(defvar texinfo-multitable-buffer-name "*multitable-temporary-buffer*")
1924(defvar texinfo-multitable-rectangle-name "texinfo-multitable-temp-") 1924(defvar texinfo-multitable-rectangle-name "texinfo-multitable-temp-")
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 83ef834257a..70aa17cea6b 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -203,7 +203,7 @@ It comes after the chapter-level menu entries.")
203 (3 . (concat "\\(^@\\)\\(" texinfo-section-level-regexp "\\)\\>[ \t]*")) 203 (3 . (concat "\\(^@\\)\\(" texinfo-section-level-regexp "\\)\\>[ \t]*"))
204 (4 . (concat "\\(^@\\)\\(" texinfo-subsection-level-regexp "\\)\\>[ \t]+")) 204 (4 . (concat "\\(^@\\)\\(" texinfo-subsection-level-regexp "\\)\\>[ \t]+"))
205 (5 . (concat "\\(^@\\)\\(" texinfo-subsubsection-level-regexp "\\)\\>[ \t]+"))) 205 (5 . (concat "\\(^@\\)\\(" texinfo-subsubsection-level-regexp "\\)\\>[ \t]+")))
206 "*Regexps for searching for same level sections in a Texinfo file. 206 "Regexps for searching for same level sections in a Texinfo file.
207The keys are strings specifying the general hierarchical level in the 207The keys are strings specifying the general hierarchical level in the
208document; the values are regular expressions.") 208document; the values are regular expressions.")
209 209
@@ -231,7 +231,7 @@ document; the values are regular expressions.")
231 "\\|" 231 "\\|"
232 texinfo-chapter-level-regexp 232 texinfo-chapter-level-regexp
233 "\\)\\>[ \t]*\\)"))) 233 "\\)\\>[ \t]*\\)")))
234 "*Regexps for searching for higher level sections in a Texinfo file. 234 "Regexps for searching for higher level sections in a Texinfo file.
235The keys are strings specifying the general hierarchical level in the 235The keys are strings specifying the general hierarchical level in the
236document; the values are regular expressions.") 236document; the values are regular expressions.")
237 237
@@ -270,7 +270,7 @@ document; the values are regular expressions.")
270 "\\)\\>[ \t]+\\)")) 270 "\\)\\>[ \t]+\\)"))
271 ;; There's nothing below 5, use a bogus regexp that can't match. 271 ;; There's nothing below 5, use a bogus regexp that can't match.
272 (5 . "a\\(^\\)")) 272 (5 . "a\\(^\\)"))
273 "*Regexps for searching for lower level sections in a Texinfo file. 273 "Regexps for searching for lower level sections in a Texinfo file.
274The keys are strings specifying the general hierarchical level in the 274The keys are strings specifying the general hierarchical level in the
275document; the values are regular expressions.") 275document; the values are regular expressions.")
276 276
@@ -682,7 +682,7 @@ node within the section."
682 682
683;; try 32, but perhaps 24 is better 683;; try 32, but perhaps 24 is better
684(defvar texinfo-column-for-description 32 684(defvar texinfo-column-for-description 32
685 "*Column at which descriptions start in a Texinfo menu.") 685 "Column at which descriptions start in a Texinfo menu.")
686 686
687(defun texinfo-insert-menu (menu-list node-name) 687(defun texinfo-insert-menu (menu-list node-name)
688 "Insert formatted menu at point. 688 "Insert formatted menu at point.
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 00e69aa39cc..5762f019315 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -51,7 +51,7 @@
51 ("GMT-4" . -400) ("GMT-5" . -500) ("GMT-6" . -600) 51 ("GMT-4" . -400) ("GMT-5" . -500) ("GMT-6" . -600)
52 ("GMT-7" . -700) ("GMT-8" . -800) ("GMT-9" . -900) 52 ("GMT-7" . -700) ("GMT-8" . -800) ("GMT-9" . -900)
53 ("GMT-10" . -1000) ("GMT-11" . -1100) ("GMT-12" . -1200)) 53 ("GMT-10" . -1000) ("GMT-11" . -1100) ("GMT-12" . -1200))
54 "*Time differentials of timezone from GMT in +-HHMM form. 54 "Time differentials of timezone from GMT in +-HHMM form.
55This list is obsolescent, and is present only for backwards compatibility, 55This list is obsolescent, and is present only for backwards compatibility,
56because time zone names are ambiguous in practice. 56because time zone names are ambiguous in practice.
57Use `current-time-zone' instead.") 57Use `current-time-zone' instead.")
diff --git a/lisp/type-break.el b/lisp/type-break.el
index ee64fde1c67..f0c81125f0c 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -241,7 +241,7 @@ remove themselves after running.")
241 ("" 241 (""
242 type-break-mode-line-break-message 242 type-break-mode-line-break-message
243 type-break-mode-line-warning)) 243 type-break-mode-line-warning))
244 "*Format of messages in the mode line concerning typing breaks.") 244 "Format of messages in the mode line concerning typing breaks.")
245 245
246(defvar type-break-mode-line-break-message 246(defvar type-break-mode-line-break-message
247 '(type-break-mode-line-break-message-p 247 '(type-break-mode-line-break-message-p
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 03527bceee7..085785524b7 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -478,7 +478,7 @@ names (ie: DAV:resourcetype)."
478 478
479;;; Locking support 479;;; Locking support
480(defvar url-dav-lock-identifier (concat "mailto:" user-mail-address) 480(defvar url-dav-lock-identifier (concat "mailto:" user-mail-address)
481 "*URL used as contact information when creating locks in DAV. 481 "URL used as contact information when creating locks in DAV.
482This will be used as the contents of the DAV:owner/DAV:href tag to 482This will be used as the contents of the DAV:owner/DAV:href tag to
483identify the owner of a LOCK when requesting it. This will be shown 483identify the owner of a LOCK when requesting it. This will be shown
484to other users when the DAV:lockdiscovery property is requested, so 484to other users when the DAV:lockdiscovery property is requested, so
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 4bc5bd47488..d00a1174cdf 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -92,7 +92,7 @@
92 92
93(defvar url-handler-regexp 93(defvar url-handler-regexp
94 "\\`\\(https?\\|ftp\\|file\\|nfs\\)://" 94 "\\`\\(https?\\|ftp\\|file\\|nfs\\)://"
95 "*A regular expression for matching URLs handled by `file-name-handler-alist'. 95 "A regular expression for matching URLs handled by `file-name-handler-alist'.
96Some valid URL protocols just do not make sense to visit interactively 96Some valid URL protocols just do not make sense to visit interactively
97\(about, data, info, irc, mailto, etc\). This regular expression 97\(about, data, info, irc, mailto, etc\). This regular expression
98avoids conflicts with local files that look like URLs \(Gnus is 98avoids conflicts with local files that look like URLs \(Gnus is
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 7c988f9b119..0ea98cb06c9 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -64,7 +64,7 @@
64 ("facsimiletelephonenumber" . "Fax") 64 ("facsimiletelephonenumber" . "Fax")
65 ("postaladdress" . "Mailing Address") 65 ("postaladdress" . "Mailing Address")
66 ("description" . "Notes")) 66 ("description" . "Notes"))
67 "*An assoc list mapping LDAP attribute names to pretty descriptions of them.") 67 "An assoc list mapping LDAP attribute names to pretty descriptions of them.")
68 68
69(defvar url-ldap-attribute-formatters 69(defvar url-ldap-attribute-formatters
70 '(("mail" . (lambda (x) (format "<a href='mailto:%s'>%s</a>" x x))) 70 '(("mail" . (lambda (x) (format "<a href='mailto:%s'>%s</a>" x x)))
@@ -76,7 +76,7 @@
76 ("namingcontexts" . url-ldap-dn-formatter) 76 ("namingcontexts" . url-ldap-dn-formatter)
77 ("defaultnamingcontext" . url-ldap-dn-formatter) 77 ("defaultnamingcontext" . url-ldap-dn-formatter)
78 ("member" . url-ldap-dn-formatter)) 78 ("member" . url-ldap-dn-formatter))
79 "*An assoc list mapping LDAP attribute names to pretty formatters for them.") 79 "An assoc list mapping LDAP attribute names to pretty formatters for them.")
80 80
81(defsubst url-ldap-attribute-pretty-name (n) 81(defsubst url-ldap-attribute-pretty-name (n)
82 (or (cdr-safe (assoc (downcase n) url-ldap-pretty-names)) n)) 82 (or (cdr-safe (assoc (downcase n) url-ldap-pretty-names)) n))
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index a22d105b1a1..bfab147f267 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -29,7 +29,7 @@
29 29
30(defvar url-nfs-automounter-directory-spec 30(defvar url-nfs-automounter-directory-spec
31 "file:/net/%h%f" 31 "file:/net/%h%f"
32 "*How to invoke the NFS automounter. Certain % sequences are recognized. 32 "How to invoke the NFS automounter. Certain % sequences are recognized.
33 33
34%h -- the hostname of the NFS server 34%h -- the hostname of the NFS server
35%n -- the port # of the NFS server 35%n -- the port # of the NFS server
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index a56eb4cc810..ff18049e97b 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -212,7 +212,7 @@ Should be an assoc list of headers/contents.")
212 212
213;; FIXME!! (RFC 2616 gives examples like `compress, gzip'.) 213;; FIXME!! (RFC 2616 gives examples like `compress, gzip'.)
214(defvar url-mime-encoding-string nil 214(defvar url-mime-encoding-string nil
215 "*String to send in the Accept-encoding: field in HTTP requests.") 215 "String to send in the Accept-encoding: field in HTTP requests.")
216 216
217;; Perhaps the first few should actually be given decreasing `q's and 217;; Perhaps the first few should actually be given decreasing `q's and
218;; the list should be trimmed significantly. 218;; the list should be trimmed significantly.
@@ -233,7 +233,7 @@ Generated according to current coding system priorities."
233 ";q=0.5")))) 233 ";q=0.5"))))
234 234
235(defvar url-mime-charset-string nil 235(defvar url-mime-charset-string nil
236 "*String to send in the Accept-charset: field in HTTP requests. 236 "String to send in the Accept-charset: field in HTTP requests.
237The MIME charset corresponding to the most preferred coding system is 237The MIME charset corresponding to the most preferred coding system is
238given priority 1 and the rest are given priority 0.5.") 238given priority 1 and the rest are given priority 0.5.")
239 239
@@ -364,7 +364,7 @@ Currently supported methods:
364 364
365(defvar url-parse-syntax-table 365(defvar url-parse-syntax-table
366 (copy-syntax-table emacs-lisp-mode-syntax-table) 366 (copy-syntax-table emacs-lisp-mode-syntax-table)
367 "*A syntax table for parsing URLs.") 367 "A syntax table for parsing URLs.")
368 368
369(modify-syntax-entry ?' "\"" url-parse-syntax-table) 369(modify-syntax-entry ?' "\"" url-parse-syntax-table)
370(modify-syntax-entry ?` "\"" url-parse-syntax-table) 370(modify-syntax-entry ?` "\"" url-parse-syntax-table)
@@ -373,7 +373,7 @@ Currently supported methods:
373(modify-syntax-entry ?/ " " url-parse-syntax-table) 373(modify-syntax-entry ?/ " " url-parse-syntax-table)
374 374
375(defvar url-load-hook nil 375(defvar url-load-hook nil
376 "*Hooks to be run after initializing the URL library.") 376 "Hooks to be run after initializing the URL library.")
377 377
378;;; Make OS/2 happy - yeeks 378;;; Make OS/2 happy - yeeks
379;; (defvar tcp-binary-process-input-services nil 379;; (defvar tcp-binary-process-input-services nil
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index be7bba54378..b9c3d0d385a 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -1122,17 +1122,17 @@ parentheses."
1122;;;###autoload 1122;;;###autoload
1123(defvar add-log-lisp-like-modes 1123(defvar add-log-lisp-like-modes
1124 '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode) 1124 '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)
1125 "*Modes that look like Lisp to `add-log-current-defun'.") 1125 "Modes that look like Lisp to `add-log-current-defun'.")
1126 1126
1127;;;###autoload 1127;;;###autoload
1128(defvar add-log-c-like-modes 1128(defvar add-log-c-like-modes
1129 '(c-mode c++-mode c++-c-mode objc-mode) 1129 '(c-mode c++-mode c++-c-mode objc-mode)
1130 "*Modes that look like C to `add-log-current-defun'.") 1130 "Modes that look like C to `add-log-current-defun'.")
1131 1131
1132;;;###autoload 1132;;;###autoload
1133(defvar add-log-tex-like-modes 1133(defvar add-log-tex-like-modes
1134 '(TeX-mode plain-TeX-mode LaTeX-mode tex-mode) 1134 '(TeX-mode plain-TeX-mode LaTeX-mode tex-mode)
1135 "*Modes that look like TeX to `add-log-current-defun'.") 1135 "Modes that look like TeX to `add-log-current-defun'.")
1136 1136
1137(declare-function c-cpp-define-name "cc-cmds" ()) 1137(declare-function c-cpp-define-name "cc-cmds" ())
1138(declare-function c-defun-name "cc-cmds" ()) 1138(declare-function c-defun-name "cc-cmds" ())
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index a80197486a2..f803cc43441 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -395,7 +395,7 @@ the list is a three-string list TAG, KIND, REV."
395 (cvs-tree-use-jisx0208 'jisx0208) 395 (cvs-tree-use-jisx0208 'jisx0208)
396 ((char-displayable-p ?━) 'unicode) 396 ((char-displayable-p ?━) 'unicode)
397 ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208)) 397 ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208))
398 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'. 398 "Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
399Otherwise, default to ASCII chars like +, - and |.") 399Otherwise, default to ASCII chars like +, - and |.")
400 400
401(defconst cvs-tree-char-space 401(defconst cvs-tree-char-space
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 37b7fce6f32..6d67356852c 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -101,7 +101,7 @@ the command \\[ediff-show-diff-output]. Use the variable
101 :group 'ediff-diff) 101 :group 'ediff-diff)
102 102
103(ediff-defvar-local ediff-ignore-case nil 103(ediff-defvar-local ediff-ignore-case nil
104 "*If t, skip over difference regions that differ only in letter case. 104 "If t, skip over difference regions that differ only in letter case.
105This variable can be set either in .emacs or toggled interactively. 105This variable can be set either in .emacs or toggled interactively.
106Use `setq-default' if setting it in .emacs") 106Use `setq-default' if setting it in .emacs")
107 107
@@ -165,12 +165,12 @@ This variable can be set either in .emacs or toggled interactively.
165Use `setq-default' if setting it in .emacs") 165Use `setq-default' if setting it in .emacs")
166 166
167(ediff-defvar-local ediff-ignore-similar-regions nil 167(ediff-defvar-local ediff-ignore-similar-regions nil
168 "*If t, skip over difference regions that differ only in the white space and line breaks. 168 "If t, skip over difference regions that differ only in the white space and line breaks.
169This variable can be set either in .emacs or toggled interactively. 169This variable can be set either in .emacs or toggled interactively.
170Use `setq-default' if setting it in .emacs") 170Use `setq-default' if setting it in .emacs")
171 171
172(ediff-defvar-local ediff-auto-refine-limit 14000 172(ediff-defvar-local ediff-auto-refine-limit 14000
173 "*Auto-refine only the regions of this size \(in bytes\) or less.") 173 "Auto-refine only the regions of this size \(in bytes\) or less.")
174 174
175;;; General 175;;; General
176 176
@@ -1288,38 +1288,38 @@ delimiter regions"))
1288;;; Word functions used to refine the current diff 1288;;; Word functions used to refine the current diff
1289 1289
1290(defvar ediff-forward-word-function 'ediff-forward-word 1290(defvar ediff-forward-word-function 'ediff-forward-word
1291 "*Function to call to move to the next word. 1291 "Function to call to move to the next word.
1292Used for splitting difference regions into individual words.") 1292Used for splitting difference regions into individual words.")
1293(make-variable-buffer-local 'ediff-forward-word-function) 1293(make-variable-buffer-local 'ediff-forward-word-function)
1294 1294
1295;; \240 is Unicode symbol for nonbreakable whitespace 1295;; \240 is Unicode symbol for nonbreakable whitespace
1296(defvar ediff-whitespace " \n\t\f\r\240" 1296(defvar ediff-whitespace " \n\t\f\r\240"
1297 "*Characters constituting white space. 1297 "Characters constituting white space.
1298These characters are ignored when differing regions are split into words.") 1298These characters are ignored when differing regions are split into words.")
1299(make-variable-buffer-local 'ediff-whitespace) 1299(make-variable-buffer-local 'ediff-whitespace)
1300 1300
1301(defvar ediff-word-1 1301(defvar ediff-word-1
1302 (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_") 1302 (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_")
1303 "*Characters that constitute words of type 1. 1303 "Characters that constitute words of type 1.
1304More precisely, [ediff-word-1] is a regexp that matches type 1 words. 1304More precisely, [ediff-word-1] is a regexp that matches type 1 words.
1305See `ediff-forward-word' for more details.") 1305See `ediff-forward-word' for more details.")
1306(make-variable-buffer-local 'ediff-word-1) 1306(make-variable-buffer-local 'ediff-word-1)
1307 1307
1308(defvar ediff-word-2 "0-9.," 1308(defvar ediff-word-2 "0-9.,"
1309 "*Characters that constitute words of type 2. 1309 "Characters that constitute words of type 2.
1310More precisely, [ediff-word-2] is a regexp that matches type 2 words. 1310More precisely, [ediff-word-2] is a regexp that matches type 2 words.
1311See `ediff-forward-word' for more details.") 1311See `ediff-forward-word' for more details.")
1312(make-variable-buffer-local 'ediff-word-2) 1312(make-variable-buffer-local 'ediff-word-2)
1313 1313
1314(defvar ediff-word-3 "`'?!:;\"{}[]()" 1314(defvar ediff-word-3 "`'?!:;\"{}[]()"
1315 "*Characters that constitute words of type 3. 1315 "Characters that constitute words of type 3.
1316More precisely, [ediff-word-3] is a regexp that matches type 3 words. 1316More precisely, [ediff-word-3] is a regexp that matches type 3 words.
1317See `ediff-forward-word' for more details.") 1317See `ediff-forward-word' for more details.")
1318(make-variable-buffer-local 'ediff-word-3) 1318(make-variable-buffer-local 'ediff-word-3)
1319 1319
1320(defvar ediff-word-4 1320(defvar ediff-word-4
1321 (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) 1321 (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace)
1322 "*Characters that constitute words of type 4. 1322 "Characters that constitute words of type 4.
1323More precisely, [ediff-word-4] is a regexp that matches type 4 words. 1323More precisely, [ediff-word-4] is a regexp that matches type 4 words.
1324See `ediff-forward-word' for more details.") 1324See `ediff-forward-word' for more details.")
1325(make-variable-buffer-local 'ediff-word-4) 1325(make-variable-buffer-local 'ediff-word-4)
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 2de5e4dbdaf..ad6d69ee924 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -594,7 +594,7 @@ highlighted using ASCII flags."
594(ediff-defvar-local ediff-start-narrowed t 594(ediff-defvar-local ediff-start-narrowed t
595 "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*") 595 "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*")
596(ediff-defvar-local ediff-quit-widened t 596(ediff-defvar-local ediff-quit-widened t
597 "*Non-nil means: when finished, Ediff widens buffers A/B. 597 "Non-nil means: when finished, Ediff widens buffers A/B.
598Actually, Ediff restores the scope of visibility that existed at startup.") 598Actually, Ediff restores the scope of visibility that existed at startup.")
599 599
600(defcustom ediff-keep-variants t 600(defcustom ediff-keep-variants t
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index a48f2afecd5..f6942bc538d 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -524,10 +524,10 @@ replaced by emerge-fast-keymap.")
524(emerge-defvar-local emerge-old-keymap nil 524(emerge-defvar-local emerge-old-keymap nil
525 "The original local keymap for the merge buffer.") 525 "The original local keymap for the merge buffer.")
526(emerge-defvar-local emerge-auto-advance nil 526(emerge-defvar-local emerge-auto-advance nil
527 "*If non-nil, emerge-select-A and emerge-select-B automatically advance to 527 "If non-nil, emerge-select-A and emerge-select-B automatically advance to
528the next difference.") 528the next difference.")
529(emerge-defvar-local emerge-skip-prefers nil 529(emerge-defvar-local emerge-skip-prefers nil
530 "*If non-nil, differences for which there is a preference are automatically 530 "If non-nil, differences for which there is a preference are automatically
531skipped.") 531skipped.")
532(emerge-defvar-local emerge-quit-hook nil 532(emerge-defvar-local emerge-quit-hook nil
533 "Hooks to run in the merge buffer after the merge has been finished. 533 "Hooks to run in the merge buffer after the merge has been finished.
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 54d548c09da..db70f417393 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -161,7 +161,7 @@ can be obtained from `log-edit-files'."
161 "21.1") 161 "21.1")
162 162
163(defvar log-edit-changelog-full-paragraphs cvs-changelog-full-paragraphs 163(defvar log-edit-changelog-full-paragraphs cvs-changelog-full-paragraphs
164 "*If non-nil, include full ChangeLog paragraphs in the log. 164 "If non-nil, include full ChangeLog paragraphs in the log.
165This may be set in the ``local variables'' section of a ChangeLog, to 165This may be set in the ``local variables'' section of a ChangeLog, to
166indicate the policy for that ChangeLog. 166indicate the policy for that ChangeLog.
167 167
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 80a01f58531..ab45b313bd5 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -33,7 +33,7 @@
33;;;; START OF THINGS TO CHECK WHEN INSTALLING 33;;;; START OF THINGS TO CHECK WHEN INSTALLING
34 34
35(defvar cvs-program "cvs" 35(defvar cvs-program "cvs"
36 "*Name or full path of the cvs executable.") 36 "Name or full path of the cvs executable.")
37 37
38(defvar cvs-version 38(defvar cvs-version
39 ;; With the divergence of the CVSNT codebase and version numbers, this is 39 ;; With the divergence of the CVSNT codebase and version numbers, this is
@@ -46,12 +46,12 @@
46 nil t) 46 nil t)
47 (cons (string-to-number (match-string 1)) 47 (cons (string-to-number (match-string 1))
48 (string-to-number (match-string 2)))))) 48 (string-to-number (match-string 2))))))
49 "*Version of `cvs' installed on your system. 49 "Version of `cvs' installed on your system.
50It must be in the (MAJOR . MINOR) format.") 50It must be in the (MAJOR . MINOR) format.")
51 51
52;; FIXME: this is only used by cvs-mode-diff-backup 52;; FIXME: this is only used by cvs-mode-diff-backup
53(defvar cvs-diff-program (or (and (boundp 'diff-command) diff-command) "diff") 53(defvar cvs-diff-program (or (and (boundp 'diff-command) diff-command) "diff")
54 "*Name or full path of the best diff program you've got. 54 "Name or full path of the best diff program you've got.
55NOTE: there are some nasty bugs in the context diff variants of some vendor 55NOTE: there are some nasty bugs in the context diff variants of some vendor
56versions, such as the one in SunOS-4.") 56versions, such as the one in SunOS-4.")
57 57
@@ -89,7 +89,7 @@ will select a shared-flag.")
89 "List of flags whose settings is shared among several commands.") 89 "List of flags whose settings is shared among several commands.")
90 90
91(defvar cvs-cvsroot nil 91(defvar cvs-cvsroot nil
92 "*Specifies where the (current) cvs master repository is. 92 "Specifies where the (current) cvs master repository is.
93Overrides the environment variable $CVSROOT by sending \" -d dir\" to 93Overrides the environment variable $CVSROOT by sending \" -d dir\" to
94all CVS commands. This switch is useful if you have multiple CVS 94all CVS commands. This switch is useful if you have multiple CVS
95repositories. It can be set interactively with \\[cvs-change-cvsroot.] 95repositories. It can be set interactively with \\[cvs-change-cvsroot.]
@@ -243,7 +243,7 @@ the directory name of the cvs buffer.")
243 ;; Was '(expand-file-name " *cvs-tmp*" dir), but that causes them to 243 ;; Was '(expand-file-name " *cvs-tmp*" dir), but that causes them to
244 ;; become non-hidden if uniquification is done `forward'. 244 ;; become non-hidden if uniquification is done `forward'.
245 " *cvs-tmp*" 245 " *cvs-tmp*"
246 "*Name of the cvs temporary buffer. 246 "Name of the cvs temporary buffer.
247Output from cvs is placed here for asynchronous commands.") 247Output from cvs is placed here for asynchronous commands.")
248 248
249(defcustom cvs-idiff-imerge-handlers 249(defcustom cvs-idiff-imerge-handlers
diff --git a/src/alloc.c b/src/alloc.c
index 4cb0ae04664..16b004fc0e9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6413,7 +6413,7 @@ void
6413syms_of_alloc (void) 6413syms_of_alloc (void)
6414{ 6414{
6415 DEFVAR_INT ("gc-cons-threshold", gc_cons_threshold, 6415 DEFVAR_INT ("gc-cons-threshold", gc_cons_threshold,
6416 doc: /* *Number of bytes of consing between garbage collections. 6416 doc: /* Number of bytes of consing between garbage collections.
6417Garbage collection can happen automatically once this many bytes have been 6417Garbage collection can happen automatically once this many bytes have been
6418allocated since the last garbage collection. All data types count. 6418allocated since the last garbage collection. All data types count.
6419 6419
@@ -6424,7 +6424,7 @@ prevent garbage collection during a part of the program.
6424See also `gc-cons-percentage'. */); 6424See also `gc-cons-percentage'. */);
6425 6425
6426 DEFVAR_LISP ("gc-cons-percentage", Vgc_cons_percentage, 6426 DEFVAR_LISP ("gc-cons-percentage", Vgc_cons_percentage,
6427 doc: /* *Portion of the heap used for allocation. 6427 doc: /* Portion of the heap used for allocation.
6428Garbage collection can happen automatically once this portion of the heap 6428Garbage collection can happen automatically once this portion of the heap
6429has been allocated since the last garbage collection. 6429has been allocated since the last garbage collection.
6430If this portion is smaller than `gc-cons-threshold', this is ignored. */); 6430If this portion is smaller than `gc-cons-threshold', this is ignored. */);
diff --git a/src/buffer.c b/src/buffer.c
index 3f9b2744e96..ca8d1ec5db3 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5231,7 +5231,7 @@ This is the same as (default-value 'ctl-arrow). */);
5231 5231
5232 DEFVAR_BUFFER_DEFAULTS ("default-enable-multibyte-characters", 5232 DEFVAR_BUFFER_DEFAULTS ("default-enable-multibyte-characters",
5233 enable_multibyte_characters, 5233 enable_multibyte_characters,
5234 doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it. 5234 doc: /* Default value of `enable-multibyte-characters' for buffers not overriding it.
5235This is the same as (default-value 'enable-multibyte-characters). */); 5235This is the same as (default-value 'enable-multibyte-characters). */);
5236 5236
5237 DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-coding-system", 5237 DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-coding-system",
@@ -5393,7 +5393,7 @@ A string is printed verbatim in the mode line except for %-constructs:
5393Decimal digits after the % specify field width to which to pad. */); 5393Decimal digits after the % specify field width to which to pad. */);
5394 5394
5395 DEFVAR_BUFFER_DEFAULTS ("default-major-mode", major_mode, 5395 DEFVAR_BUFFER_DEFAULTS ("default-major-mode", major_mode,
5396 doc: /* *Value of `major-mode' for new buffers. */); 5396 doc: /* Value of `major-mode' for new buffers. */);
5397 5397
5398 DEFVAR_PER_BUFFER ("major-mode", &BVAR (current_buffer, major_mode), 5398 DEFVAR_PER_BUFFER ("major-mode", &BVAR (current_buffer, major_mode),
5399 make_number (Lisp_Symbol), 5399 make_number (Lisp_Symbol),
@@ -5424,25 +5424,25 @@ Use the command `abbrev-mode' to change this variable. */);
5424 5424
5425 DEFVAR_PER_BUFFER ("case-fold-search", &BVAR (current_buffer, case_fold_search), 5425 DEFVAR_PER_BUFFER ("case-fold-search", &BVAR (current_buffer, case_fold_search),
5426 Qnil, 5426 Qnil,
5427 doc: /* *Non-nil if searches and matches should ignore case. */); 5427 doc: /* Non-nil if searches and matches should ignore case. */);
5428 5428
5429 DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column), 5429 DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column),
5430 make_number (LISP_INT_TAG), 5430 make_number (LISP_INT_TAG),
5431 doc: /* *Column beyond which automatic line-wrapping should happen. 5431 doc: /* Column beyond which automatic line-wrapping should happen.
5432Interactively, you can set the buffer local value using \\[set-fill-column]. */); 5432Interactively, you can set the buffer local value using \\[set-fill-column]. */);
5433 5433
5434 DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin), 5434 DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin),
5435 make_number (LISP_INT_TAG), 5435 make_number (LISP_INT_TAG),
5436 doc: /* *Column for the default `indent-line-function' to indent to. 5436 doc: /* Column for the default `indent-line-function' to indent to.
5437Linefeed indents to this column in Fundamental mode. */); 5437Linefeed indents to this column in Fundamental mode. */);
5438 5438
5439 DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width), 5439 DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width),
5440 make_number (LISP_INT_TAG), 5440 make_number (LISP_INT_TAG),
5441 doc: /* *Distance between tab stops (for display of tab characters), in columns. 5441 doc: /* Distance between tab stops (for display of tab characters), in columns.
5442This should be an integer greater than zero. */); 5442This should be an integer greater than zero. */);
5443 5443
5444 DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, 5444 DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil,
5445 doc: /* *Non-nil means display control chars with uparrow. 5445 doc: /* Non-nil means display control chars with uparrow.
5446A value of nil means use backslash and octal digits. 5446A value of nil means use backslash and octal digits.
5447This variable does not apply to characters whose display is specified 5447This variable does not apply to characters whose display is specified
5448in the current display table (if there is one). */); 5448in the current display table (if there is one). */);
@@ -5483,7 +5483,7 @@ This variable is never applied to a way of decoding a file while reading it. */
5483 5483
5484 DEFVAR_PER_BUFFER ("bidi-paragraph-direction", 5484 DEFVAR_PER_BUFFER ("bidi-paragraph-direction",
5485 &BVAR (current_buffer, bidi_paragraph_direction), Qnil, 5485 &BVAR (current_buffer, bidi_paragraph_direction), Qnil,
5486 doc: /* *If non-nil, forces directionality of text paragraphs in the buffer. 5486 doc: /* If non-nil, forces directionality of text paragraphs in the buffer.
5487 5487
5488If this is nil (the default), the direction of each paragraph is 5488If this is nil (the default), the direction of each paragraph is
5489determined by the first strong directional character of its text. 5489determined by the first strong directional character of its text.
@@ -5494,7 +5494,7 @@ This variable has no effect unless the buffer's value of
5494\`bidi-display-reordering' is non-nil. */); 5494\`bidi-display-reordering' is non-nil. */);
5495 5495
5496 DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), Qnil, 5496 DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), Qnil,
5497 doc: /* *Non-nil means do not display continuation lines. 5497 doc: /* Non-nil means do not display continuation lines.
5498Instead, give each line of text just one screen line. 5498Instead, give each line of text just one screen line.
5499 5499
5500Note that this is overridden by the variable 5500Note that this is overridden by the variable
@@ -5504,7 +5504,7 @@ and this buffer is not full-frame width.
5504Minibuffers set this variable to nil. */); 5504Minibuffers set this variable to nil. */);
5505 5505
5506 DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, 5506 DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil,
5507 doc: /* *Non-nil means to use word-wrapping for continuation lines. 5507 doc: /* Non-nil means to use word-wrapping for continuation lines.
5508When word-wrapping is on, continuation lines are wrapped at the space 5508When word-wrapping is on, continuation lines are wrapped at the space
5509or tab character nearest to the right window edge. 5509or tab character nearest to the right window edge.
5510If nil, continuation lines are wrapped at the right screen edge. 5510If nil, continuation lines are wrapped at the right screen edge.
@@ -5625,39 +5625,39 @@ See also the functions `display-table-slot' and `set-display-table-slot'. */);
5625 5625
5626 DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols), 5626 DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols),
5627 Qnil, 5627 Qnil,
5628 doc: /* *Width of left marginal area for display of a buffer. 5628 doc: /* Width of left marginal area for display of a buffer.
5629A value of nil means no marginal area. */); 5629A value of nil means no marginal area. */);
5630 5630
5631 DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols), 5631 DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols),
5632 Qnil, 5632 Qnil,
5633 doc: /* *Width of right marginal area for display of a buffer. 5633 doc: /* Width of right marginal area for display of a buffer.
5634A value of nil means no marginal area. */); 5634A value of nil means no marginal area. */);
5635 5635
5636 DEFVAR_PER_BUFFER ("left-fringe-width", &BVAR (current_buffer, left_fringe_width), 5636 DEFVAR_PER_BUFFER ("left-fringe-width", &BVAR (current_buffer, left_fringe_width),
5637 Qnil, 5637 Qnil,
5638 doc: /* *Width of this buffer's left fringe (in pixels). 5638 doc: /* Width of this buffer's left fringe (in pixels).
5639A value of 0 means no left fringe is shown in this buffer's window. 5639A value of 0 means no left fringe is shown in this buffer's window.
5640A value of nil means to use the left fringe width from the window's frame. */); 5640A value of nil means to use the left fringe width from the window's frame. */);
5641 5641
5642 DEFVAR_PER_BUFFER ("right-fringe-width", &BVAR (current_buffer, right_fringe_width), 5642 DEFVAR_PER_BUFFER ("right-fringe-width", &BVAR (current_buffer, right_fringe_width),
5643 Qnil, 5643 Qnil,
5644 doc: /* *Width of this buffer's right fringe (in pixels). 5644 doc: /* Width of this buffer's right fringe (in pixels).
5645A value of 0 means no right fringe is shown in this buffer's window. 5645A value of 0 means no right fringe is shown in this buffer's window.
5646A value of nil means to use the right fringe width from the window's frame. */); 5646A value of nil means to use the right fringe width from the window's frame. */);
5647 5647
5648 DEFVAR_PER_BUFFER ("fringes-outside-margins", &BVAR (current_buffer, fringes_outside_margins), 5648 DEFVAR_PER_BUFFER ("fringes-outside-margins", &BVAR (current_buffer, fringes_outside_margins),
5649 Qnil, 5649 Qnil,
5650 doc: /* *Non-nil means to display fringes outside display margins. 5650 doc: /* Non-nil means to display fringes outside display margins.
5651A value of nil means to display fringes between margins and buffer text. */); 5651A value of nil means to display fringes between margins and buffer text. */);
5652 5652
5653 DEFVAR_PER_BUFFER ("scroll-bar-width", &BVAR (current_buffer, scroll_bar_width), 5653 DEFVAR_PER_BUFFER ("scroll-bar-width", &BVAR (current_buffer, scroll_bar_width),
5654 Qnil, 5654 Qnil,
5655 doc: /* *Width of this buffer's scroll bars in pixels. 5655 doc: /* Width of this buffer's scroll bars in pixels.
5656A value of nil means to use the scroll bar width from the window's frame. */); 5656A value of nil means to use the scroll bar width from the window's frame. */);
5657 5657
5658 DEFVAR_PER_BUFFER ("vertical-scroll-bar", &BVAR (current_buffer, vertical_scroll_bar_type), 5658 DEFVAR_PER_BUFFER ("vertical-scroll-bar", &BVAR (current_buffer, vertical_scroll_bar_type),
5659 Qnil, 5659 Qnil,
5660 doc: /* *Position of this buffer's vertical scroll bar. 5660 doc: /* Position of this buffer's vertical scroll bar.
5661The value takes effect whenever you tell a window to display this buffer; 5661The value takes effect whenever you tell a window to display this buffer;
5662for instance, with `set-window-buffer' or when `display-buffer' displays it. 5662for instance, with `set-window-buffer' or when `display-buffer' displays it.
5663 5663
@@ -5667,13 +5667,13 @@ A value of t (the default) means do whatever the window's frame specifies. */);
5667 5667
5668 DEFVAR_PER_BUFFER ("indicate-empty-lines", 5668 DEFVAR_PER_BUFFER ("indicate-empty-lines",
5669 &BVAR (current_buffer, indicate_empty_lines), Qnil, 5669 &BVAR (current_buffer, indicate_empty_lines), Qnil,
5670 doc: /* *Visually indicate empty lines after the buffer end. 5670 doc: /* Visually indicate empty lines after the buffer end.
5671If non-nil, a bitmap is displayed in the left fringe of a window on 5671If non-nil, a bitmap is displayed in the left fringe of a window on
5672window-systems. */); 5672window-systems. */);
5673 5673
5674 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries", 5674 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries",
5675 &BVAR (current_buffer, indicate_buffer_boundaries), Qnil, 5675 &BVAR (current_buffer, indicate_buffer_boundaries), Qnil,
5676 doc: /* *Visually indicate buffer boundaries and scrolling. 5676 doc: /* Visually indicate buffer boundaries and scrolling.
5677If non-nil, the first and last line of the buffer are marked in the fringe 5677If non-nil, the first and last line of the buffer are marked in the fringe
5678of a window on window-systems with angle bitmaps, or if the window can be 5678of a window on window-systems with angle bitmaps, or if the window can be
5679scrolled, the top and bottom line of the window are marked with up and down 5679scrolled, the top and bottom line of the window are marked with up and down
@@ -5698,7 +5698,7 @@ fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */);
5698 5698
5699 DEFVAR_PER_BUFFER ("fringe-indicator-alist", 5699 DEFVAR_PER_BUFFER ("fringe-indicator-alist",
5700 &BVAR (current_buffer, fringe_indicator_alist), Qnil, 5700 &BVAR (current_buffer, fringe_indicator_alist), Qnil,
5701 doc: /* *Mapping from logical to physical fringe indicator bitmaps. 5701 doc: /* Mapping from logical to physical fringe indicator bitmaps.
5702The value is an alist where each element (INDICATOR . BITMAPS) 5702The value is an alist where each element (INDICATOR . BITMAPS)
5703specifies the fringe bitmaps used to display a specific logical 5703specifies the fringe bitmaps used to display a specific logical
5704fringe indicator. 5704fringe indicator.
@@ -5717,7 +5717,7 @@ symbol which is used in both left and right fringes. */);
5717 5717
5718 DEFVAR_PER_BUFFER ("fringe-cursor-alist", 5718 DEFVAR_PER_BUFFER ("fringe-cursor-alist",
5719 &BVAR (current_buffer, fringe_cursor_alist), Qnil, 5719 &BVAR (current_buffer, fringe_cursor_alist), Qnil,
5720 doc: /* *Mapping from logical to physical fringe cursor bitmaps. 5720 doc: /* Mapping from logical to physical fringe cursor bitmaps.
5721The value is an alist where each element (CURSOR . BITMAP) 5721The value is an alist where each element (CURSOR . BITMAP)
5722specifies the fringe bitmaps used to display a specific logical 5722specifies the fringe bitmaps used to display a specific logical
5723cursor type in the fringe. 5723cursor type in the fringe.
@@ -5881,7 +5881,7 @@ set when a file is visited. */);
5881 5881
5882 DEFVAR_PER_BUFFER ("buffer-auto-save-file-format", 5882 DEFVAR_PER_BUFFER ("buffer-auto-save-file-format",
5883 &BVAR (current_buffer, auto_save_file_format), Qnil, 5883 &BVAR (current_buffer, auto_save_file_format), Qnil,
5884 doc: /* *Format in which to write auto-save files. 5884 doc: /* Format in which to write auto-save files.
5885Should be a list of symbols naming formats that are defined in `format-alist'. 5885Should be a list of symbols naming formats that are defined in `format-alist'.
5886If it is t, which is the default, auto-save files are written in the 5886If it is t, which is the default, auto-save files are written in the
5887same format as a regular save would use. */); 5887same format as a regular save would use. */);
@@ -5931,7 +5931,7 @@ Lisp programs may give this variable certain special values:
5931 Vtransient_mark_mode = Qnil; 5931 Vtransient_mark_mode = Qnil;
5932 5932
5933 DEFVAR_LISP ("inhibit-read-only", Vinhibit_read_only, 5933 DEFVAR_LISP ("inhibit-read-only", Vinhibit_read_only,
5934 doc: /* *Non-nil means disregard read-only status of buffers or characters. 5934 doc: /* Non-nil means disregard read-only status of buffers or characters.
5935If the value is t, disregard `buffer-read-only' and all `read-only' 5935If the value is t, disregard `buffer-read-only' and all `read-only'
5936text properties. If the value is a list, disregard `buffer-read-only' 5936text properties. If the value is a list, disregard `buffer-read-only'
5937and disregard a `read-only' text property if the property value 5937and disregard a `read-only' text property if the property value
@@ -5966,7 +5966,7 @@ to the default frame line height. A value of nil means add no extra space. */)
5966 5966
5967 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", 5967 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows",
5968 &BVAR (current_buffer, cursor_in_non_selected_windows), Qnil, 5968 &BVAR (current_buffer, cursor_in_non_selected_windows), Qnil,
5969 doc: /* *Non-nil means show a cursor in non-selected windows. 5969 doc: /* Non-nil means show a cursor in non-selected windows.
5970If nil, only shows a cursor in the selected window. 5970If nil, only shows a cursor in the selected window.
5971If t, displays a cursor related to the usual cursor type 5971If t, displays a cursor related to the usual cursor type
5972\(a solid box becomes hollow, a bar becomes a narrower bar). 5972\(a solid box becomes hollow, a bar becomes a narrower bar).
diff --git a/src/callint.c b/src/callint.c
index 96e2e10b9d5..c70082e8ae0 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -945,7 +945,7 @@ may be set by the debugger as a reminder for itself. */);
945 Vcommand_debug_status = Qnil; 945 Vcommand_debug_status = Qnil;
946 946
947 DEFVAR_LISP ("mark-even-if-inactive", Vmark_even_if_inactive, 947 DEFVAR_LISP ("mark-even-if-inactive", Vmark_even_if_inactive,
948 doc: /* *Non-nil means you can use the mark even when inactive. 948 doc: /* Non-nil means you can use the mark even when inactive.
949This option makes a difference in Transient Mark mode. 949This option makes a difference in Transient Mark mode.
950When the option is non-nil, deactivation of the mark 950When the option is non-nil, deactivation of the mark
951turns off region highlighting, but commands that use the mark 951turns off region highlighting, but commands that use the mark
diff --git a/src/callproc.c b/src/callproc.c
index b5b8cadeb68..9528c9644d8 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1637,16 +1637,16 @@ syms_of_callproc (void)
1637 staticpro (&Vtemp_file_name_pattern); 1637 staticpro (&Vtemp_file_name_pattern);
1638 1638
1639 DEFVAR_LISP ("shell-file-name", Vshell_file_name, 1639 DEFVAR_LISP ("shell-file-name", Vshell_file_name,
1640 doc: /* *File name to load inferior shells from. 1640 doc: /* File name to load inferior shells from.
1641Initialized from the SHELL environment variable, or to a system-dependent 1641Initialized from the SHELL environment variable, or to a system-dependent
1642default if SHELL is not set. */); 1642default if SHELL is not set. */);
1643 1643
1644 DEFVAR_LISP ("exec-path", Vexec_path, 1644 DEFVAR_LISP ("exec-path", Vexec_path,
1645 doc: /* *List of directories to search programs to run in subprocesses. 1645 doc: /* List of directories to search programs to run in subprocesses.
1646Each element is a string (directory name) or nil (try default directory). */); 1646Each element is a string (directory name) or nil (try default directory). */);
1647 1647
1648 DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, 1648 DEFVAR_LISP ("exec-suffixes", Vexec_suffixes,
1649 doc: /* *List of suffixes to try to find executable file names. 1649 doc: /* List of suffixes to try to find executable file names.
1650Each element is a string. */); 1650Each element is a string. */);
1651 Vexec_suffixes = Qnil; 1651 Vexec_suffixes = Qnil;
1652 1652
diff --git a/src/charset.c b/src/charset.c
index 57e1603fc19..7b963a94800 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2403,7 +2403,7 @@ syms_of_charset (void)
2403 defsubr (&Ssort_charsets); 2403 defsubr (&Ssort_charsets);
2404 2404
2405 DEFVAR_LISP ("charset-map-path", Vcharset_map_path, 2405 DEFVAR_LISP ("charset-map-path", Vcharset_map_path,
2406 doc: /* *List of directories to search for charset map files. */); 2406 doc: /* List of directories to search for charset map files. */);
2407 Vcharset_map_path = Qnil; 2407 Vcharset_map_path = Qnil;
2408 2408
2409 DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map, 2409 DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map,
diff --git a/src/dosfns.c b/src/dosfns.c
index 8ef672fb8bb..d4b96e9df90 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -710,7 +710,7 @@ Implicitly modified when the TZ variable is changed. */);
710#endif 710#endif
711 711
712 DEFVAR_LISP ("dos-display-scancodes", Vdos_display_scancodes, 712 DEFVAR_LISP ("dos-display-scancodes", Vdos_display_scancodes,
713 doc: /* *Controls whether DOS raw keyboard events are displayed as you type. 713 doc: /* Whether DOS raw keyboard events are displayed as you type.
714When non-nil, the keyboard scan-codes are displayed at the bottom right 714When non-nil, the keyboard scan-codes are displayed at the bottom right
715corner of the display (typically at the end of the mode line). 715corner of the display (typically at the end of the mode line).
716The output format is: scan code:char code*modifiers. */); 716The output format is: scan code:char code*modifiers. */);
@@ -718,17 +718,17 @@ The output format is: scan code:char code*modifiers. */);
718 Vdos_display_scancodes = Qnil; 718 Vdos_display_scancodes = Qnil;
719 719
720 DEFVAR_INT ("dos-hyper-key", dos_hyper_key, 720 DEFVAR_INT ("dos-hyper-key", dos_hyper_key,
721 doc: /* *If set to 1, use right ALT key as hyper key. 721 doc: /* If set to 1, use right ALT key as hyper key.
722If set to 2, use right CTRL key as hyper key. */); 722If set to 2, use right CTRL key as hyper key. */);
723 dos_hyper_key = 0; 723 dos_hyper_key = 0;
724 724
725 DEFVAR_INT ("dos-super-key", dos_super_key, 725 DEFVAR_INT ("dos-super-key", dos_super_key,
726 doc: /* *If set to 1, use right ALT key as super key. 726 doc: /* If set to 1, use right ALT key as super key.
727If set to 2, use right CTRL key as super key. */); 727If set to 2, use right CTRL key as super key. */);
728 dos_super_key = 0; 728 dos_super_key = 0;
729 729
730 DEFVAR_INT ("dos-keypad-mode", dos_keypad_mode, 730 DEFVAR_INT ("dos-keypad-mode", dos_keypad_mode,
731 doc: /* *Controls what key code is returned by a key in the numeric keypad. 731 doc: /* Controls what key code is returned by a key in the numeric keypad.
732The `numlock ON' action is only taken if no modifier keys are pressed. 732The `numlock ON' action is only taken if no modifier keys are pressed.
733The value is an integer constructed by adding the following bits together: 733The value is an integer constructed by adding the following bits together:
734 734
diff --git a/src/eval.c b/src/eval.c
index 1a6501a2b68..cb0518f34ec 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3563,7 +3563,7 @@ void
3563syms_of_eval (void) 3563syms_of_eval (void)
3564{ 3564{
3565 DEFVAR_INT ("max-specpdl-size", max_specpdl_size, 3565 DEFVAR_INT ("max-specpdl-size", max_specpdl_size,
3566 doc: /* *Limit on number of Lisp variable bindings and `unwind-protect's. 3566 doc: /* Limit on number of Lisp variable bindings and `unwind-protect's.
3567If Lisp code tries to increase the total number past this amount, 3567If Lisp code tries to increase the total number past this amount,
3568an error is signaled. 3568an error is signaled.
3569You can safely use a value considerably larger than the default value, 3569You can safely use a value considerably larger than the default value,
@@ -3571,7 +3571,7 @@ if that proves inconveniently small. However, if you increase it too far,
3571Emacs could run out of memory trying to make the stack bigger. */); 3571Emacs could run out of memory trying to make the stack bigger. */);
3572 3572
3573 DEFVAR_INT ("max-lisp-eval-depth", max_lisp_eval_depth, 3573 DEFVAR_INT ("max-lisp-eval-depth", max_lisp_eval_depth,
3574 doc: /* *Limit on depth in `eval', `apply' and `funcall' before error. 3574 doc: /* Limit on depth in `eval', `apply' and `funcall' before error.
3575 3575
3576This limit serves to catch infinite recursions for you before they cause 3576This limit serves to catch infinite recursions for you before they cause
3577actual stack overflow in C, which would be fatal for Emacs. 3577actual stack overflow in C, which would be fatal for Emacs.
@@ -3615,7 +3615,7 @@ before making `inhibit-quit' nil. */);
3615 DEFSYM (Qdebug, "debug"); 3615 DEFSYM (Qdebug, "debug");
3616 3616
3617 DEFVAR_LISP ("debug-on-error", Vdebug_on_error, 3617 DEFVAR_LISP ("debug-on-error", Vdebug_on_error,
3618 doc: /* *Non-nil means enter debugger if an error is signaled. 3618 doc: /* Non-nil means enter debugger if an error is signaled.
3619Does not apply to errors handled by `condition-case' or those 3619Does not apply to errors handled by `condition-case' or those
3620matched by `debug-ignored-errors'. 3620matched by `debug-ignored-errors'.
3621If the value is a list, an error only means to enter the debugger 3621If the value is a list, an error only means to enter the debugger
@@ -3627,7 +3627,7 @@ See also the variable `debug-on-quit'. */);
3627 Vdebug_on_error = Qnil; 3627 Vdebug_on_error = Qnil;
3628 3628
3629 DEFVAR_LISP ("debug-ignored-errors", Vdebug_ignored_errors, 3629 DEFVAR_LISP ("debug-ignored-errors", Vdebug_ignored_errors,
3630 doc: /* *List of errors for which the debugger should not be called. 3630 doc: /* List of errors for which the debugger should not be called.
3631Each element may be a condition-name or a regexp that matches error messages. 3631Each element may be a condition-name or a regexp that matches error messages.
3632If any element applies to a given error, that error skips the debugger 3632If any element applies to a given error, that error skips the debugger
3633and just returns to top level. 3633and just returns to top level.
@@ -3636,7 +3636,7 @@ It does not apply to errors handled by `condition-case'. */);
3636 Vdebug_ignored_errors = Qnil; 3636 Vdebug_ignored_errors = Qnil;
3637 3637
3638 DEFVAR_BOOL ("debug-on-quit", debug_on_quit, 3638 DEFVAR_BOOL ("debug-on-quit", debug_on_quit,
3639 doc: /* *Non-nil means enter debugger if quit is signaled (C-g, for example). 3639 doc: /* Non-nil means enter debugger if quit is signaled (C-g, for example).
3640Does not apply if quit is handled by a `condition-case'. */); 3640Does not apply if quit is handled by a `condition-case'. */);
3641 debug_on_quit = 0; 3641 debug_on_quit = 0;
3642 3642
@@ -3665,7 +3665,7 @@ The Edebug package uses this to regain control. */);
3665 Vsignal_hook_function = Qnil; 3665 Vsignal_hook_function = Qnil;
3666 3666
3667 DEFVAR_LISP ("debug-on-signal", Vdebug_on_signal, 3667 DEFVAR_LISP ("debug-on-signal", Vdebug_on_signal,
3668 doc: /* *Non-nil means call the debugger regardless of condition handlers. 3668 doc: /* Non-nil means call the debugger regardless of condition handlers.
3669Note that `debug-on-error', `debug-on-quit' and friends 3669Note that `debug-on-error', `debug-on-quit' and friends
3670still determine whether to handle the particular condition. */); 3670still determine whether to handle the particular condition. */);
3671 Vdebug_on_signal = Qnil; 3671 Vdebug_on_signal = Qnil;
diff --git a/src/fileio.c b/src/fileio.c
index 7efe919a9f0..3a74672b9a6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5611,7 +5611,7 @@ syms_of_fileio (void)
5611 DEFSYM (Qexcl, "excl"); 5611 DEFSYM (Qexcl, "excl");
5612 5612
5613 DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system, 5613 DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system,
5614 doc: /* *Coding system for encoding file names. 5614 doc: /* Coding system for encoding file names.
5615If it is nil, `default-file-name-coding-system' (which see) is used. */); 5615If it is nil, `default-file-name-coding-system' (which see) is used. */);
5616 Vfile_name_coding_system = Qnil; 5616 Vfile_name_coding_system = Qnil;
5617 5617
@@ -5765,7 +5765,7 @@ file is usually more useful if it contains the deleted text. */);
5765 5765
5766#ifdef HAVE_FSYNC 5766#ifdef HAVE_FSYNC
5767 DEFVAR_BOOL ("write-region-inhibit-fsync", write_region_inhibit_fsync, 5767 DEFVAR_BOOL ("write-region-inhibit-fsync", write_region_inhibit_fsync,
5768 doc: /* *Non-nil means don't call fsync in `write-region'. 5768 doc: /* Non-nil means don't call fsync in `write-region'.
5769This variable affects calls to `write-region' as well as save commands. 5769This variable affects calls to `write-region' as well as save commands.
5770A non-nil value may result in data loss! */); 5770A non-nil value may result in data loss! */);
5771 write_region_inhibit_fsync = 0; 5771 write_region_inhibit_fsync = 0;
diff --git a/src/fns.c b/src/fns.c
index 1edfe966098..a92a1c882fd 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4933,7 +4933,7 @@ Used by `featurep' and `require', and altered by `provide'. */);
4933#endif /* HAVE_LANGINFO_CODESET */ 4933#endif /* HAVE_LANGINFO_CODESET */
4934 4934
4935 DEFVAR_BOOL ("use-dialog-box", use_dialog_box, 4935 DEFVAR_BOOL ("use-dialog-box", use_dialog_box,
4936 doc: /* *Non-nil means mouse commands use dialog boxes to ask questions. 4936 doc: /* Non-nil means mouse commands use dialog boxes to ask questions.
4937This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands 4937This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands
4938invoked by mouse clicks and mouse menu items. 4938invoked by mouse clicks and mouse menu items.
4939 4939
@@ -4942,7 +4942,7 @@ non-nil. */);
4942 use_dialog_box = 1; 4942 use_dialog_box = 1;
4943 4943
4944 DEFVAR_BOOL ("use-file-dialog", use_file_dialog, 4944 DEFVAR_BOOL ("use-file-dialog", use_file_dialog,
4945 doc: /* *Non-nil means mouse commands use a file dialog to ask for files. 4945 doc: /* Non-nil means mouse commands use a file dialog to ask for files.
4946This applies to commands from menus and tool bar buttons even when 4946This applies to commands from menus and tool bar buttons even when
4947they are initiated from the keyboard. If `use-dialog-box' is nil, 4947they are initiated from the keyboard. If `use-dialog-box' is nil,
4948that disables the use of a file dialog, regardless of the value of 4948that disables the use of a file dialog, regardless of the value of
diff --git a/src/fontset.c b/src/fontset.c
index d06491ddf25..8a61f09f590 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2227,7 +2227,7 @@ alternate fontnames (if any) are tried instead. */);
2227 2227
2228 DEFVAR_LISP ("vertical-centering-font-regexp", 2228 DEFVAR_LISP ("vertical-centering-font-regexp",
2229 Vvertical_centering_font_regexp, 2229 Vvertical_centering_font_regexp,
2230 doc: /* *Regexp matching font names that require vertical centering on display. 2230 doc: /* Regexp matching font names that require vertical centering on display.
2231When a character is displayed with such fonts, the character is displayed 2231When a character is displayed with such fonts, the character is displayed
2232at the vertical center of lines. */); 2232at the vertical center of lines. */);
2233 Vvertical_centering_font_regexp = Qnil; 2233 Vvertical_centering_font_regexp = Qnil;
diff --git a/src/fringe.c b/src/fringe.c
index 5285d09dfb0..62c50e0d420 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1754,7 +1754,7 @@ syms_of_fringe (void)
1754 defsubr (&Sset_fringe_bitmap_face); 1754 defsubr (&Sset_fringe_bitmap_face);
1755 1755
1756 DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, 1756 DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe,
1757 doc: /* *Non-nil means that newline may flow into the right fringe. 1757 doc: /* Non-nil means that newline may flow into the right fringe.
1758This means that display lines which are exactly as wide as the window 1758This means that display lines which are exactly as wide as the window
1759(not counting the final newline) will only occupy one screen line, by 1759(not counting the final newline) will only occupy one screen line, by
1760showing (or hiding) the final newline in the right fringe; when point 1760showing (or hiding) the final newline in the right fringe; when point
diff --git a/src/indent.c b/src/indent.c
index 9b4279f0c4e..1531d2ffde8 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2163,7 +2163,7 @@ void
2163syms_of_indent (void) 2163syms_of_indent (void)
2164{ 2164{
2165 DEFVAR_BOOL ("indent-tabs-mode", indent_tabs_mode, 2165 DEFVAR_BOOL ("indent-tabs-mode", indent_tabs_mode,
2166 doc: /* *Indentation can insert tabs if this is non-nil. */); 2166 doc: /* Indentation can insert tabs if this is non-nil. */);
2167 indent_tabs_mode = 1; 2167 indent_tabs_mode = 1;
2168 2168
2169 defsubr (&Scurrent_indentation); 2169 defsubr (&Scurrent_indentation);
diff --git a/src/lread.c b/src/lread.c
index 353f4a3064d..bfb37b4fc89 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4442,7 +4442,7 @@ were read in. */);
4442 Vread_circle = Qt; 4442 Vread_circle = Qt;
4443 4443
4444 DEFVAR_LISP ("load-path", Vload_path, 4444 DEFVAR_LISP ("load-path", Vload_path,
4445 doc: /* *List of directories to search for files to load. 4445 doc: /* List of directories to search for files to load.
4446Each element is a string (directory name) or nil (try default directory). 4446Each element is a string (directory name) or nil (try default directory).
4447Initialized based on EMACSLOADPATH environment variable, if any, 4447Initialized based on EMACSLOADPATH environment variable, if any,
4448otherwise to default specified by file `epaths.h' when Emacs was built. */); 4448otherwise to default specified by file `epaths.h' when Emacs was built. */);
diff --git a/src/msdos.c b/src/msdos.c
index 885cedd3df0..5f46829aefd 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4270,7 +4270,7 @@ syms_of_msdos (void)
4270 DEFSYM (Qreverse, "reverse"); 4270 DEFSYM (Qreverse, "reverse");
4271 4271
4272 DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph, 4272 DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph,
4273 doc: /* *Glyph to display instead of chars not supported by current codepage. 4273 doc: /* Glyph to display instead of chars not supported by current codepage.
4274This variable is used only by MS-DOS terminals. */); 4274This variable is used only by MS-DOS terminals. */);
4275 Vdos_unsupported_char_glyph = make_number ('\177'); 4275 Vdos_unsupported_char_glyph = make_number ('\177');
4276 4276
diff --git a/src/print.c b/src/print.c
index 40e0fb6b855..dac7a79d599 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2149,7 +2149,7 @@ shared once again when the text is read back. */);
2149 Vprint_gensym = Qnil; 2149 Vprint_gensym = Qnil;
2150 2150
2151 DEFVAR_LISP ("print-circle", Vprint_circle, 2151 DEFVAR_LISP ("print-circle", Vprint_circle,
2152 doc: /* *Non-nil means print recursive structures using #N= and #N# syntax. 2152 doc: /* Non-nil means print recursive structures using #N= and #N# syntax.
2153If nil, printing proceeds recursively and may lead to 2153If nil, printing proceeds recursively and may lead to
2154`max-lisp-eval-depth' being exceeded or an error may occur: 2154`max-lisp-eval-depth' being exceeded or an error may occur:
2155\"Apparently circular structure being printed.\" Also see 2155\"Apparently circular structure being printed.\" Also see
@@ -2161,7 +2161,7 @@ where N is a positive decimal integer. */);
2161 Vprint_circle = Qnil; 2161 Vprint_circle = Qnil;
2162 2162
2163 DEFVAR_LISP ("print-continuous-numbering", Vprint_continuous_numbering, 2163 DEFVAR_LISP ("print-continuous-numbering", Vprint_continuous_numbering,
2164 doc: /* *Non-nil means number continuously across print calls. 2164 doc: /* Non-nil means number continuously across print calls.
2165This affects the numbers printed for #N= labels and #M# references. 2165This affects the numbers printed for #N= labels and #M# references.
2166See also `print-circle', `print-gensym', and `print-number-table'. 2166See also `print-circle', `print-gensym', and `print-number-table'.
2167This variable should not be set with `setq'; bind it with a `let' instead. */); 2167This variable should not be set with `setq'; bind it with a `let' instead. */);
diff --git a/src/process.c b/src/process.c
index dc43191ebef..65020299e75 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7456,7 +7456,7 @@ syms_of_process (void)
7456 DEFSYM (Qargs, "args"); 7456 DEFSYM (Qargs, "args");
7457 7457
7458 DEFVAR_BOOL ("delete-exited-processes", delete_exited_processes, 7458 DEFVAR_BOOL ("delete-exited-processes", delete_exited_processes,
7459 doc: /* *Non-nil means delete processes immediately when they exit. 7459 doc: /* Non-nil means delete processes immediately when they exit.
7460A value of nil means don't delete them until `list-processes' is run. */); 7460A value of nil means don't delete them until `list-processes' is run. */);
7461 7461
7462 delete_exited_processes = 1; 7462 delete_exited_processes = 1;
diff --git a/src/syntax.c b/src/syntax.c
index 16012d9f88e..7a0e0fd7c52 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3494,7 +3494,7 @@ See the info node `(elisp)Syntax Properties' for a description of the
3494 3494
3495 DEFVAR_BOOL ("open-paren-in-column-0-is-defun-start", 3495 DEFVAR_BOOL ("open-paren-in-column-0-is-defun-start",
3496 open_paren_in_column_0_is_defun_start, 3496 open_paren_in_column_0_is_defun_start,
3497 doc: /* *Non-nil means an open paren in column 0 denotes the start of a defun. */); 3497 doc: /* Non-nil means an open paren in column 0 denotes the start of a defun. */);
3498 open_paren_in_column_0_is_defun_start = 1; 3498 open_paren_in_column_0_is_defun_start = 1;
3499 3499
3500 3500
diff --git a/src/w32term.c b/src/w32term.c
index 8a0e9efc943..18a3753f9e9 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6411,7 +6411,7 @@ the cursor have no effect. */);
6411 from cus-start.el and other places, like "M-x set-variable". */ 6411 from cus-start.el and other places, like "M-x set-variable". */
6412 DEFVAR_BOOL ("x-use-underline-position-properties", 6412 DEFVAR_BOOL ("x-use-underline-position-properties",
6413 x_use_underline_position_properties, 6413 x_use_underline_position_properties,
6414 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. 6414 doc: /* Non-nil means make use of UNDERLINE_POSITION font properties.
6415A value of nil means ignore them. If you encounter fonts with bogus 6415A value of nil means ignore them. If you encounter fonts with bogus
6416UNDERLINE_POSITION font properties, for example 7x13 on XFree prior 6416UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
6417to 4.1, set this to nil. You can also use `underline-minimum-offset' 6417to 4.1, set this to nil. You can also use `underline-minimum-offset'
@@ -6421,7 +6421,7 @@ sizes. */);
6421 6421
6422 DEFVAR_BOOL ("x-underline-at-descent-line", 6422 DEFVAR_BOOL ("x-underline-at-descent-line",
6423 x_underline_at_descent_line, 6423 x_underline_at_descent_line,
6424 doc: /* *Non-nil means to draw the underline at the same place as the descent line. 6424 doc: /* Non-nil means to draw the underline at the same place as the descent line.
6425A value of nil means to draw the underline according to the value of the 6425A value of nil means to draw the underline according to the value of the
6426variable `x-use-underline-position-properties', which is usually at the 6426variable `x-use-underline-position-properties', which is usually at the
6427baseline level. The default value is nil. */); 6427baseline level. The default value is nil. */);
diff --git a/src/xdisp.c b/src/xdisp.c
index 7fb3f8035df..c6939a5dcf9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28284,14 +28284,14 @@ syms_of_xdisp (void)
28284 28284
28285#ifdef HAVE_WINDOW_SYSTEM 28285#ifdef HAVE_WINDOW_SYSTEM
28286 DEFVAR_BOOL ("x-stretch-cursor", x_stretch_cursor_p, 28286 DEFVAR_BOOL ("x-stretch-cursor", x_stretch_cursor_p,
28287 doc: /* *Non-nil means draw block cursor as wide as the glyph under it. 28287 doc: /* Non-nil means draw block cursor as wide as the glyph under it.
28288For example, if a block cursor is over a tab, it will be drawn as 28288For example, if a block cursor is over a tab, it will be drawn as
28289wide as that tab on the display. */); 28289wide as that tab on the display. */);
28290 x_stretch_cursor_p = 0; 28290 x_stretch_cursor_p = 0;
28291#endif 28291#endif
28292 28292
28293 DEFVAR_LISP ("show-trailing-whitespace", Vshow_trailing_whitespace, 28293 DEFVAR_LISP ("show-trailing-whitespace", Vshow_trailing_whitespace,
28294 doc: /* *Non-nil means highlight trailing whitespace. 28294 doc: /* Non-nil means highlight trailing whitespace.
28295The face used for trailing whitespace is `trailing-whitespace'. */); 28295The face used for trailing whitespace is `trailing-whitespace'. */);
28296 Vshow_trailing_whitespace = Qnil; 28296 Vshow_trailing_whitespace = Qnil;
28297 28297
@@ -28311,7 +28311,7 @@ A value of nil means no special handling of these characters. */);
28311 Vnobreak_char_display = Qt; 28311 Vnobreak_char_display = Qt;
28312 28312
28313 DEFVAR_LISP ("void-text-area-pointer", Vvoid_text_area_pointer, 28313 DEFVAR_LISP ("void-text-area-pointer", Vvoid_text_area_pointer,
28314 doc: /* *The pointer shape to show in void text areas. 28314 doc: /* The pointer shape to show in void text areas.
28315A value of nil means to show the text pointer. Other options are `arrow', 28315A value of nil means to show the text pointer. Other options are `arrow',
28316`text', `hand', `vdrag', `hdrag', `modeline', and `hourglass'. */); 28316`text', `hand', `vdrag', `hdrag', `modeline', and `hourglass'. */);
28317 Vvoid_text_area_pointer = Qarrow; 28317 Vvoid_text_area_pointer = Qarrow;
@@ -28344,14 +28344,14 @@ where to display overlay arrows. */);
28344 = Fcons (intern_c_string ("overlay-arrow-position"), Qnil); 28344 = Fcons (intern_c_string ("overlay-arrow-position"), Qnil);
28345 28345
28346 DEFVAR_INT ("scroll-step", emacs_scroll_step, 28346 DEFVAR_INT ("scroll-step", emacs_scroll_step,
28347 doc: /* *The number of lines to try scrolling a window by when point moves out. 28347 doc: /* The number of lines to try scrolling a window by when point moves out.
28348If that fails to bring point back on frame, point is centered instead. 28348If that fails to bring point back on frame, point is centered instead.
28349If this is zero, point is always centered after it moves off frame. 28349If this is zero, point is always centered after it moves off frame.
28350If you want scrolling to always be a line at a time, you should set 28350If you want scrolling to always be a line at a time, you should set
28351`scroll-conservatively' to a large value rather than set this to 1. */); 28351`scroll-conservatively' to a large value rather than set this to 1. */);
28352 28352
28353 DEFVAR_INT ("scroll-conservatively", scroll_conservatively, 28353 DEFVAR_INT ("scroll-conservatively", scroll_conservatively,
28354 doc: /* *Scroll up to this many lines, to bring point back on screen. 28354 doc: /* Scroll up to this many lines, to bring point back on screen.
28355If point moves off-screen, redisplay will scroll by up to 28355If point moves off-screen, redisplay will scroll by up to
28356`scroll-conservatively' lines in order to bring point just barely 28356`scroll-conservatively' lines in order to bring point just barely
28357onto the screen again. If that cannot be done, then redisplay 28357onto the screen again. If that cannot be done, then redisplay
@@ -28365,7 +28365,7 @@ A value of zero means always recenter point if it moves off screen. */);
28365 scroll_conservatively = 0; 28365 scroll_conservatively = 0;
28366 28366
28367 DEFVAR_INT ("scroll-margin", scroll_margin, 28367 DEFVAR_INT ("scroll-margin", scroll_margin,
28368 doc: /* *Number of lines of margin at the top and bottom of a window. 28368 doc: /* Number of lines of margin at the top and bottom of a window.
28369Recenter the window whenever point gets within this many lines 28369Recenter the window whenever point gets within this many lines
28370of the top or bottom of the window. */); 28370of the top or bottom of the window. */);
28371 scroll_margin = 0; 28371 scroll_margin = 0;
@@ -28401,20 +28401,20 @@ Any other value means to use the appropriate face, `mode-line',
28401 mode_line_inverse_video = 1; 28401 mode_line_inverse_video = 1;
28402 28402
28403 DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit, 28403 DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit,
28404 doc: /* *Maximum buffer size for which line number should be displayed. 28404 doc: /* Maximum buffer size for which line number should be displayed.
28405If the buffer is bigger than this, the line number does not appear 28405If the buffer is bigger than this, the line number does not appear
28406in the mode line. A value of nil means no limit. */); 28406in the mode line. A value of nil means no limit. */);
28407 Vline_number_display_limit = Qnil; 28407 Vline_number_display_limit = Qnil;
28408 28408
28409 DEFVAR_INT ("line-number-display-limit-width", 28409 DEFVAR_INT ("line-number-display-limit-width",
28410 line_number_display_limit_width, 28410 line_number_display_limit_width,
28411 doc: /* *Maximum line width (in characters) for line number display. 28411 doc: /* Maximum line width (in characters) for line number display.
28412If the average length of the lines near point is bigger than this, then the 28412If the average length of the lines near point is bigger than this, then the
28413line number may be omitted from the mode line. */); 28413line number may be omitted from the mode line. */);
28414 line_number_display_limit_width = 200; 28414 line_number_display_limit_width = 200;
28415 28415
28416 DEFVAR_BOOL ("highlight-nonselected-windows", highlight_nonselected_windows, 28416 DEFVAR_BOOL ("highlight-nonselected-windows", highlight_nonselected_windows,
28417 doc: /* *Non-nil means highlight region even in nonselected windows. */); 28417 doc: /* Non-nil means highlight region even in nonselected windows. */);
28418 highlight_nonselected_windows = 0; 28418 highlight_nonselected_windows = 0;
28419 28419
28420 DEFVAR_BOOL ("multiple-frames", multiple_frames, 28420 DEFVAR_BOOL ("multiple-frames", multiple_frames,
@@ -28486,7 +28486,7 @@ See `set-window-redisplay-end-trigger'. */);
28486 Vredisplay_end_trigger_functions = Qnil; 28486 Vredisplay_end_trigger_functions = Qnil;
28487 28487
28488 DEFVAR_LISP ("mouse-autoselect-window", Vmouse_autoselect_window, 28488 DEFVAR_LISP ("mouse-autoselect-window", Vmouse_autoselect_window,
28489 doc: /* *Non-nil means autoselect window with mouse pointer. 28489 doc: /* Non-nil means autoselect window with mouse pointer.
28490If nil, do not autoselect windows. 28490If nil, do not autoselect windows.
28491A positive number means delay autoselection by that many seconds: a 28491A positive number means delay autoselection by that many seconds: a
28492window is autoselected only after the mouse has remained in that 28492window is autoselected only after the mouse has remained in that
@@ -28506,7 +28506,7 @@ When customizing this variable make sure that the actual value of
28506 Vmouse_autoselect_window = Qnil; 28506 Vmouse_autoselect_window = Qnil;
28507 28507
28508 DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars, 28508 DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars,
28509 doc: /* *Non-nil means automatically resize tool-bars. 28509 doc: /* Non-nil means automatically resize tool-bars.
28510This dynamically changes the tool-bar's height to the minimum height 28510This dynamically changes the tool-bar's height to the minimum height
28511that is needed to make all tool-bar items visible. 28511that is needed to make all tool-bar items visible.
28512If value is `grow-only', the tool-bar's height is only increased 28512If value is `grow-only', the tool-bar's height is only increased
@@ -28514,15 +28514,15 @@ automatically; to decrease the tool-bar height, use \\[recenter]. */);
28514 Vauto_resize_tool_bars = Qt; 28514 Vauto_resize_tool_bars = Qt;
28515 28515
28516 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", auto_raise_tool_bar_buttons_p, 28516 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", auto_raise_tool_bar_buttons_p,
28517 doc: /* *Non-nil means raise tool-bar buttons when the mouse moves over them. */); 28517 doc: /* Non-nil means raise tool-bar buttons when the mouse moves over them. */);
28518 auto_raise_tool_bar_buttons_p = 1; 28518 auto_raise_tool_bar_buttons_p = 1;
28519 28519
28520 DEFVAR_BOOL ("make-cursor-line-fully-visible", make_cursor_line_fully_visible_p, 28520 DEFVAR_BOOL ("make-cursor-line-fully-visible", make_cursor_line_fully_visible_p,
28521 doc: /* *Non-nil means to scroll (recenter) cursor line if it is not fully visible. */); 28521 doc: /* Non-nil means to scroll (recenter) cursor line if it is not fully visible. */);
28522 make_cursor_line_fully_visible_p = 1; 28522 make_cursor_line_fully_visible_p = 1;
28523 28523
28524 DEFVAR_LISP ("tool-bar-border", Vtool_bar_border, 28524 DEFVAR_LISP ("tool-bar-border", Vtool_bar_border,
28525 doc: /* *Border below tool-bar in pixels. 28525 doc: /* Border below tool-bar in pixels.
28526If an integer, use it as the height of the border. 28526If an integer, use it as the height of the border.
28527If it is one of `internal-border-width' or `border-width', use the 28527If it is one of `internal-border-width' or `border-width', use the
28528value of the corresponding frame parameter. 28528value of the corresponding frame parameter.
@@ -28530,7 +28530,7 @@ Otherwise, no border is added below the tool-bar. */);
28530 Vtool_bar_border = Qinternal_border_width; 28530 Vtool_bar_border = Qinternal_border_width;
28531 28531
28532 DEFVAR_LISP ("tool-bar-button-margin", Vtool_bar_button_margin, 28532 DEFVAR_LISP ("tool-bar-button-margin", Vtool_bar_button_margin,
28533 doc: /* *Margin around tool-bar buttons in pixels. 28533 doc: /* Margin around tool-bar buttons in pixels.
28534If an integer, use that for both horizontal and vertical margins. 28534If an integer, use that for both horizontal and vertical margins.
28535Otherwise, value should be a pair of integers `(HORZ . VERT)' with 28535Otherwise, value should be a pair of integers `(HORZ . VERT)' with
28536HORZ specifying the horizontal margin, and VERT specifying the 28536HORZ specifying the horizontal margin, and VERT specifying the
@@ -28538,7 +28538,7 @@ vertical margin. */);
28538 Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN); 28538 Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN);
28539 28539
28540 DEFVAR_INT ("tool-bar-button-relief", tool_bar_button_relief, 28540 DEFVAR_INT ("tool-bar-button-relief", tool_bar_button_relief,
28541 doc: /* *Relief thickness of tool-bar buttons. */); 28541 doc: /* Relief thickness of tool-bar buttons. */);
28542 tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF; 28542 tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF;
28543 28543
28544 DEFVAR_LISP ("tool-bar-style", Vtool_bar_style, 28544 DEFVAR_LISP ("tool-bar-style", Vtool_bar_style,
@@ -28553,7 +28553,7 @@ It can be one of
28553 Vtool_bar_style = Qnil; 28553 Vtool_bar_style = Qnil;
28554 28554
28555 DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size, 28555 DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size,
28556 doc: /* *Maximum number of characters a label can have to be shown. 28556 doc: /* Maximum number of characters a label can have to be shown.
28557The tool bar style must also show labels for this to have any effect, see 28557The tool bar style must also show labels for this to have any effect, see
28558`tool-bar-style'. */); 28558`tool-bar-style'. */);
28559 tool_bar_max_label_size = DEFAULT_TOOL_BAR_LABEL_SIZE; 28559 tool_bar_max_label_size = DEFAULT_TOOL_BAR_LABEL_SIZE;
@@ -28568,7 +28568,7 @@ fontified regions the property `fontified'. */);
28568 28568
28569 DEFVAR_BOOL ("unibyte-display-via-language-environment", 28569 DEFVAR_BOOL ("unibyte-display-via-language-environment",
28570 unibyte_display_via_language_environment, 28570 unibyte_display_via_language_environment,
28571 doc: /* *Non-nil means display unibyte text according to language environment. 28571 doc: /* Non-nil means display unibyte text according to language environment.
28572Specifically, this means that raw bytes in the range 160-255 decimal 28572Specifically, this means that raw bytes in the range 160-255 decimal
28573are displayed by converting them to the equivalent multibyte characters 28573are displayed by converting them to the equivalent multibyte characters
28574according to the current language environment. As a result, they are 28574according to the current language environment. As a result, they are
@@ -28579,7 +28579,7 @@ but does not change the fact they are interpreted as raw bytes. */);
28579 unibyte_display_via_language_environment = 0; 28579 unibyte_display_via_language_environment = 0;
28580 28580
28581 DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height, 28581 DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height,
28582 doc: /* *Maximum height for resizing mini-windows (the minibuffer and the echo area). 28582 doc: /* Maximum height for resizing mini-windows (the minibuffer and the echo area).
28583If a float, it specifies a fraction of the mini-window frame's height. 28583If a float, it specifies a fraction of the mini-window frame's height.
28584If an integer, it specifies a number of lines. */); 28584If an integer, it specifies a number of lines. */);
28585 Vmax_mini_window_height = make_float (0.25); 28585 Vmax_mini_window_height = make_float (0.25);
@@ -28613,12 +28613,12 @@ point visible. */);
28613 DEFSYM (Qauto_hscroll_mode, "auto-hscroll-mode"); 28613 DEFSYM (Qauto_hscroll_mode, "auto-hscroll-mode");
28614 28614
28615 DEFVAR_INT ("hscroll-margin", hscroll_margin, 28615 DEFVAR_INT ("hscroll-margin", hscroll_margin,
28616 doc: /* *How many columns away from the window edge point is allowed to get 28616 doc: /* How many columns away from the window edge point is allowed to get
28617before automatic hscrolling will horizontally scroll the window. */); 28617before automatic hscrolling will horizontally scroll the window. */);
28618 hscroll_margin = 5; 28618 hscroll_margin = 5;
28619 28619
28620 DEFVAR_LISP ("hscroll-step", Vhscroll_step, 28620 DEFVAR_LISP ("hscroll-step", Vhscroll_step,
28621 doc: /* *How many columns to scroll the window when point gets too close to the edge. 28621 doc: /* How many columns to scroll the window when point gets too close to the edge.
28622When point is less than `hscroll-margin' columns from the window 28622When point is less than `hscroll-margin' columns from the window
28623edge, automatic hscrolling will scroll the window by the amount of columns 28623edge, automatic hscrolling will scroll the window by the amount of columns
28624determined by this variable. If its value is a positive integer, scroll that 28624determined by this variable. If its value is a positive integer, scroll that
@@ -28705,7 +28705,7 @@ To add a prefix to continuation lines, use `wrap-prefix'. */);
28705#endif /* GLYPH_DEBUG */ 28705#endif /* GLYPH_DEBUG */
28706 28706
28707 DEFVAR_INT ("overline-margin", overline_margin, 28707 DEFVAR_INT ("overline-margin", overline_margin,
28708 doc: /* *Space between overline and text, in pixels. 28708 doc: /* Space between overline and text, in pixels.
28709The default value is 2: the height of the overline (1 pixel) plus 1 pixel 28709The default value is 2: the height of the overline (1 pixel) plus 1 pixel
28710margin to the character height. */); 28710margin to the character height. */);
28711 overline_margin = 2; 28711 overline_margin = 2;
@@ -28726,7 +28726,7 @@ cursor shapes. */);
28726 display_hourglass_p = 1; 28726 display_hourglass_p = 1;
28727 28727
28728 DEFVAR_LISP ("hourglass-delay", Vhourglass_delay, 28728 DEFVAR_LISP ("hourglass-delay", Vhourglass_delay,
28729 doc: /* *Seconds to wait before displaying an hourglass pointer when Emacs is busy. */); 28729 doc: /* Seconds to wait before displaying an hourglass pointer when Emacs is busy. */);
28730 Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); 28730 Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY);
28731 28731
28732 hourglass_atimer = NULL; 28732 hourglass_atimer = NULL;
diff --git a/src/xfaces.c b/src/xfaces.c
index 476fb1e0366..972de234510 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6558,7 +6558,7 @@ syms_of_xfaces (void)
6558#endif 6558#endif
6559 6559
6560 DEFVAR_LISP ("font-list-limit", Vfont_list_limit, 6560 DEFVAR_LISP ("font-list-limit", Vfont_list_limit,
6561 doc: /* *Limit for font matching. 6561 doc: /* Limit for font matching.
6562If an integer > 0, font matching functions won't load more than 6562If an integer > 0, font matching functions won't load more than
6563that number of fonts when searching for a matching font. */); 6563that number of fonts when searching for a matching font. */);
6564 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); 6564 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT);
@@ -6568,7 +6568,7 @@ that number of fonts when searching for a matching font. */);
6568 Vface_new_frame_defaults = Qnil; 6568 Vface_new_frame_defaults = Qnil;
6569 6569
6570 DEFVAR_LISP ("face-default-stipple", Vface_default_stipple, 6570 DEFVAR_LISP ("face-default-stipple", Vface_default_stipple,
6571 doc: /* *Default stipple pattern used on monochrome displays. 6571 doc: /* Default stipple pattern used on monochrome displays.
6572This stipple pattern is used on monochrome displays 6572This stipple pattern is used on monochrome displays
6573instead of shades of gray for a face background color. 6573instead of shades of gray for a face background color.
6574See `set-face-stipple' for possible values for this variable. */); 6574See `set-face-stipple' for possible values for this variable. */);
diff --git a/src/xfns.c b/src/xfns.c
index 6f08ada1bb9..df1b39b018f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5920,32 +5920,32 @@ Chinese, Japanese, and Korean. */);
5920 5920
5921/* This is not ifdef:ed, so other builds than GTK can customize it. */ 5921/* This is not ifdef:ed, so other builds than GTK can customize it. */
5922 DEFVAR_BOOL ("x-gtk-use-old-file-dialog", x_gtk_use_old_file_dialog, 5922 DEFVAR_BOOL ("x-gtk-use-old-file-dialog", x_gtk_use_old_file_dialog,
5923 doc: /* *Non-nil means prompt with the old GTK file selection dialog. 5923 doc: /* Non-nil means prompt with the old GTK file selection dialog.
5924If nil or if the file selection dialog is not available, the new GTK file 5924If nil or if the file selection dialog is not available, the new GTK file
5925chooser is used instead. To turn off all file dialogs set the 5925chooser is used instead. To turn off all file dialogs set the
5926variable `use-file-dialog'. */); 5926variable `use-file-dialog'. */);
5927 x_gtk_use_old_file_dialog = 0; 5927 x_gtk_use_old_file_dialog = 0;
5928 5928
5929 DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files, 5929 DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files,
5930 doc: /* *If non-nil, the GTK file chooser will by default show hidden files. 5930 doc: /* If non-nil, the GTK file chooser will by default show hidden files.
5931Note that this is just the default, there is a toggle button on the file 5931Note that this is just the default, there is a toggle button on the file
5932chooser to show or not show hidden files on a case by case basis. */); 5932chooser to show or not show hidden files on a case by case basis. */);
5933 x_gtk_show_hidden_files = 0; 5933 x_gtk_show_hidden_files = 0;
5934 5934
5935 DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text, 5935 DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text,
5936 doc: /* *If non-nil, the GTK file chooser will show additional help text. 5936 doc: /* If non-nil, the GTK file chooser will show additional help text.
5937If more space for files in the file chooser dialog is wanted, set this to nil 5937If more space for files in the file chooser dialog is wanted, set this to nil
5938to turn the additional text off. */); 5938to turn the additional text off. */);
5939 x_gtk_file_dialog_help_text = 1; 5939 x_gtk_file_dialog_help_text = 1;
5940 5940
5941 DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", x_gtk_whole_detached_tool_bar, 5941 DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", x_gtk_whole_detached_tool_bar,
5942 doc: /* *If non-nil, a detached tool bar is shown in full. 5942 doc: /* If non-nil, a detached tool bar is shown in full.
5943The default is to just show an arrow and pressing on that arrow shows 5943The default is to just show an arrow and pressing on that arrow shows
5944the tool bar buttons. */); 5944the tool bar buttons. */);
5945 x_gtk_whole_detached_tool_bar = 0; 5945 x_gtk_whole_detached_tool_bar = 0;
5946 5946
5947 DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, 5947 DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips,
5948 doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. 5948 doc: /* If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used.
5949Otherwise use Emacs own tooltip implementation. 5949Otherwise use Emacs own tooltip implementation.
5950When using Gtk+ tooltips, the tooltip face is not used. */); 5950When using Gtk+ tooltips, the tooltip face is not used. */);
5951 x_gtk_use_system_tooltips = 1; 5951 x_gtk_use_system_tooltips = 1;
diff --git a/src/xsettings.c b/src/xsettings.c
index 066c6e795e9..69ef22f55d7 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -1024,7 +1024,7 @@ syms_of_xsettings (void)
1024 defsubr (&Sfont_get_system_normal_font); 1024 defsubr (&Sfont_get_system_normal_font);
1025 1025
1026 DEFVAR_BOOL ("font-use-system-font", use_system_font, 1026 DEFVAR_BOOL ("font-use-system-font", use_system_font,
1027 doc: /* *Non-nil means to apply the system defined font dynamically. 1027 doc: /* Non-nil means to apply the system defined font dynamically.
1028When this is non-nil and the system defined fixed width font changes, we 1028When this is non-nil and the system defined fixed width font changes, we
1029update frames dynamically. 1029update frames dynamically.
1030If this variable is nil, Emacs ignores system font changes. */); 1030If this variable is nil, Emacs ignores system font changes. */);
diff --git a/src/xterm.c b/src/xterm.c
index 9ce166883c3..f5272fc7630 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10830,7 +10830,7 @@ syms_of_xterm (void)
10830 10830
10831 DEFVAR_BOOL ("x-use-underline-position-properties", 10831 DEFVAR_BOOL ("x-use-underline-position-properties",
10832 x_use_underline_position_properties, 10832 x_use_underline_position_properties,
10833 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. 10833 doc: /* Non-nil means make use of UNDERLINE_POSITION font properties.
10834A value of nil means ignore them. If you encounter fonts with bogus 10834A value of nil means ignore them. If you encounter fonts with bogus
10835UNDERLINE_POSITION font properties, for example 7x13 on XFree prior 10835UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
10836to 4.1, set this to nil. You can also use `underline-minimum-offset' 10836to 4.1, set this to nil. You can also use `underline-minimum-offset'
@@ -10840,7 +10840,7 @@ sizes. */);
10840 10840
10841 DEFVAR_BOOL ("x-underline-at-descent-line", 10841 DEFVAR_BOOL ("x-underline-at-descent-line",
10842 x_underline_at_descent_line, 10842 x_underline_at_descent_line,
10843 doc: /* *Non-nil means to draw the underline at the same place as the descent line. 10843 doc: /* Non-nil means to draw the underline at the same place as the descent line.
10844A value of nil means to draw the underline according to the value of the 10844A value of nil means to draw the underline according to the value of the
10845variable `x-use-underline-position-properties', which is usually at the 10845variable `x-use-underline-position-properties', which is usually at the
10846baseline level. The default value is nil. */); 10846baseline level. The default value is nil. */);