aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2008-12-03 05:48:14 +0000
committerLute Kamstra2008-12-03 05:48:14 +0000
commit9201cc281b10650e96296eda8519403e2b508fbd (patch)
treee86a6ba2b3d0044d996036ccf8430908dca34b26
parent1b17adfd3b07d24b4665ff66fd1b1dcc05f6c823 (diff)
downloademacs-9201cc281b10650e96296eda8519403e2b508fbd.tar.gz
emacs-9201cc281b10650e96296eda8519403e2b508fbd.zip
* align.el:
* allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
-rw-r--r--lisp/ChangeLog104
-rw-r--r--lisp/align.el42
-rw-r--r--lisp/allout.el70
-rw-r--r--lisp/apropos.el2
-rw-r--r--lisp/arc-mode.el32
-rw-r--r--lisp/autoinsert.el8
-rw-r--r--lisp/avoid.el6
-rw-r--r--lisp/battery.el12
-rw-r--r--lisp/bookmark.el4
-rw-r--r--lisp/buff-menu.el8
-rw-r--r--lisp/calculator.el36
-rw-r--r--lisp/chistory.el4
-rw-r--r--lisp/cmuscheme.el14
-rw-r--r--lisp/comint.el32
-rw-r--r--lisp/compare-w.el14
-rw-r--r--lisp/dabbrev.el28
-rw-r--r--lisp/delim-col.el20
-rw-r--r--lisp/desktop.el6
-rw-r--r--lisp/diff-mode.el14
-rw-r--r--lisp/diff.el4
-rw-r--r--lisp/dired-aux.el4
-rw-r--r--lisp/dired-x.el26
-rw-r--r--lisp/dired.el22
-rw-r--r--lisp/dos-vars.el4
-rw-r--r--lisp/ediff-diff.el24
-rw-r--r--lisp/ediff-help.el4
-rw-r--r--lisp/ediff-init.el58
-rw-r--r--lisp/ediff-merg.el10
-rw-r--r--lisp/ediff-mult.el18
-rw-r--r--lisp/ediff-ptch.el10
-rw-r--r--lisp/ediff-vers.el2
-rw-r--r--lisp/ediff-wind.el16
-rw-r--r--lisp/ediff.el2
-rw-r--r--lisp/emerge.el42
-rw-r--r--lisp/facemenu.el4
-rw-r--r--lisp/faces.el12
-rw-r--r--lisp/ffap.el36
-rw-r--r--lisp/filecache.el8
-rw-r--r--lisp/find-dired.el6
-rw-r--r--lisp/font-core.el2
-rw-r--r--lisp/font-lock.el8
-rw-r--r--lisp/forms.el10
-rw-r--r--lisp/fringe.el2
-rw-r--r--lisp/help-at-pt.el4
-rw-r--r--lisp/hippie-exp.el14
-rw-r--r--lisp/ido.el120
-rw-r--r--lisp/image-file.el4
-rw-r--r--lisp/imenu.el20
-rw-r--r--lisp/indent.el6
-rw-r--r--lisp/info.el18
-rw-r--r--lisp/isearchb.el4
-rw-r--r--lisp/iswitchb.el22
-rw-r--r--lisp/jit-lock.el12
-rw-r--r--lisp/jka-compr.el2
-rw-r--r--lisp/log-edit.el14
-rw-r--r--lisp/lpr.el16
-rw-r--r--lisp/ls-lisp.el16
-rw-r--r--lisp/man.el12
-rw-r--r--lisp/menu-bar.el6
-rw-r--r--lisp/midnight.el16
-rw-r--r--lisp/mouse-sel.el6
-rw-r--r--lisp/mouse.el14
-rw-r--r--lisp/msb.el20
-rw-r--r--lisp/outline.el2
-rw-r--r--lisp/paren.el8
-rw-r--r--lisp/pcmpl-cvs.el2
-rw-r--r--lisp/pcmpl-gnu.el4
-rw-r--r--lisp/pcomplete.el44
-rw-r--r--lisp/pcvs-info.el4
-rw-r--r--lisp/pcvs-parse.el4
-rw-r--r--lisp/printing.el70
-rw-r--r--lisp/ps-mule.el4
-rw-r--r--lisp/ps-print.el190
-rw-r--r--lisp/replace.el32
-rw-r--r--lisp/ruler-mode.el20
-rw-r--r--lisp/saveplace.el6
-rw-r--r--lisp/sb-image.el2
-rw-r--r--lisp/scroll-bar.el4
-rw-r--r--lisp/sha1.el6
-rw-r--r--lisp/shadowfile.el4
-rw-r--r--lisp/shell.el2
-rw-r--r--lisp/sort.el4
-rw-r--r--lisp/speedbar.el76
-rw-r--r--lisp/strokes.el12
-rw-r--r--lisp/tempo.el8
-rw-r--r--lisp/term.el16
-rw-r--r--lisp/terminal.el10
-rw-r--r--lisp/time-stamp.el6
-rw-r--r--lisp/time.el20
-rw-r--r--lisp/tree-widget.el8
-rw-r--r--lisp/type-break.el32
-rw-r--r--lisp/vc-cvs.el16
-rw-r--r--lisp/vc-hg.el2
-rw-r--r--lisp/vc-mcvs.el12
-rw-r--r--lisp/vc-rcs.el12
-rw-r--r--lisp/vc-sccs.el6
-rw-r--r--lisp/vc.el12
-rw-r--r--lisp/view.el12
-rw-r--r--lisp/w32-vars.el12
-rw-r--r--lisp/whitespace.el48
-rw-r--r--lisp/wid-edit.el4
101 files changed, 988 insertions, 884 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfb95e4efab..c0a55b4aa48 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,107 @@
12008-12-03 Lute Kamstra <lute@gnu.org>
2
3 * align.el:
4 * allout.el:
5 * apropos.el:
6 * arc-mode.el:
7 * autoinsert.el:
8 * avoid.el:
9 * battery.el:
10 * bookmark.el:
11 * buff-menu.el:
12 * calculator.el:
13 * chistory.el:
14 * cmuscheme.el:
15 * comint.el:
16 * compare-w.el:
17 * dabbrev.el:
18 * delim-col.el:
19 * desktop.el:
20 * diff-mode.el:
21 * diff.el:
22 * dired-aux.el:
23 * dired-x.el:
24 * dired.el:
25 * dos-vars.el:
26 * ediff-diff.el:
27 * ediff-help.el:
28 * ediff-init.el:
29 * ediff-merg.el:
30 * ediff-mult.el:
31 * ediff-ptch.el:
32 * ediff-vers.el:
33 * ediff-wind.el:
34 * ediff.el:
35 * emerge.el:
36 * facemenu.el:
37 * faces.el:
38 * ffap.el:
39 * filecache.el:
40 * find-dired.el:
41 * font-core.el:
42 * font-lock.el:
43 * forms.el:
44 * fringe.el:
45 * help-at-pt.el:
46 * hippie-exp.el:
47 * ido.el:
48 * image-file.el:
49 * imenu.el:
50 * indent.el:
51 * info.el:
52 * isearchb.el:
53 * iswitchb.el:
54 * jit-lock.el:
55 * jka-compr.el:
56 * log-edit.el:
57 * lpr.el:
58 * ls-lisp.el:
59 * man.el:
60 * menu-bar.el:
61 * midnight.el:
62 * mouse-sel.el:
63 * mouse.el:
64 * msb.el:
65 * outline.el:
66 * paren.el:
67 * pcmpl-cvs.el:
68 * pcmpl-gnu.el:
69 * pcomplete.el:
70 * pcvs-info.el:
71 * pcvs-parse.el:
72 * printing.el:
73 * ps-mule.el:
74 * ps-print.el:
75 * replace.el:
76 * ruler-mode.el:
77 * saveplace.el:
78 * sb-image.el:
79 * scroll-bar.el:
80 * sha1.el:
81 * shadowfile.el:
82 * shell.el:
83 * sort.el:
84 * speedbar.el:
85 * strokes.el:
86 * tempo.el:
87 * term.el:
88 * terminal.el:
89 * time-stamp.el:
90 * time.el:
91 * tree-widget.el:
92 * type-break.el:
93 * vc-cvs.el:
94 * vc-hg.el:
95 * vc-mcvs.el:
96 * vc-rcs.el:
97 * vc-sccs.el:
98 * vc.el:
99 * view.el:
100 * w32-vars.el:
101 * whitespace.el:
102 * wid-edit.el: Remove leading * from docstrings of defcustoms,
103 deffaces, defconsts and defuns.
104
12008-12-02 Stefan Monnier <monnier@iro.umontreal.ca> 1052008-12-02 Stefan Monnier <monnier@iro.umontreal.ca>
2 106
3 * complete.el (PC-do-completion): Fix leftover bug from Emacs-21 when 107 * complete.el (PC-do-completion): Fix leftover bug from Emacs-21 when
diff --git a/lisp/align.el b/lisp/align.el
index a384b7c5080..44661d36bab 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -3,7 +3,7 @@
3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6;; Author: John Wiegley <johnw@gnu.org> 6;; Author: John Wiegley <johnw@gnu.org>
7;; Maintainer: FSF 7;; Maintainer: FSF
8;; Keywords: convenience languages lisp 8;; Keywords: convenience languages lisp
9 9
@@ -127,17 +127,17 @@
127;;; User Variables: 127;;; User Variables:
128 128
129(defcustom align-load-hook nil 129(defcustom align-load-hook nil
130 "*Hook that gets run after the aligner has been loaded." 130 "Hook that gets run after the aligner has been loaded."
131 :type 'hook 131 :type 'hook
132 :group 'align) 132 :group 'align)
133 133
134(defcustom align-indent-before-aligning nil 134(defcustom align-indent-before-aligning nil
135 "*If non-nil, indent the marked region before aligning it." 135 "If non-nil, indent the marked region before aligning it."
136 :type 'boolean 136 :type 'boolean
137 :group 'align) 137 :group 'align)
138 138
139(defcustom align-default-spacing 1 139(defcustom align-default-spacing 1
140 "*An integer that represents the default amount of padding to use. 140 "An integer that represents the default amount of padding to use.
141If `align-to-tab-stop' is non-nil, this will represent the number of 141If `align-to-tab-stop' is non-nil, this will represent the number of
142tab stops to use for alignment, rather than the number of spaces. 142tab stops to use for alignment, rather than the number of spaces.
143Each alignment rule can optionally override both this variable. See 143Each alignment rule can optionally override both this variable. See
@@ -146,13 +146,13 @@ Each alignment rule can optionally override both this variable. See
146 :group 'align) 146 :group 'align)
147 147
148(defcustom align-to-tab-stop 'indent-tabs-mode 148(defcustom align-to-tab-stop 'indent-tabs-mode
149 "*If non-nil, alignments will always fall on a tab boundary. 149 "If non-nil, alignments will always fall on a tab boundary.
150It may also be a symbol, whose value will be taken." 150It may also be a symbol, whose value will be taken."
151 :type '(choice (const nil) symbol) 151 :type '(choice (const nil) symbol)
152 :group 'align) 152 :group 'align)
153 153
154(defcustom align-region-heuristic 500 154(defcustom align-region-heuristic 500
155 "*If non-nil, used as a heuristic by `align-current'. 155 "If non-nil, used as a heuristic by `align-current'.
156Since each alignment rule can possibly have its own set of alignment 156Since each alignment rule can possibly have its own set of alignment
157sections (whenever `align-region-separate' is non-nil, and not a 157sections (whenever `align-region-separate' is non-nil, and not a
158string), this heuristic is used to determine how far before and after 158string), this heuristic is used to determine how far before and after
@@ -163,72 +163,72 @@ may cause unexpected behavior at times."
163 :group 'align) 163 :group 'align)
164 164
165(defcustom align-highlight-change-face 'highlight 165(defcustom align-highlight-change-face 'highlight
166 "*The face to highlight with if changes are necessary." 166 "The face to highlight with if changes are necessary."
167 :type 'face 167 :type 'face
168 :group 'align) 168 :group 'align)
169 169
170(defcustom align-highlight-nochange-face 'secondary-selection 170(defcustom align-highlight-nochange-face 'secondary-selection
171 "*The face to highlight with if no changes are necessary." 171 "The face to highlight with if no changes are necessary."
172 :type 'face 172 :type 'face
173 :group 'align) 173 :group 'align)
174 174
175(defcustom align-large-region 10000 175(defcustom align-large-region 10000
176 "*If an integer, defines what constitutes a \"large\" region. 176 "If an integer, defines what constitutes a \"large\" region.
177If nil,then no messages will ever be printed to the minibuffer." 177If nil,then no messages will ever be printed to the minibuffer."
178 :type 'integer 178 :type 'integer
179 :group 'align) 179 :group 'align)
180 180
181(defcustom align-c++-modes '(c++-mode c-mode java-mode) 181(defcustom align-c++-modes '(c++-mode c-mode java-mode)
182 "*A list of modes whose syntax resembles C/C++." 182 "A list of modes whose syntax resembles C/C++."
183 :type '(repeat symbol) 183 :type '(repeat symbol)
184 :group 'align) 184 :group 'align)
185 185
186(defcustom align-perl-modes '(perl-mode cperl-mode) 186(defcustom align-perl-modes '(perl-mode cperl-mode)
187 "*A list of modes where perl syntax is to be seen." 187 "A list of modes where perl syntax is to be seen."
188 :type '(repeat symbol) 188 :type '(repeat symbol)
189 :group 'align) 189 :group 'align)
190 190
191(defcustom align-lisp-modes 191(defcustom align-lisp-modes
192 '(emacs-lisp-mode lisp-interaction-mode lisp-mode scheme-mode) 192 '(emacs-lisp-mode lisp-interaction-mode lisp-mode scheme-mode)
193 "*A list of modes whose syntax resembles Lisp." 193 "A list of modes whose syntax resembles Lisp."
194 :type '(repeat symbol) 194 :type '(repeat symbol)
195 :group 'align) 195 :group 'align)
196 196
197(defcustom align-tex-modes 197(defcustom align-tex-modes
198 '(tex-mode plain-tex-mode latex-mode slitex-mode) 198 '(tex-mode plain-tex-mode latex-mode slitex-mode)
199 "*A list of modes whose syntax resembles TeX (and family)." 199 "A list of modes whose syntax resembles TeX (and family)."
200 :type '(repeat symbol) 200 :type '(repeat symbol)
201 :group 'align) 201 :group 'align)
202 202
203(defcustom align-text-modes '(text-mode outline-mode) 203(defcustom align-text-modes '(text-mode outline-mode)
204 "*A list of modes whose content is plain text." 204 "A list of modes whose content is plain text."
205 :type '(repeat symbol) 205 :type '(repeat symbol)
206 :group 'align) 206 :group 'align)
207 207
208(defcustom align-dq-string-modes 208(defcustom align-dq-string-modes
209 (append align-lisp-modes align-c++-modes align-perl-modes 209 (append align-lisp-modes align-c++-modes align-perl-modes
210 '(python-mode)) 210 '(python-mode))
211 "*A list of modes where double quoted strings should be excluded." 211 "A list of modes where double quoted strings should be excluded."
212 :type '(repeat symbol) 212 :type '(repeat symbol)
213 :group 'align) 213 :group 'align)
214 214
215(defcustom align-sq-string-modes 215(defcustom align-sq-string-modes
216 (append align-perl-modes '(python-mode)) 216 (append align-perl-modes '(python-mode))
217 "*A list of modes where single quoted strings should be excluded." 217 "A list of modes where single quoted strings should be excluded."
218 :type '(repeat symbol) 218 :type '(repeat symbol)
219 :group 'align) 219 :group 'align)
220 220
221(defcustom align-open-comment-modes 221(defcustom align-open-comment-modes
222 (append align-lisp-modes align-c++-modes align-perl-modes 222 (append align-lisp-modes align-c++-modes align-perl-modes
223 '(python-mode makefile-mode)) 223 '(python-mode makefile-mode))
224 "*A list of modes with a single-line comment syntax. 224 "A list of modes with a single-line comment syntax.
225These are comments as in Lisp, which have a beginning but, end with 225These are comments as in Lisp, which have a beginning but, end with
226the line (i.e., `comment-end' is an empty string)." 226the line (i.e., `comment-end' is an empty string)."
227 :type '(repeat symbol) 227 :type '(repeat symbol)
228 :group 'align) 228 :group 'align)
229 229
230(defcustom align-region-separate "^\\s-*[{}]?\\s-*$" 230(defcustom align-region-separate "^\\s-*[{}]?\\s-*$"
231 "*Select the method by which alignment sections will be separated. 231 "Select the method by which alignment sections will be separated.
232If this is a symbol, that symbol's value will be used. 232If this is a symbol, that symbol's value will be used.
233 233
234For the sake of clarification, consider the following example, which 234For the sake of clarification, consider the following example, which
@@ -581,7 +581,7 @@ The possible settings for `align-region-separate' are:
581 (regexp . "^\\s-*\\w+:\\(\\s-*\\).*;") 581 (regexp . "^\\s-*\\w+:\\(\\s-*\\).*;")
582 (group . (1)) 582 (group . (1))
583 (modes . '(css-mode html-mode)))) 583 (modes . '(css-mode html-mode))))
584 "*A list describing all of the available alignment rules. 584 "A list describing all of the available alignment rules.
585The format is: 585The format is:
586 586
587 ((TITLE 587 ((TITLE
@@ -779,7 +779,7 @@ The following attributes are meaningful:
779 (regexp . "^\\s-*#\\s-*\\(if\\w*\\|endif\\)\\(.*\\)$") 779 (regexp . "^\\s-*#\\s-*\\(if\\w*\\|endif\\)\\(.*\\)$")
780 (group . 2) 780 (group . 2)
781 (modes . align-c++-modes))) 781 (modes . align-c++-modes)))
782 "*A list describing text that should be excluded from alignment. 782 "A list describing text that should be excluded from alignment.
783See the documentation for `align-rules-list' for more info." 783See the documentation for `align-rules-list' for more info."
784 :type align-exclude-rules-list-type 784 :type align-exclude-rules-list-type
785 :group 'align) 785 :group 'align)
@@ -837,7 +837,7 @@ See the variable `align-exclude-rules-list' for more details.")
837 837
838 (use-entity 838 (use-entity
839 (regexp . "\\(\\s-+\\)use\\s-+entity"))) 839 (regexp . "\\(\\s-+\\)use\\s-+entity")))
840 "*Alignment rules for `vhdl-mode'. See `align-rules-list' for more info." 840 "Alignment rules for `vhdl-mode'. See `align-rules-list' for more info."
841 :type align-rules-list-type 841 :type align-rules-list-type
842 :group 'align) 842 :group 'align)
843 843
diff --git a/lisp/allout.el b/lisp/allout.el
index f796baecc8b..e0af72fbfe4 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -109,7 +109,7 @@
109 109
110;;;_ = allout-command-prefix 110;;;_ = allout-command-prefix
111(defcustom allout-command-prefix "\C-c " 111(defcustom allout-command-prefix "\C-c "
112 "*Key sequence to be used as prefix for outline mode command key bindings. 112 "Key sequence to be used as prefix for outline mode command key bindings.
113 113
114Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're 114Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're
115willing to let allout use a bunch of \C-c keybindings." 115willing to let allout use a bunch of \C-c keybindings."
@@ -168,7 +168,7 @@ unless optional third, non-nil element is present.")
168 168
169;;;_ = allout-auto-activation 169;;;_ = allout-auto-activation
170(defcustom allout-auto-activation nil 170(defcustom allout-auto-activation nil
171 "*Regulates auto-activation modality of allout outlines -- see `allout-init'. 171 "Regulates auto-activation modality of allout outlines -- see `allout-init'.
172 172
173Setq-default by `allout-init' to regulate whether or not allout 173Setq-default by `allout-init' to regulate whether or not allout
174outline mode is automatically activated when the buffer-specific 174outline mode is automatically activated when the buffer-specific
@@ -197,7 +197,7 @@ this variable."
197 :group 'allout) 197 :group 'allout)
198;;;_ = allout-default-layout 198;;;_ = allout-default-layout
199(defcustom allout-default-layout '(-2 : 0) 199(defcustom allout-default-layout '(-2 : 0)
200 "*Default allout outline layout specification. 200 "Default allout outline layout specification.
201 201
202This setting specifies the outline exposure to use when 202This setting specifies the outline exposure to use when
203`allout-layout' has the local value `t'. This docstring describes the 203`allout-layout' has the local value `t'. This docstring describes the
@@ -263,7 +263,7 @@ is modulo the setting of `allout-use-mode-specific-leader', which see."
263 263
264;;;_ = allout-inhibit-auto-fill 264;;;_ = allout-inhibit-auto-fill
265(defcustom allout-inhibit-auto-fill nil 265(defcustom allout-inhibit-auto-fill nil
266 "*If non-nil, auto-fill will be inhibited in the allout buffers. 266 "If non-nil, auto-fill will be inhibited in the allout buffers.
267 267
268You can customize this setting to set it for all allout buffers, or set it 268You can customize this setting to set it for all allout buffers, or set it
269in individual buffers if you want to inhibit auto-fill only in particular 269in individual buffers if you want to inhibit auto-fill only in particular
@@ -279,7 +279,7 @@ else allout's special hanging-indent maintaining auto-fill function,
279(make-variable-buffer-local 'allout-inhibit-auto-fill) 279(make-variable-buffer-local 'allout-inhibit-auto-fill)
280;;;_ = allout-use-hanging-indents 280;;;_ = allout-use-hanging-indents
281(defcustom allout-use-hanging-indents t 281(defcustom allout-use-hanging-indents t
282 "*If non-nil, topic body text auto-indent defaults to indent of the header. 282 "If non-nil, topic body text auto-indent defaults to indent of the header.
283Ie, it is indented to be just past the header prefix. This is 283Ie, it is indented to be just past the header prefix. This is
284relevant mostly for use with `indented-text-mode', or other situations 284relevant mostly for use with `indented-text-mode', or other situations
285where auto-fill occurs." 285where auto-fill occurs."
@@ -292,7 +292,7 @@ where auto-fill occurs."
292;;;_ = allout-reindent-bodies 292;;;_ = allout-reindent-bodies
293(defcustom allout-reindent-bodies (if allout-use-hanging-indents 293(defcustom allout-reindent-bodies (if allout-use-hanging-indents
294 'text) 294 'text)
295 "*Non-nil enables auto-adjust of topic body hanging indent with depth shifts. 295 "Non-nil enables auto-adjust of topic body hanging indent with depth shifts.
296 296
297When active, topic body lines that are indented even with or beyond 297When active, topic body lines that are indented even with or beyond
298their topic header are reindented to correspond with depth shifts of 298their topic header are reindented to correspond with depth shifts of
@@ -311,7 +311,7 @@ those that do not have the variable `comment-start' set. A value of
311 311
312;;;_ = allout-show-bodies 312;;;_ = allout-show-bodies
313(defcustom allout-show-bodies nil 313(defcustom allout-show-bodies nil
314 "*If non-nil, show entire body when exposing a topic, rather than 314 "If non-nil, show entire body when exposing a topic, rather than
315just the header." 315just the header."
316 :type 'boolean 316 :type 'boolean
317 :group 'allout) 317 :group 'allout)
@@ -322,7 +322,7 @@ just the header."
322 322
323;;;_ = allout-beginning-of-line-cycles 323;;;_ = allout-beginning-of-line-cycles
324(defcustom allout-beginning-of-line-cycles t 324(defcustom allout-beginning-of-line-cycles t
325 "*If non-nil, \\[allout-beginning-of-line] will cycle through smart-placement options. 325 "If non-nil, \\[allout-beginning-of-line] will cycle through smart-placement options.
326 326
327Cycling only happens on when the command is repeated, not when it 327Cycling only happens on when the command is repeated, not when it
328follows a different command. 328follows a different command.
@@ -353,7 +353,7 @@ repeated calls."
353 :type 'boolean :group 'allout) 353 :type 'boolean :group 'allout)
354;;;_ = allout-end-of-line-cycles 354;;;_ = allout-end-of-line-cycles
355(defcustom allout-end-of-line-cycles t 355(defcustom allout-end-of-line-cycles t
356 "*If non-nil, \\[allout-end-of-line] will cycle through smart-placement options. 356 "If non-nil, \\[allout-end-of-line] will cycle through smart-placement options.
357 357
358Cycling only happens on when the command is repeated, not when it 358Cycling only happens on when the command is repeated, not when it
359follows a different command. 359follows a different command.
@@ -381,7 +381,7 @@ calls."
381(defcustom allout-header-prefix "." 381(defcustom allout-header-prefix "."
382;; this string is treated as literal match. it will be `regexp-quote'd, so 382;; this string is treated as literal match. it will be `regexp-quote'd, so
383;; one cannot use regular expressions to match varying header prefixes. 383;; one cannot use regular expressions to match varying header prefixes.
384 "*Leading string which helps distinguish topic headers. 384 "Leading string which helps distinguish topic headers.
385 385
386Outline topic header lines are identified by a leading topic 386Outline topic header lines are identified by a leading topic
387header prefix, which mostly have the value of this var at their front. 387header prefix, which mostly have the value of this var at their front.
@@ -411,7 +411,7 @@ bullets."
411(put 'allout-primary-bullet 'safe-local-variable 'stringp) 411(put 'allout-primary-bullet 'safe-local-variable 'stringp)
412;;;_ = allout-plain-bullets-string 412;;;_ = allout-plain-bullets-string
413(defcustom allout-plain-bullets-string ".," 413(defcustom allout-plain-bullets-string ".,"
414 "*The bullets normally used in outline topic prefixes. 414 "The bullets normally used in outline topic prefixes.
415 415
416See `allout-distinctive-bullets-string' for the other kind of 416See `allout-distinctive-bullets-string' for the other kind of
417bullets. 417bullets.
@@ -427,7 +427,7 @@ of this var to take effect."
427(put 'allout-plain-bullets-string 'safe-local-variable 'stringp) 427(put 'allout-plain-bullets-string 'safe-local-variable 'stringp)
428;;;_ = allout-distinctive-bullets-string 428;;;_ = allout-distinctive-bullets-string
429(defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^" 429(defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^"
430 "*Persistent outline header bullets used to distinguish special topics. 430 "Persistent outline header bullets used to distinguish special topics.
431 431
432These bullets are distinguish topics with particular character. 432These bullets are distinguish topics with particular character.
433They are not used by default in the topic creation routines, but 433They are not used by default in the topic creation routines, but
@@ -476,7 +476,7 @@ strings."
476 476
477;;;_ = allout-use-mode-specific-leader 477;;;_ = allout-use-mode-specific-leader
478(defcustom allout-use-mode-specific-leader t 478(defcustom allout-use-mode-specific-leader t
479 "*When non-nil, use mode-specific topic-header prefixes. 479 "When non-nil, use mode-specific topic-header prefixes.
480 480
481Allout outline mode will use the mode-specific `allout-mode-leaders' or 481Allout outline mode will use the mode-specific `allout-mode-leaders' or
482comment-start string, if any, to lead the topic prefix string, so topic 482comment-start string, if any, to lead the topic prefix string, so topic
@@ -527,7 +527,7 @@ from regular comments that start at the beginning-of-line.")
527 527
528;;;_ = allout-old-style-prefixes 528;;;_ = allout-old-style-prefixes
529(defcustom allout-old-style-prefixes nil 529(defcustom allout-old-style-prefixes nil
530 "*When non-nil, use only old-and-crusty `outline-mode' `*' topic prefixes. 530 "When non-nil, use only old-and-crusty `outline-mode' `*' topic prefixes.
531 531
532Non-nil restricts the topic creation and modification 532Non-nil restricts the topic creation and modification
533functions to asterix-padded prefixes, so they look exactly 533functions to asterix-padded prefixes, so they look exactly
@@ -543,7 +543,7 @@ are always respected by the topic maneuvering functions."
543 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) 543 (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
544;;;_ = allout-stylish-prefixes -- alternating bullets 544;;;_ = allout-stylish-prefixes -- alternating bullets
545(defcustom allout-stylish-prefixes t 545(defcustom allout-stylish-prefixes t
546 "*Do fancy stuff with topic prefix bullets according to level, etc. 546 "Do fancy stuff with topic prefix bullets according to level, etc.
547 547
548Non-nil enables topic creation, modification, and repositioning 548Non-nil enables topic creation, modification, and repositioning
549functions to vary the topic bullet char (the char that marks the topic 549functions to vary the topic bullet char (the char that marks the topic
@@ -593,7 +593,7 @@ is non-nil."
593 593
594;;;_ = allout-numbered-bullet 594;;;_ = allout-numbered-bullet
595(defcustom allout-numbered-bullet "#" 595(defcustom allout-numbered-bullet "#"
596 "*String designating bullet of topics that have auto-numbering; nil for none. 596 "String designating bullet of topics that have auto-numbering; nil for none.
597 597
598Topics having this bullet have automatic maintenance of a sibling 598Topics having this bullet have automatic maintenance of a sibling
599sequence-number tacked on, just after the bullet. Conventionally set 599sequence-number tacked on, just after the bullet. Conventionally set
@@ -609,7 +609,7 @@ disables numbering maintenance."
609 '(lambda (x) (or (stringp x) (null x))))) 609 '(lambda (x) (or (stringp x) (null x)))))
610;;;_ = allout-file-xref-bullet 610;;;_ = allout-file-xref-bullet
611(defcustom allout-file-xref-bullet "@" 611(defcustom allout-file-xref-bullet "@"
612 "*Bullet signifying file cross-references, for `allout-resolve-xref'. 612 "Bullet signifying file cross-references, for `allout-resolve-xref'.
613 613
614Set this var to the bullet you want to use for file cross-references." 614Set this var to the bullet you want to use for file cross-references."
615 :type '(choice (const nil) string) 615 :type '(choice (const nil) string)
@@ -621,7 +621,7 @@ Set this var to the bullet you want to use for file cross-references."
621 '(lambda (x) (or (stringp x) (null x))))) 621 '(lambda (x) (or (stringp x) (null x)))))
622;;;_ = allout-presentation-padding 622;;;_ = allout-presentation-padding
623(defcustom allout-presentation-padding 2 623(defcustom allout-presentation-padding 2
624 "*Presentation-format white-space padding factor, for greater indent." 624 "Presentation-format white-space padding factor, for greater indent."
625 :type 'integer 625 :type 'integer
626 :group 'allout) 626 :group 'allout)
627 627
@@ -631,7 +631,7 @@ Set this var to the bullet you want to use for file cross-references."
631 631
632;;;_ = allout-abbreviate-flattened-numbering 632;;;_ = allout-abbreviate-flattened-numbering
633(defcustom allout-abbreviate-flattened-numbering nil 633(defcustom allout-abbreviate-flattened-numbering nil
634 "*If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic 634 "If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic
635numbers to minimal amount with some context. Otherwise, entire 635numbers to minimal amount with some context. Otherwise, entire
636numbers are always used." 636numbers are always used."
637 :type 'boolean 637 :type 'boolean
@@ -640,43 +640,43 @@ numbers are always used."
640;;;_ + LaTeX formatting 640;;;_ + LaTeX formatting
641;;;_ - allout-number-pages 641;;;_ - allout-number-pages
642(defcustom allout-number-pages nil 642(defcustom allout-number-pages nil
643 "*Non-nil turns on page numbering for LaTeX formatting of an outline." 643 "Non-nil turns on page numbering for LaTeX formatting of an outline."
644 :type 'boolean 644 :type 'boolean
645 :group 'allout) 645 :group 'allout)
646;;;_ - allout-label-style 646;;;_ - allout-label-style
647(defcustom allout-label-style "\\large\\bf" 647(defcustom allout-label-style "\\large\\bf"
648 "*Font and size of labels for LaTeX formatting of an outline." 648 "Font and size of labels for LaTeX formatting of an outline."
649 :type 'string 649 :type 'string
650 :group 'allout) 650 :group 'allout)
651;;;_ - allout-head-line-style 651;;;_ - allout-head-line-style
652(defcustom allout-head-line-style "\\large\\sl " 652(defcustom allout-head-line-style "\\large\\sl "
653 "*Font and size of entries for LaTeX formatting of an outline." 653 "Font and size of entries for LaTeX formatting of an outline."
654 :type 'string 654 :type 'string
655 :group 'allout) 655 :group 'allout)
656;;;_ - allout-body-line-style 656;;;_ - allout-body-line-style
657(defcustom allout-body-line-style " " 657(defcustom allout-body-line-style " "
658 "*Font and size of entries for LaTeX formatting of an outline." 658 "Font and size of entries for LaTeX formatting of an outline."
659 :type 'string 659 :type 'string
660 :group 'allout) 660 :group 'allout)
661;;;_ - allout-title-style 661;;;_ - allout-title-style
662(defcustom allout-title-style "\\Large\\bf" 662(defcustom allout-title-style "\\Large\\bf"
663 "*Font and size of titles for LaTeX formatting of an outline." 663 "Font and size of titles for LaTeX formatting of an outline."
664 :type 'string 664 :type 'string
665 :group 'allout) 665 :group 'allout)
666;;;_ - allout-title 666;;;_ - allout-title
667(defcustom allout-title '(or buffer-file-name (buffer-name)) 667(defcustom allout-title '(or buffer-file-name (buffer-name))
668 "*Expression to be evaluated to determine the title for LaTeX 668 "Expression to be evaluated to determine the title for LaTeX
669formatted copy." 669formatted copy."
670 :type 'sexp 670 :type 'sexp
671 :group 'allout) 671 :group 'allout)
672;;;_ - allout-line-skip 672;;;_ - allout-line-skip
673(defcustom allout-line-skip ".05cm" 673(defcustom allout-line-skip ".05cm"
674 "*Space between lines for LaTeX formatting of an outline." 674 "Space between lines for LaTeX formatting of an outline."
675 :type 'string 675 :type 'string
676 :group 'allout) 676 :group 'allout)
677;;;_ - allout-indent 677;;;_ - allout-indent
678(defcustom allout-indent ".3cm" 678(defcustom allout-indent ".3cm"
679 "*LaTeX formatted depth-indent spacing." 679 "LaTeX formatted depth-indent spacing."
680 :type 'string 680 :type 'string
681 :group 'allout) 681 :group 'allout)
682 682
@@ -687,13 +687,13 @@ formatted copy."
687 :group 'allout) 687 :group 'allout)
688;;;_ = allout-topic-encryption-bullet 688;;;_ = allout-topic-encryption-bullet
689(defcustom allout-topic-encryption-bullet "~" 689(defcustom allout-topic-encryption-bullet "~"
690 "*Bullet signifying encryption of the entry's body." 690 "Bullet signifying encryption of the entry's body."
691 :type '(choice (const nil) string) 691 :type '(choice (const nil) string)
692 :version "22.1" 692 :version "22.1"
693 :group 'allout-encryption) 693 :group 'allout-encryption)
694;;;_ = allout-passphrase-verifier-handling 694;;;_ = allout-passphrase-verifier-handling
695(defcustom allout-passphrase-verifier-handling t 695(defcustom allout-passphrase-verifier-handling t
696 "*Enable use of symmetric encryption passphrase verifier if non-nil. 696 "Enable use of symmetric encryption passphrase verifier if non-nil.
697 697
698See the docstring for the `allout-enable-file-variable-adjustment' 698See the docstring for the `allout-enable-file-variable-adjustment'
699variable for details about allout ajustment of file variables." 699variable for details about allout ajustment of file variables."
@@ -703,7 +703,7 @@ variable for details about allout ajustment of file variables."
703(make-variable-buffer-local 'allout-passphrase-verifier-handling) 703(make-variable-buffer-local 'allout-passphrase-verifier-handling)
704;;;_ = allout-passphrase-hint-handling 704;;;_ = allout-passphrase-hint-handling
705(defcustom allout-passphrase-hint-handling 'always 705(defcustom allout-passphrase-hint-handling 'always
706 "*Dictate outline encryption passphrase reminder handling: 706 "Dictate outline encryption passphrase reminder handling:
707 707
708 always -- always show reminder when prompting 708 always -- always show reminder when prompting
709 needed -- show reminder on passphrase entry failure 709 needed -- show reminder on passphrase entry failure
@@ -719,7 +719,7 @@ variable for details about allout ajustment of file variables."
719(make-variable-buffer-local 'allout-passphrase-hint-handling) 719(make-variable-buffer-local 'allout-passphrase-hint-handling)
720;;;_ = allout-encrypt-unencrypted-on-saves 720;;;_ = allout-encrypt-unencrypted-on-saves
721(defcustom allout-encrypt-unencrypted-on-saves t 721(defcustom allout-encrypt-unencrypted-on-saves t
722 "*When saving, should topics pending encryption be encrypted? 722 "When saving, should topics pending encryption be encrypted?
723 723
724The idea is to prevent file-system exposure of any un-encrypted stuff, and 724The idea is to prevent file-system exposure of any un-encrypted stuff, and
725mostly covers both deliberate file writes and auto-saves. 725mostly covers both deliberate file writes and auto-saves.
@@ -758,7 +758,7 @@ disable auto-saves for that file."
758 :group 'allout) 758 :group 'allout)
759;;;_ = allout-run-unit-tests-on-load 759;;;_ = allout-run-unit-tests-on-load
760(defcustom allout-run-unit-tests-on-load nil 760(defcustom allout-run-unit-tests-on-load nil
761 "*When non-nil, unit tests will be run at end of loading the allout module. 761 "When non-nil, unit tests will be run at end of loading the allout module.
762 762
763Generally, allout code developers are the only ones who'll want to set this. 763Generally, allout code developers are the only ones who'll want to set this.
764 764
@@ -774,7 +774,7 @@ See `allout-run-unit-tests' to see what's run."
774 774
775;;;_ = allout-enable-file-variable-adjustment 775;;;_ = allout-enable-file-variable-adjustment
776(defcustom allout-enable-file-variable-adjustment t 776(defcustom allout-enable-file-variable-adjustment t
777 "*If non-nil, some allout outline actions edit Emacs local file var text. 777 "If non-nil, some allout outline actions edit Emacs local file var text.
778 778
779This can range from changes to existing entries, addition of new ones, 779This can range from changes to existing entries, addition of new ones,
780and creation of a new local variables section when necessary. 780and creation of a new local variables section when necessary.
@@ -929,14 +929,14 @@ useful at greater depths, more modest doublecheck limits are more
929suitably economical.") 929suitably economical.")
930;;;_ X allout-reset-header-lead (header-lead) 930;;;_ X allout-reset-header-lead (header-lead)
931(defun allout-reset-header-lead (header-lead) 931(defun allout-reset-header-lead (header-lead)
932 "*Reset the leading string used to identify topic headers." 932 "Reset the leading string used to identify topic headers."
933 (interactive "sNew lead string: ") 933 (interactive "sNew lead string: ")
934 (setq allout-header-prefix header-lead) 934 (setq allout-header-prefix header-lead)
935 (setq allout-header-subtraction (1- (length allout-header-prefix))) 935 (setq allout-header-subtraction (1- (length allout-header-prefix)))
936 (set-allout-regexp)) 936 (set-allout-regexp))
937;;;_ X allout-lead-with-comment-string (header-lead) 937;;;_ X allout-lead-with-comment-string (header-lead)
938(defun allout-lead-with-comment-string (&optional header-lead) 938(defun allout-lead-with-comment-string (&optional header-lead)
939 "*Set the topic-header leading string to specified string. 939 "Set the topic-header leading string to specified string.
940 940
941Useful when for encapsulating outline structure in programming 941Useful when for encapsulating outline structure in programming
942language comments. Returns the leading string." 942language comments. Returns the leading string."
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 31eada954fe..eb6dc8236c4 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -112,7 +112,7 @@ If value is `verbose', the computed score is shown for each match."
112 (const :tag "show scores" verbose))) 112 (const :tag "show scores" verbose)))
113 113
114(defcustom apropos-documentation-sort-by-scores t 114(defcustom apropos-documentation-sort-by-scores t
115 "*Non-nil means sort matches by scores; best match is shown first. 115 "Non-nil means sort matches by scores; best match is shown first.
116This applies to `apropos-documentation' only. 116This applies to `apropos-documentation' only.
117If value is `verbose', the computed score is shown for each match." 117If value is `verbose', the computed score is shown for each match."
118 :group 'apropos 118 :group 'apropos
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index ddbedeba12c..5b19ce8be8f 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -135,14 +135,14 @@
135 :group 'archive) 135 :group 'archive)
136 136
137(defcustom archive-remote-regexp "^/[^/:]*[^/:.]:" 137(defcustom archive-remote-regexp "^/[^/:]*[^/:.]:"
138 "*Regexp recognizing archive files names that are not local. 138 "Regexp recognizing archive files names that are not local.
139A non-local file is one whose file name is not proper outside Emacs. 139A non-local file is one whose file name is not proper outside Emacs.
140A local copy of the archive will be used when updating." 140A local copy of the archive will be used when updating."
141 :type 'regexp 141 :type 'regexp
142 :group 'archive) 142 :group 'archive)
143 143
144(defcustom archive-extract-hooks nil 144(defcustom archive-extract-hooks nil
145 "*Hooks to run when an archive member has been extracted." 145 "Hooks to run when an archive member has been extracted."
146 :type 'hook 146 :type 'hook
147 :group 'archive) 147 :group 'archive)
148;; ------------------------------ 148;; ------------------------------
@@ -152,7 +152,7 @@ A local copy of the archive will be used when updating."
152;; to extract to stdout without junk getting added. 152;; to extract to stdout without junk getting added.
153(defcustom archive-arc-extract 153(defcustom archive-arc-extract
154 '("arc" "x") 154 '("arc" "x")
155 "*Program and its options to run in order to extract an arc file member. 155 "Program and its options to run in order to extract an arc file member.
156Extraction should happen to the current directory. Archive and member 156Extraction should happen to the current directory. Archive and member
157name will be added." 157name will be added."
158 :type '(list (string :tag "Program") 158 :type '(list (string :tag "Program")
@@ -163,7 +163,7 @@ name will be added."
163 163
164(defcustom archive-arc-expunge 164(defcustom archive-arc-expunge
165 '("arc" "d") 165 '("arc" "d")
166 "*Program and its options to run in order to delete arc file members. 166 "Program and its options to run in order to delete arc file members.
167Archive and member names will be added." 167Archive and member names will be added."
168 :type '(list (string :tag "Program") 168 :type '(list (string :tag "Program")
169 (repeat :tag "Options" 169 (repeat :tag "Options"
@@ -173,7 +173,7 @@ Archive and member names will be added."
173 173
174(defcustom archive-arc-write-file-member 174(defcustom archive-arc-write-file-member
175 '("arc" "u") 175 '("arc" "u")
176 "*Program and its options to run in order to update an arc file member. 176 "Program and its options to run in order to update an arc file member.
177Archive and member name will be added." 177Archive and member name will be added."
178 :type '(list (string :tag "Program") 178 :type '(list (string :tag "Program")
179 (repeat :tag "Options" 179 (repeat :tag "Options"
@@ -185,7 +185,7 @@ Archive and member name will be added."
185 185
186(defcustom archive-lzh-extract 186(defcustom archive-lzh-extract
187 '("lha" "pq") 187 '("lha" "pq")
188 "*Program and its options to run in order to extract an lzh file member. 188 "Program and its options to run in order to extract an lzh file member.
189Extraction should happen to standard output. Archive and member name will 189Extraction should happen to standard output. Archive and member name will
190be added." 190be added."
191 :type '(list (string :tag "Program") 191 :type '(list (string :tag "Program")
@@ -196,7 +196,7 @@ be added."
196 196
197(defcustom archive-lzh-expunge 197(defcustom archive-lzh-expunge
198 '("lha" "d") 198 '("lha" "d")
199 "*Program and its options to run in order to delete lzh file members. 199 "Program and its options to run in order to delete lzh file members.
200Archive and member names will be added." 200Archive and member names will be added."
201 :type '(list (string :tag "Program") 201 :type '(list (string :tag "Program")
202 (repeat :tag "Options" 202 (repeat :tag "Options"
@@ -206,7 +206,7 @@ Archive and member names will be added."
206 206
207(defcustom archive-lzh-write-file-member 207(defcustom archive-lzh-write-file-member
208 '("lha" "a") 208 '("lha" "a")
209 "*Program and its options to run in order to update an lzh file member. 209 "Program and its options to run in order to update an lzh file member.
210Archive and member name will be added." 210Archive and member name will be added."
211 :type '(list (string :tag "Program") 211 :type '(list (string :tag "Program")
212 (repeat :tag "Options" 212 (repeat :tag "Options"
@@ -221,7 +221,7 @@ Archive and member name will be added."
221 (executable-find "pkunzip")) 221 (executable-find "pkunzip"))
222 '("pkunzip" "-e" "-o-") 222 '("pkunzip" "-e" "-o-")
223 '("unzip" "-qq" "-c")) 223 '("unzip" "-qq" "-c"))
224 "*Program and its options to run in order to extract a zip file member. 224 "Program and its options to run in order to extract a zip file member.
225Extraction should happen to standard output. Archive and member name will 225Extraction should happen to standard output. Archive and member name will
226be added." 226be added."
227 :type '(list (string :tag "Program") 227 :type '(list (string :tag "Program")
@@ -240,7 +240,7 @@ be added."
240 (executable-find "pkzip")) 240 (executable-find "pkzip"))
241 '("pkzip" "-d") 241 '("pkzip" "-d")
242 '("zip" "-d" "-q")) 242 '("zip" "-d" "-q"))
243 "*Program and its options to run in order to delete zip file members. 243 "Program and its options to run in order to delete zip file members.
244Archive and member names will be added." 244Archive and member names will be added."
245 :type '(list (string :tag "Program") 245 :type '(list (string :tag "Program")
246 (repeat :tag "Options" 246 (repeat :tag "Options"
@@ -253,7 +253,7 @@ Archive and member names will be added."
253 (executable-find "pkzip")) 253 (executable-find "pkzip"))
254 '("pkzip" "-u" "-P") 254 '("pkzip" "-u" "-P")
255 '("zip" "-q")) 255 '("zip" "-q"))
256 "*Program and its options to run in order to update a zip file member. 256 "Program and its options to run in order to update a zip file member.
257Options should ensure that specified directory will be put into the zip 257Options should ensure that specified directory will be put into the zip
258file. Archive and member name will be added." 258file. Archive and member name will be added."
259 :type '(list (string :tag "Program") 259 :type '(list (string :tag "Program")
@@ -267,7 +267,7 @@ file. Archive and member name will be added."
267 (executable-find "pkzip")) 267 (executable-find "pkzip"))
268 '("pkzip" "-u" "-P") 268 '("pkzip" "-u" "-P")
269 '("zip" "-q" "-k")) 269 '("zip" "-q" "-k"))
270 "*Program and its options to run in order to update a case fiddled zip member. 270 "Program and its options to run in order to update a case fiddled zip member.
271Options should ensure that specified directory will be put into the zip file. 271Options should ensure that specified directory will be put into the zip file.
272Archive and member name will be added." 272Archive and member name will be added."
273 :type '(list (string :tag "Program") 273 :type '(list (string :tag "Program")
@@ -277,7 +277,7 @@ Archive and member name will be added."
277 :group 'archive-zip) 277 :group 'archive-zip)
278 278
279(defcustom archive-zip-case-fiddle t 279(defcustom archive-zip-case-fiddle t
280 "*If non-nil then zip file members may be down-cased. 280 "If non-nil then zip file members may be down-cased.
281This case fiddling will only happen for members created by a system 281This case fiddling will only happen for members created by a system
282that uses caseless file names." 282that uses caseless file names."
283 :type 'boolean 283 :type 'boolean
@@ -287,7 +287,7 @@ that uses caseless file names."
287 287
288(defcustom archive-zoo-extract 288(defcustom archive-zoo-extract
289 '("zoo" "xpq") 289 '("zoo" "xpq")
290 "*Program and its options to run in order to extract a zoo file member. 290 "Program and its options to run in order to extract a zoo file member.
291Extraction should happen to standard output. Archive and member name will 291Extraction should happen to standard output. Archive and member name will
292be added." 292be added."
293 :type '(list (string :tag "Program") 293 :type '(list (string :tag "Program")
@@ -298,7 +298,7 @@ be added."
298 298
299(defcustom archive-zoo-expunge 299(defcustom archive-zoo-expunge
300 '("zoo" "DqPP") 300 '("zoo" "DqPP")
301 "*Program and its options to run in order to delete zoo file members. 301 "Program and its options to run in order to delete zoo file members.
302Archive and member names will be added." 302Archive and member names will be added."
303 :type '(list (string :tag "Program") 303 :type '(list (string :tag "Program")
304 (repeat :tag "Options" 304 (repeat :tag "Options"
@@ -308,7 +308,7 @@ Archive and member names will be added."
308 308
309(defcustom archive-zoo-write-file-member 309(defcustom archive-zoo-write-file-member
310 '("zoo" "a") 310 '("zoo" "a")
311 "*Program and its options to run in order to update a zoo file member. 311 "Program and its options to run in order to update a zoo file member.
312Archive and member name will be added." 312Archive and member name will be added."
313 :type '(list (string :tag "Program") 313 :type '(list (string :tag "Program")
314 (repeat :tag "Options" 314 (repeat :tag "Options"
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index fb20a6c5b41..92a5f9f3f92 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -58,7 +58,7 @@
58 58
59 59
60(defcustom auto-insert 'not-modified 60(defcustom auto-insert 'not-modified
61 "*Controls automatic insertion into newly found empty files. 61 "Controls automatic insertion into newly found empty files.
62Possible values: 62Possible values:
63 nil do nothing 63 nil do nothing
64 t insert if possible 64 t insert if possible
@@ -76,7 +76,7 @@ With \\[auto-insert], this is always treated as if it were t."
76 :group 'auto-insert) 76 :group 'auto-insert)
77 77
78(defcustom auto-insert-query 'function 78(defcustom auto-insert-query 'function
79 "*Non-nil means ask user before auto-inserting. 79 "Non-nil means ask user before auto-inserting.
80When this is `function', only ask when called non-interactively." 80When this is `function', only ask when called non-interactively."
81 :type '(choice (const :tag "Don't ask" nil) 81 :type '(choice (const :tag "Don't ask" nil)
82 (const :tag "Ask if called non-interactively" function) 82 (const :tag "Ask if called non-interactively" function)
@@ -84,7 +84,7 @@ When this is `function', only ask when called non-interactively."
84 :group 'auto-insert) 84 :group 'auto-insert)
85 85
86(defcustom auto-insert-prompt "Perform %s auto-insertion? " 86(defcustom auto-insert-prompt "Perform %s auto-insertion? "
87 "*Prompt to use when querying whether to auto-insert. 87 "Prompt to use when querying whether to auto-insert.
88If this contains a %s, that will be replaced by the matching rule." 88If this contains a %s, that will be replaced by the matching rule."
89 :type 'string 89 :type 'string
90 :group 'auto-insert) 90 :group 'auto-insert)
@@ -308,7 +308,7 @@ described above, e.g. [\"header.insert\" date-and-author-update]."
308 308
309;; Establish a default value for auto-insert-directory 309;; Establish a default value for auto-insert-directory
310(defcustom auto-insert-directory "~/insert/" 310(defcustom auto-insert-directory "~/insert/"
311 "*Directory from which auto-inserted files are taken. 311 "Directory from which auto-inserted files are taken.
312The value must be an absolute directory name; 312The value must be an absolute directory name;
313thus, on a GNU or Unix system, it must end in a slash." 313thus, on a GNU or Unix system, it must end in a slash."
314 :type 'directory 314 :type 'directory
diff --git a/lisp/avoid.el b/lisp/avoid.el
index 7969645e03b..79bb91cb1da 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -94,14 +94,14 @@ use either \\[customize] or the function `mouse-avoidance-mode'."
94 94
95 95
96(defcustom mouse-avoidance-nudge-dist 15 96(defcustom mouse-avoidance-nudge-dist 15
97 "*Average distance that mouse will be moved when approached by cursor. 97 "Average distance that mouse will be moved when approached by cursor.
98Only applies in Mouse-Avoidance mode `jump' and its derivatives. 98Only applies in Mouse-Avoidance mode `jump' and its derivatives.
99For best results make this larger than `mouse-avoidance-threshold'." 99For best results make this larger than `mouse-avoidance-threshold'."
100 :type 'integer 100 :type 'integer
101 :group 'avoid) 101 :group 'avoid)
102 102
103(defcustom mouse-avoidance-nudge-var 10 103(defcustom mouse-avoidance-nudge-var 10
104 "*Variability of `mouse-avoidance-nudge-dist' (which see)." 104 "Variability of `mouse-avoidance-nudge-dist' (which see)."
105 :type 'integer 105 :type 'integer
106 :group 'avoid) 106 :group 'avoid)
107 107
@@ -111,7 +111,7 @@ For best results make this larger than `mouse-avoidance-threshold'."
111 :group 'avoid) 111 :group 'avoid)
112 112
113(defcustom mouse-avoidance-threshold 5 113(defcustom mouse-avoidance-threshold 5
114 "*Mouse-pointer's flight distance. 114 "Mouse-pointer's flight distance.
115If the cursor gets closer than this, the mouse pointer will move away. 115If the cursor gets closer than this, the mouse pointer will move away.
116Only applies in mouse-avoidance-modes `animate' and `jump'." 116Only applies in mouse-avoidance-modes `animate' and `jump'."
117 :type 'integer 117 :type 'integer
diff --git a/lisp/battery.el b/lisp/battery.el
index 0b7407274f8..eccf4b23299 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -60,7 +60,7 @@
60 'battery-pmset) 60 'battery-pmset)
61 ((eq system-type 'windows-nt) 61 ((eq system-type 'windows-nt)
62 'w32-battery-status)) 62 'w32-battery-status))
63 "*Function for getting battery status information. 63 "Function for getting battery status information.
64The function has to return an alist of conversion definitions. 64The function has to return an alist of conversion definitions.
65Its cons cells are of the form 65Its cons cells are of the form
66 66
@@ -80,7 +80,7 @@ introduced by a `%' character in a control string."
80 "%L power, battery %B (%p%% load, remaining time %t)") 80 "%L power, battery %B (%p%% load, remaining time %t)")
81 (battery-status-function 81 (battery-status-function
82 "Power %L, battery %B (%p%% load, remaining time %t)")) 82 "Power %L, battery %B (%p%% load, remaining time %t)"))
83 "*Control string formatting the string to display in the echo area. 83 "Control string formatting the string to display in the echo area.
84Ordinary characters in the control string are printed as-is, while 84Ordinary characters in the control string are printed as-is, while
85conversion specifications introduced by a `%' character in the control 85conversion specifications introduced by a `%' character in the control
86string are substituted as defined by the current value of the variable 86string are substituted as defined by the current value of the variable
@@ -108,7 +108,7 @@ string are substituted as defined by the current value of the variable
108 "[%b%p%%,%d°C]") 108 "[%b%p%%,%d°C]")
109 (battery-status-function 109 (battery-status-function
110 "[%b%p%%]")) 110 "[%b%p%%]"))
111 "*Control string formatting the string to display in the mode line. 111 "Control string formatting the string to display in the mode line.
112Ordinary characters in the control string are printed as-is, while 112Ordinary characters in the control string are printed as-is, while
113conversion specifications introduced by a `%' character in the control 113conversion specifications introduced by a `%' character in the control
114string are substituted as defined by the current value of the variable 114string are substituted as defined by the current value of the variable
@@ -128,18 +128,18 @@ string are substituted as defined by the current value of the variable
128 :group 'battery) 128 :group 'battery)
129 129
130(defcustom battery-update-interval 60 130(defcustom battery-update-interval 60
131 "*Seconds after which the battery status will be updated." 131 "Seconds after which the battery status will be updated."
132 :type 'integer 132 :type 'integer
133 :group 'battery) 133 :group 'battery)
134 134
135(defcustom battery-load-low 25 135(defcustom battery-load-low 25
136 "*Upper bound of low battery load percentage. 136 "Upper bound of low battery load percentage.
137A battery load percentage below this number is considered low." 137A battery load percentage below this number is considered low."
138 :type 'integer 138 :type 'integer
139 :group 'battery) 139 :group 'battery)
140 140
141(defcustom battery-load-critical 10 141(defcustom battery-load-critical 10
142 "*Upper bound of critical battery load percentage. 142 "Upper bound of critical battery load percentage.
143A battery load percentage below this number is considered critical." 143A battery load percentage below this number is considered critical."
144 :type 'integer 144 :type 'integer
145 :group 'battery) 145 :group 'battery)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 1dfb3feca44..30b61ccff8a 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -126,7 +126,7 @@ To specify the file in which to save them, modify the variable
126 126
127 127
128(defconst bookmark-old-default-file "~/.emacs-bkmrks" 128(defconst bookmark-old-default-file "~/.emacs-bkmrks"
129 "*The `.emacs.bmk' file used to be called this name.") 129 "The `.emacs.bmk' file used to be called this name.")
130 130
131 131
132;; defvarred to avoid a compilation warning: 132;; defvarred to avoid a compilation warning:
@@ -893,7 +893,7 @@ Default to file name if it's nil."
893 ;; Abbreviate the path, both so it's shorter and so it's more 893 ;; Abbreviate the path, both so it's shorter and so it's more
894 ;; portable. E.g., the user's home dir might be a different 894 ;; portable. E.g., the user's home dir might be a different
895 ;; path on different machines, but "~/" will still reach it. 895 ;; path on different machines, but "~/" will still reach it.
896 (abbreviate-file-name 896 (abbreviate-file-name
897 (cond 897 (cond
898 (buffer-file-name buffer-file-name) 898 (buffer-file-name buffer-file-name)
899 ((and (boundp 'dired-directory) dired-directory) 899 ((and (boundp 'dired-directory) dired-directory)
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 26314349d1c..3128ddcf1c7 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -68,7 +68,7 @@
68 :group 'convenience) 68 :group 'convenience)
69 69
70(defcustom Buffer-menu-use-header-line t 70(defcustom Buffer-menu-use-header-line t
71 "*Non-nil means to use an immovable header-line." 71 "Non-nil means to use an immovable header-line."
72 :type 'boolean 72 :type 'boolean
73 :group 'Buffer-menu) 73 :group 'Buffer-menu)
74 74
@@ -79,12 +79,12 @@
79(put 'Buffer-menu-buffer 'face-alias 'buffer-menu-buffer) 79(put 'Buffer-menu-buffer 'face-alias 'buffer-menu-buffer)
80 80
81(defcustom Buffer-menu-buffer+size-width 26 81(defcustom Buffer-menu-buffer+size-width 26
82 "*How wide to jointly make the buffer name and size columns." 82 "How wide to jointly make the buffer name and size columns."
83 :type 'number 83 :type 'number
84 :group 'Buffer-menu) 84 :group 'Buffer-menu)
85 85
86(defcustom Buffer-menu-mode-width 16 86(defcustom Buffer-menu-mode-width 16
87 "*How wide to make the mode name column." 87 "How wide to make the mode name column."
88 :type 'number 88 :type 'number
89 :group 'Buffer-menu) 89 :group 'Buffer-menu)
90 90
@@ -838,7 +838,7 @@ For more information, see the function `buffer-menu'."
838 buffer ,(car buffer) 838 buffer ,(car buffer)
839 font-lock-face buffer-menu-buffer 839 font-lock-face buffer-menu-buffer
840 mouse-face highlight 840 mouse-face highlight
841 help-echo 841 help-echo
842 ,(if (>= (length name) 842 ,(if (>= (length name)
843 (- Buffer-menu-buffer+size-width 843 (- Buffer-menu-buffer+size-width
844 (max (length size) 3) 844 (max (length size) 3)
diff --git a/lisp/calculator.el b/lisp/calculator.el
index c843a3d0290..36c9621f7f4 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -57,31 +57,31 @@
57 :group 'convenience) 57 :group 'convenience)
58 58
59(defcustom calculator-electric-mode nil 59(defcustom calculator-electric-mode nil
60 "*Run `calculator' electrically, in the echo area. 60 "Run `calculator' electrically, in the echo area.
61Electric mode saves some place but changes the way you interact with the 61Electric mode saves some place but changes the way you interact with the
62calculator." 62calculator."
63 :type 'boolean 63 :type 'boolean
64 :group 'calculator) 64 :group 'calculator)
65 65
66(defcustom calculator-use-menu t 66(defcustom calculator-use-menu t
67 "*Make `calculator' create a menu. 67 "Make `calculator' create a menu.
68Note that this requires easymenu. Must be set before loading." 68Note that this requires easymenu. Must be set before loading."
69 :type 'boolean 69 :type 'boolean
70 :group 'calculator) 70 :group 'calculator)
71 71
72(defcustom calculator-bind-escape nil 72(defcustom calculator-bind-escape nil
73 "*If non-nil, set escape to exit the calculator." 73 "If non-nil, set escape to exit the calculator."
74 :type 'boolean 74 :type 'boolean
75 :group 'calculator) 75 :group 'calculator)
76 76
77(defcustom calculator-unary-style 'postfix 77(defcustom calculator-unary-style 'postfix
78 "*Value is either 'prefix or 'postfix. 78 "Value is either 'prefix or 'postfix.
79This determines the default behavior of unary operators." 79This determines the default behavior of unary operators."
80 :type '(choice (const prefix) (const postfix)) 80 :type '(choice (const prefix) (const postfix))
81 :group 'calculator) 81 :group 'calculator)
82 82
83(defcustom calculator-prompt "Calc=%s> " 83(defcustom calculator-prompt "Calc=%s> "
84 "*The prompt used by the Emacs calculator. 84 "The prompt used by the Emacs calculator.
85It should contain a \"%s\" somewhere that will indicate the i/o radixes; 85It should contain a \"%s\" somewhere that will indicate the i/o radixes;
86this will be a two-character string as described in the documentation 86this will be a two-character string as described in the documentation
87for `calculator-mode'." 87for `calculator-mode'."
@@ -89,7 +89,7 @@ for `calculator-mode'."
89 :group 'calculator) 89 :group 'calculator)
90 90
91(defcustom calculator-number-digits 3 91(defcustom calculator-number-digits 3
92 "*The calculator's number of digits used for standard display. 92 "The calculator's number of digits used for standard display.
93Used by the `calculator-standard-display' function - it will use the 93Used by the `calculator-standard-display' function - it will use the
94format string \"%.NC\" where this number is N and C is a character given 94format string \"%.NC\" where this number is N and C is a character given
95at runtime." 95at runtime."
@@ -97,7 +97,7 @@ at runtime."
97 :group 'calculator) 97 :group 'calculator)
98 98
99(defcustom calculator-radix-grouping-mode t 99(defcustom calculator-radix-grouping-mode t
100 "*Use digit grouping in radix output mode. 100 "Use digit grouping in radix output mode.
101If this is set, chunks of `calculator-radix-grouping-digits' characters 101If this is set, chunks of `calculator-radix-grouping-digits' characters
102will be separated by `calculator-radix-grouping-separator' when in radix 102will be separated by `calculator-radix-grouping-separator' when in radix
103output mode is active (determined by `calculator-output-radix')." 103output mode is active (determined by `calculator-output-radix')."
@@ -105,19 +105,19 @@ output mode is active (determined by `calculator-output-radix')."
105 :group 'calculator) 105 :group 'calculator)
106 106
107(defcustom calculator-radix-grouping-digits 4 107(defcustom calculator-radix-grouping-digits 4
108 "*The number of digits used for grouping display in radix modes. 108 "The number of digits used for grouping display in radix modes.
109See `calculator-radix-grouping-mode'." 109See `calculator-radix-grouping-mode'."
110 :type 'integer 110 :type 'integer
111 :group 'calculator) 111 :group 'calculator)
112 112
113(defcustom calculator-radix-grouping-separator "'" 113(defcustom calculator-radix-grouping-separator "'"
114 "*The separator used in radix grouping display. 114 "The separator used in radix grouping display.
115See `calculator-radix-grouping-mode'." 115See `calculator-radix-grouping-mode'."
116 :type 'string 116 :type 'string
117 :group 'calculator) 117 :group 'calculator)
118 118
119(defcustom calculator-remove-zeros t 119(defcustom calculator-remove-zeros t
120 "*Non-nil value means delete all redundant zero decimal digits. 120 "Non-nil value means delete all redundant zero decimal digits.
121If this value is not t, and not nil, redundant zeros are removed except 121If this value is not t, and not nil, redundant zeros are removed except
122for one and if it is nil, nothing is removed. 122for one and if it is nil, nothing is removed.
123Used by the `calculator-remove-zeros' function." 123Used by the `calculator-remove-zeros' function."
@@ -125,7 +125,7 @@ Used by the `calculator-remove-zeros' function."
125 :group 'calculator) 125 :group 'calculator)
126 126
127(defcustom calculator-displayer '(std ?n) 127(defcustom calculator-displayer '(std ?n)
128 "*A displayer specification for numerical values. 128 "A displayer specification for numerical values.
129This is the displayer used to show all numbers in an expression. Result 129This is the displayer used to show all numbers in an expression. Result
130values will be displayed according to the first element of 130values will be displayed according to the first element of
131`calculator-displayers'. 131`calculator-displayers'.
@@ -150,7 +150,7 @@ will be used with this character for a format string."
150 ((std ?f) "Standard display, decimal point") 150 ((std ?f) "Standard display, decimal point")
151 ((std ?e) "Standard display, scientific") 151 ((std ?e) "Standard display, scientific")
152 ("%S" "Emacs printer")) 152 ("%S" "Emacs printer"))
153 "*A list of displayers. 153 "A list of displayers.
154Each element is a list of a displayer and a description string. The 154Each element is a list of a displayer and a description string. The
155first element is the one which is currently used, this is for the display 155first element is the one which is currently used, this is for the display
156of result values not values in expressions. A displayer specification 156of result values not values in expressions. A displayer specification
@@ -161,14 +161,14 @@ is the same as the values that can be stored in `calculator-displayer'.
161 :group 'calculator) 161 :group 'calculator)
162 162
163(defcustom calculator-paste-decimals t 163(defcustom calculator-paste-decimals t
164 "*If non-nil, convert pasted integers so they have a decimal point. 164 "If non-nil, convert pasted integers so they have a decimal point.
165This makes it possible to paste big integers since they will be read as 165This makes it possible to paste big integers since they will be read as
166floats, otherwise the Emacs reader will fail on them." 166floats, otherwise the Emacs reader will fail on them."
167 :type 'boolean 167 :type 'boolean
168 :group 'calculator) 168 :group 'calculator)
169 169
170(defcustom calculator-copy-displayer nil 170(defcustom calculator-copy-displayer nil
171 "*If non-nil, this is any value that can be used for 171 "If non-nil, this is any value that can be used for
172`calculator-displayer', to format a string before copying it with 172`calculator-displayer', to format a string before copying it with
173`calculator-copy'. If nil, then `calculator-displayer's normal value is 173`calculator-copy'. If nil, then `calculator-displayer's normal value is
174used." 174used."
@@ -176,13 +176,13 @@ used."
176 :group 'calculator) 176 :group 'calculator)
177 177
178(defcustom calculator-2s-complement nil 178(defcustom calculator-2s-complement nil
179 "*If non-nil, show negative numbers in 2s complement in radix modes. 179 "If non-nil, show negative numbers in 2s complement in radix modes.
180Otherwise show as a negative number." 180Otherwise show as a negative number."
181 :type 'boolean 181 :type 'boolean
182 :group 'calculator) 182 :group 'calculator)
183 183
184(defcustom calculator-mode-hook nil 184(defcustom calculator-mode-hook nil
185 "*List of hook functions for `calculator-mode' to run. 185 "List of hook functions for `calculator-mode' to run.
186Note: if `calculator-electric-mode' is on, then this hook will get 186Note: if `calculator-electric-mode' is on, then this hook will get
187activated in the minibuffer - in that case it should not do much more 187activated in the minibuffer - in that case it should not do much more
188than local key settings and other effects that will change things 188than local key settings and other effects that will change things
@@ -191,7 +191,7 @@ outside the scope of calculator related code."
191 :group 'calculator) 191 :group 'calculator)
192 192
193(defcustom calculator-user-registers nil 193(defcustom calculator-user-registers nil
194 "*An association list of user-defined register bindings. 194 "An association list of user-defined register bindings.
195Each element in this list is a list of a character and a number that 195Each element in this list is a list of a character and a number that
196will be stored in that character's register. 196will be stored in that character's register.
197 197
@@ -207,7 +207,7 @@ before you load calculator."
207 :group 'calculator) 207 :group 'calculator)
208 208
209(defcustom calculator-user-operators nil 209(defcustom calculator-user-operators nil
210 "*A list of additional operators. 210 "A list of additional operators.
211This is a list in the same format as specified in the documentation for 211This is a list in the same format as specified in the documentation for
212`calculator-operators', that you can use to bind additional calculator 212`calculator-operators', that you can use to bind additional calculator
213operators. It is probably not a good idea to modify this value with 213operators. It is probably not a good idea to modify this value with
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 21053950c9e..bcdc27a3996 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -67,7 +67,7 @@ editing and the result is evaluated."
67 '(command-history-mode 67 '(command-history-mode
68 list-command-history 68 list-command-history
69 electric-command-history) 69 electric-command-history)
70 "*A list of symbols to be ignored by `default-command-history-filter'. 70 "A list of symbols to be ignored by `default-command-history-filter'.
71If that function is given a list whose car is an element of this list, 71If that function is given a list whose car is an element of this list,
72then it will return non-nil (indicating the list should be discarded from 72then it will return non-nil (indicating the list should be discarded from
73the history). 73the history).
@@ -90,7 +90,7 @@ from the command history."
90 (memq (car frob) default-command-history-filter-garbage))) 90 (memq (car frob) default-command-history-filter-garbage)))
91 91
92(defcustom list-command-history-max 32 92(defcustom list-command-history-max 32
93 "*If non-nil, maximum length of the listing produced by `list-command-history'." 93 "If non-nil, maximum length of the listing produced by `list-command-history'."
94 :type '(choice integer (const nil)) 94 :type '(choice integer (const nil))
95 :group 'chistory) 95 :group 'chistory)
96 96
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 817a8894595..4e2c707d390 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -104,7 +104,7 @@
104;;;============================================================================ 104;;;============================================================================
105 105
106(defcustom inferior-scheme-mode-hook nil 106(defcustom inferior-scheme-mode-hook nil
107 "*Hook for customizing inferior-scheme mode." 107 "Hook for customizing inferior-scheme mode."
108 :type 'hook 108 :type 'hook
109 :group 'cmuscheme) 109 :group 'cmuscheme)
110 110
@@ -207,7 +207,7 @@ to continue it."
207 (setq comint-get-old-input (function scheme-get-old-input))) 207 (setq comint-get-old-input (function scheme-get-old-input)))
208 208
209(defcustom inferior-scheme-filter-regexp "\\`\\s *\\S ?\\S ?\\s *\\'" 209(defcustom inferior-scheme-filter-regexp "\\`\\s *\\S ?\\S ?\\s *\\'"
210 "*Input matching this regexp are not saved on the history list. 210 "Input matching this regexp are not saved on the history list.
211Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters." 211Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters."
212 :type 'regexp 212 :type 'regexp
213 :group 'cmuscheme) 213 :group 'cmuscheme)
@@ -295,7 +295,7 @@ order. Return nil if no start file found."
295 (scheme-send-region (save-excursion (backward-sexp) (point)) (point))) 295 (scheme-send-region (save-excursion (backward-sexp) (point)) (point)))
296 296
297(defcustom scheme-compile-exp-command "(compile '%s)" 297(defcustom scheme-compile-exp-command "(compile '%s)"
298 "*Template for issuing commands to compile arbitrary Scheme expressions." 298 "Template for issuing commands to compile arbitrary Scheme expressions."
299 :type 'string 299 :type 'string
300 :group 'cmuscheme) 300 :group 'cmuscheme)
301 301
@@ -318,7 +318,7 @@ order. Return nil if no start file found."
318 (scheme-compile-region (point) end)))) 318 (scheme-compile-region (point) end))))
319 319
320(defcustom scheme-trace-command "(trace %s)" 320(defcustom scheme-trace-command "(trace %s)"
321 "*Template for issuing commands to trace a Scheme procedure. 321 "Template for issuing commands to trace a Scheme procedure.
322Some Scheme implementations might require more elaborate commands here. 322Some Scheme implementations might require more elaborate commands here.
323For PLT-Scheme, e.g., one should use 323For PLT-Scheme, e.g., one should use
324 324
@@ -329,7 +329,7 @@ For Scheme 48 and Scsh use \",trace %s\"."
329 :group 'cmuscheme) 329 :group 'cmuscheme)
330 330
331(defcustom scheme-untrace-command "(untrace %s)" 331(defcustom scheme-untrace-command "(untrace %s)"
332 "*Template for switching off tracing of a Scheme procedure. 332 "Template for switching off tracing of a Scheme procedure.
333Scheme 48 and Scsh users should set this variable to \",untrace %s\"." 333Scheme 48 and Scsh users should set this variable to \",untrace %s\"."
334 334
335 :type 'string 335 :type 'string
@@ -354,7 +354,7 @@ With a prefix argument switch off tracing of procedure PROC."
354 (comint-send-string (scheme-proc) "\n")) 354 (comint-send-string (scheme-proc) "\n"))
355 355
356(defcustom scheme-macro-expand-command "(expand %s)" 356(defcustom scheme-macro-expand-command "(expand %s)"
357 "*Template for macro-expanding a Scheme form. 357 "Template for macro-expanding a Scheme form.
358For Scheme 48 and Scsh use \",expand %s\"." 358For Scheme 48 and Scsh use \",expand %s\"."
359 :type 'string 359 :type 'string
360 :group 'cmuscheme) 360 :group 'cmuscheme)
@@ -421,7 +421,7 @@ Then switch to the process buffer."
421 (switch-to-scheme t)) 421 (switch-to-scheme t))
422 422
423(defcustom scheme-source-modes '(scheme-mode) 423(defcustom scheme-source-modes '(scheme-mode)
424 "*Used to determine if a buffer contains Scheme source code. 424 "Used to determine if a buffer contains Scheme source code.
425If it's loaded into a buffer that is in one of these major modes, it's 425If it's loaded into a buffer that is in one of these major modes, it's
426considered a scheme source file by `scheme-load-file' and `scheme-compile-file'. 426considered a scheme source file by `scheme-load-file' and `scheme-compile-file'.
427Used by these commands to determine defaults." 427Used by these commands to determine defaults."
diff --git a/lisp/comint.el b/lisp/comint.el
index 1070652d777..69887aa22c8 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -206,7 +206,7 @@ For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;).
206This is a good thing to set in mode hooks.") 206This is a good thing to set in mode hooks.")
207 207
208(defcustom comint-input-autoexpand nil 208(defcustom comint-input-autoexpand nil
209 "*If non-nil, expand input command history references on completion. 209 "If non-nil, expand input command history references on completion.
210This mirrors the optional behavior of tcsh (its autoexpand and histlist). 210This mirrors the optional behavior of tcsh (its autoexpand and histlist).
211 211
212If the value is `input', then the expansion is seen on input. 212If the value is `input', then the expansion is seen on input.
@@ -233,7 +233,7 @@ This variable is buffer-local."
233 :group 'comint) 233 :group 'comint)
234 234
235(defcustom comint-input-ignoredups nil 235(defcustom comint-input-ignoredups nil
236 "*If non-nil, don't add input matching the last on the input ring. 236 "If non-nil, don't add input matching the last on the input ring.
237This mirrors the optional behavior of bash. 237This mirrors the optional behavior of bash.
238 238
239This variable is buffer-local." 239This variable is buffer-local."
@@ -241,7 +241,7 @@ This variable is buffer-local."
241 :group 'comint) 241 :group 'comint)
242 242
243(defcustom comint-input-ring-file-name nil 243(defcustom comint-input-ring-file-name nil
244 "*If non-nil, name of the file to read/write input history. 244 "If non-nil, name of the file to read/write input history.
245See also `comint-read-input-ring' and `comint-write-input-ring'. 245See also `comint-read-input-ring' and `comint-write-input-ring'.
246 246
247This variable is buffer-local, and is a good thing to set in mode hooks." 247This variable is buffer-local, and is a good thing to set in mode hooks."
@@ -250,7 +250,7 @@ This variable is buffer-local, and is a good thing to set in mode hooks."
250 :group 'comint) 250 :group 'comint)
251 251
252(defcustom comint-scroll-to-bottom-on-input nil 252(defcustom comint-scroll-to-bottom-on-input nil
253 "*Controls whether input to interpreter causes window to scroll. 253 "Controls whether input to interpreter causes window to scroll.
254If nil, then do not scroll. If t or `all', scroll all windows showing buffer. 254If nil, then do not scroll. If t or `all', scroll all windows showing buffer.
255If `this', scroll only the selected window. 255If `this', scroll only the selected window.
256 256
@@ -264,7 +264,7 @@ See `comint-preinput-scroll-to-bottom'. This variable is buffer-local."
264 :group 'comint) 264 :group 'comint)
265 265
266(defcustom comint-move-point-for-output nil 266(defcustom comint-move-point-for-output nil
267 "*Controls whether interpreter output moves point to the end of the output. 267 "Controls whether interpreter output moves point to the end of the output.
268If nil, then output never moves point to the output. 268If nil, then output never moves point to the output.
269 (If the output occurs at point, it is inserted before point.) 269 (If the output occurs at point, it is inserted before point.)
270If t or `all', move point in all windows showing the buffer. 270If t or `all', move point in all windows showing the buffer.
@@ -286,7 +286,7 @@ This variable is buffer-local in all Comint buffers."
286(defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output) 286(defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output)
287 287
288(defcustom comint-scroll-show-maximum-output t 288(defcustom comint-scroll-show-maximum-output t
289 "*Controls how to scroll due to interpreter output. 289 "Controls how to scroll due to interpreter output.
290This variable applies when point is at the end of the buffer 290This variable applies when point is at the end of the buffer
291\(either because it was originally there, or because 291\(either because it was originally there, or because
292`comint-move-point-for-output' said to move it there) 292`comint-move-point-for-output' said to move it there)
@@ -303,7 +303,7 @@ This variable is buffer-local in all Comint buffers."
303 :group 'comint) 303 :group 'comint)
304 304
305(defcustom comint-buffer-maximum-size 1024 305(defcustom comint-buffer-maximum-size 1024
306 "*The maximum size in lines for Comint buffers. 306 "The maximum size in lines for Comint buffers.
307Comint buffers are truncated from the top to be no greater than this number, if 307Comint buffers are truncated from the top to be no greater than this number, if
308the function `comint-truncate-buffer' is on `comint-output-filter-functions'." 308the function `comint-truncate-buffer' is on `comint-output-filter-functions'."
309 :type 'integer 309 :type 'integer
@@ -319,7 +319,7 @@ the function `comint-truncate-buffer' is on `comint-output-filter-functions'."
319 "Regexp for history entries that should be ignored when Comint initializes.") 319 "Regexp for history entries that should be ignored when Comint initializes.")
320 320
321(defcustom comint-process-echoes nil 321(defcustom comint-process-echoes nil
322 "*If non-nil, assume that the subprocess echoes any input. 322 "If non-nil, assume that the subprocess echoes any input.
323If so, delete one copy of the input so that only one copy eventually 323If so, delete one copy of the input so that only one copy eventually
324appears in the buffer. 324appears in the buffer.
325 325
@@ -341,7 +341,7 @@ Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
341\[Pp]assword\\( (again)\\)?\\|\ 341\[Pp]assword\\( (again)\\)?\\|\
342pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ 342pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
343\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" 343\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
344 "*Regexp matching prompts for passwords in the inferior process. 344 "Regexp matching prompts for passwords in the inferior process.
345This is used by `comint-watch-for-password-prompt'." 345This is used by `comint-watch-for-password-prompt'."
346 :type 'regexp 346 :type 'regexp
347 :group 'comint) 347 :group 'comint)
@@ -400,7 +400,7 @@ massage the input string, put a different function here.
400This is called from the user command `comint-send-input'.") 400This is called from the user command `comint-send-input'.")
401 401
402(defcustom comint-eol-on-send t 402(defcustom comint-eol-on-send t
403 "*Non-nil means go to the end of the line before sending input. 403 "Non-nil means go to the end of the line before sending input.
404See `comint-send-input'." 404See `comint-send-input'."
405 :type 'boolean 405 :type 'boolean
406 :group 'comint) 406 :group 'comint)
@@ -409,7 +409,7 @@ See `comint-send-input'."
409;; entirely, searching for uses of this variable will help to identify 409;; entirely, searching for uses of this variable will help to identify
410;; places that need attention. 410;; places that need attention.
411(defcustom comint-use-prompt-regexp nil 411(defcustom comint-use-prompt-regexp nil
412 "*If non-nil, use `comint-prompt-regexp' to recognize prompts. 412 "If non-nil, use `comint-prompt-regexp' to recognize prompts.
413If nil, then program output and user-input are given different `field' 413If nil, then program output and user-input are given different `field'
414properties, which Emacs commands can use to distinguish them (in 414properties, which Emacs commands can use to distinguish them (in
415particular, common movement commands such as `beginning-of-line' 415particular, common movement commands such as `beginning-of-line'
@@ -2627,13 +2627,13 @@ its response can be seen."
2627;; want them present in specific modes. 2627;; want them present in specific modes.
2628 2628
2629(defcustom comint-completion-autolist nil 2629(defcustom comint-completion-autolist nil
2630 "*If non-nil, automatically list possibilities on partial completion. 2630 "If non-nil, automatically list possibilities on partial completion.
2631This mirrors the optional behavior of tcsh." 2631This mirrors the optional behavior of tcsh."
2632 :type 'boolean 2632 :type 'boolean
2633 :group 'comint-completion) 2633 :group 'comint-completion)
2634 2634
2635(defcustom comint-completion-addsuffix t 2635(defcustom comint-completion-addsuffix t
2636 "*If non-nil, add a `/' to completed directories, ` ' to file names. 2636 "If non-nil, add a `/' to completed directories, ` ' to file names.
2637If a cons pair, it should be of the form (DIRSUFFIX . FILESUFFIX) where 2637If a cons pair, it should be of the form (DIRSUFFIX . FILESUFFIX) where
2638DIRSUFFIX and FILESUFFIX are strings added on unambiguous or exact completion. 2638DIRSUFFIX and FILESUFFIX are strings added on unambiguous or exact completion.
2639This mirrors the optional behavior of tcsh." 2639This mirrors the optional behavior of tcsh."
@@ -2645,7 +2645,7 @@ This mirrors the optional behavior of tcsh."
2645 :group 'comint-completion) 2645 :group 'comint-completion)
2646 2646
2647(defcustom comint-completion-recexact nil 2647(defcustom comint-completion-recexact nil
2648 "*If non-nil, use shortest completion if characters cannot be added. 2648 "If non-nil, use shortest completion if characters cannot be added.
2649This mirrors the optional behavior of tcsh. 2649This mirrors the optional behavior of tcsh.
2650 2650
2651A non-nil value is useful if `comint-completion-autolist' is non-nil too." 2651A non-nil value is useful if `comint-completion-autolist' is non-nil too."
@@ -2653,7 +2653,7 @@ A non-nil value is useful if `comint-completion-autolist' is non-nil too."
2653 :group 'comint-completion) 2653 :group 'comint-completion)
2654 2654
2655(defcustom comint-completion-fignore nil 2655(defcustom comint-completion-fignore nil
2656 "*List of suffixes to be disregarded during file completion. 2656 "List of suffixes to be disregarded during file completion.
2657This mirrors the optional behavior of bash and tcsh. 2657This mirrors the optional behavior of bash and tcsh.
2658 2658
2659Note that this applies to `comint-dynamic-complete-filename' only." 2659Note that this applies to `comint-dynamic-complete-filename' only."
@@ -3134,7 +3134,7 @@ the process mark is at the beginning of the accumulated input."
3134;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 3134;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3135 3135
3136(defcustom comint-redirect-verbose nil 3136(defcustom comint-redirect-verbose nil
3137 "*If non-nil, print messages each time the redirection filter is invoked. 3137 "If non-nil, print messages each time the redirection filter is invoked.
3138Also print a message when redirection is completed." 3138Also print a message when redirection is completed."
3139 :group 'comint 3139 :group 'comint
3140 :type 'boolean) 3140 :type 'boolean)
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index d45a9acf41e..7d709c736ae 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -36,7 +36,7 @@
36 :group 'tools) 36 :group 'tools)
37 37
38(defcustom compare-windows-whitespace "\\(\\s-\\|\n\\)+" 38(defcustom compare-windows-whitespace "\\(\\s-\\|\n\\)+"
39 "*Regexp or function that defines whitespace sequences for `compare-windows'. 39 "Regexp or function that defines whitespace sequences for `compare-windows'.
40That command optionally ignores changes in whitespace. 40That command optionally ignores changes in whitespace.
41 41
42The value of `compare-windows-whitespace' is normally a regexp, but it 42The value of `compare-windows-whitespace' is normally a regexp, but it
@@ -53,18 +53,18 @@ whitespace is considered to match, and is skipped."
53 :group 'compare-windows) 53 :group 'compare-windows)
54 54
55(defcustom compare-ignore-whitespace nil 55(defcustom compare-ignore-whitespace nil
56 "*Non-nil means `compare-windows' ignores whitespace." 56 "Non-nil means `compare-windows' ignores whitespace."
57 :type 'boolean 57 :type 'boolean
58 :group 'compare-windows 58 :group 'compare-windows
59 :version "22.1") 59 :version "22.1")
60 60
61(defcustom compare-ignore-case nil 61(defcustom compare-ignore-case nil
62 "*Non-nil means `compare-windows' ignores case differences." 62 "Non-nil means `compare-windows' ignores case differences."
63 :type 'boolean 63 :type 'boolean
64 :group 'compare-windows) 64 :group 'compare-windows)
65 65
66(defcustom compare-windows-sync 'compare-windows-sync-default-function 66(defcustom compare-windows-sync 'compare-windows-sync-default-function
67 "*Function or regexp that is used to synchronize points in two 67 "Function or regexp that is used to synchronize points in two
68windows if before calling `compare-windows' points are located 68windows if before calling `compare-windows' points are located
69on mismatched positions. 69on mismatched positions.
70 70
@@ -93,7 +93,7 @@ to beep or flash the screen when points are mismatched."
93 :version "22.1") 93 :version "22.1")
94 94
95(defcustom compare-windows-sync-string-size 32 95(defcustom compare-windows-sync-string-size 32
96 "*Size of string from one window that is searched in second window. 96 "Size of string from one window that is searched in second window.
97 97
98Small number makes difference regions more fine-grained, but it 98Small number makes difference regions more fine-grained, but it
99may fail by finding the wrong match. The bigger number makes 99may fail by finding the wrong match. The bigger number makes
@@ -105,7 +105,7 @@ The default value 32 is good for the most cases."
105 :version "22.1") 105 :version "22.1")
106 106
107(defcustom compare-windows-recenter nil 107(defcustom compare-windows-recenter nil
108 "*List of two values, each of which is used as argument of 108 "List of two values, each of which is used as argument of
109function `recenter' called in each of two windows to place 109function `recenter' called in each of two windows to place
110matching points side-by-side. 110matching points side-by-side.
111 111
@@ -116,7 +116,7 @@ and the value `((4) (4))' for horizontally split windows."
116 :version "22.1") 116 :version "22.1")
117 117
118(defcustom compare-windows-highlight t 118(defcustom compare-windows-highlight t
119 "*Non-nil means compare-windows highlights the differences. 119 "Non-nil means compare-windows highlights the differences.
120The value t removes highlighting immediately after invoking a command 120The value t removes highlighting immediately after invoking a command
121other than `compare-windows'. 121other than `compare-windows'.
122The value `persistent' leaves all highlighted differences. You can clear 122The value `persistent' leaves all highlighted differences. You can clear
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index fd7517945c3..e2f98bedba1 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -104,18 +104,18 @@
104 :group 'convenience) 104 :group 'convenience)
105 105
106(defcustom dabbrev-backward-only nil 106(defcustom dabbrev-backward-only nil
107 "*If non-nil, `dabbrev-expand' only looks backwards." 107 "If non-nil, `dabbrev-expand' only looks backwards."
108 :type 'boolean 108 :type 'boolean
109 :group 'dabbrev) 109 :group 'dabbrev)
110 110
111(defcustom dabbrev-limit nil 111(defcustom dabbrev-limit nil
112 "*Limits region searched by `dabbrev-expand' to this many chars away." 112 "Limits region searched by `dabbrev-expand' to this many chars away."
113 :type '(choice (const :tag "off" nil) 113 :type '(choice (const :tag "off" nil)
114 integer) 114 integer)
115 :group 'dabbrev) 115 :group 'dabbrev)
116 116
117(defcustom dabbrev-abbrev-skip-leading-regexp nil 117(defcustom dabbrev-abbrev-skip-leading-regexp nil
118 "*Regexp for skipping leading characters of an abbreviation. 118 "Regexp for skipping leading characters of an abbreviation.
119 119
120Example: Set this to \"\\\\$\" for programming languages 120Example: Set this to \"\\\\$\" for programming languages
121in which variable names may appear with or without a leading `$'. 121in which variable names may appear with or without a leading `$'.
@@ -127,13 +127,13 @@ Set this to nil if no characters should be skipped."
127 :group 'dabbrev) 127 :group 'dabbrev)
128 128
129(defcustom dabbrev-eliminate-newlines t 129(defcustom dabbrev-eliminate-newlines t
130 "*Non-nil means dabbrev should not insert newlines. 130 "Non-nil means dabbrev should not insert newlines.
131Instead it converts them to spaces." 131Instead it converts them to spaces."
132 :type 'boolean 132 :type 'boolean
133 :group 'dabbrev) 133 :group 'dabbrev)
134 134
135(defcustom dabbrev-case-fold-search 'case-fold-search 135(defcustom dabbrev-case-fold-search 'case-fold-search
136 "*Control whether dabbrev searches should ignore case. 136 "Control whether dabbrev searches should ignore case.
137A value of nil means case is significant. 137A value of nil means case is significant.
138A value of `case-fold-search' means case is significant 138A value of `case-fold-search' means case is significant
139 if `case-fold-search' is nil. 139 if `case-fold-search' is nil.
@@ -144,7 +144,7 @@ Any other non-nil version means case is not significant."
144 :group 'dabbrev) 144 :group 'dabbrev)
145 145
146(defcustom dabbrev-upcase-means-case-search nil 146(defcustom dabbrev-upcase-means-case-search nil
147 "*The significance of an uppercase character in an abbreviation. 147 "The significance of an uppercase character in an abbreviation.
148A nil value means case fold search when searching for possible expansions; 148A nil value means case fold search when searching for possible expansions;
149non-nil means case sensitive search. 149non-nil means case sensitive search.
150 150
@@ -154,7 +154,7 @@ This variable has an effect only when the value of
154 :group 'dabbrev) 154 :group 'dabbrev)
155 155
156(defcustom dabbrev-case-distinction 'case-replace 156(defcustom dabbrev-case-distinction 'case-replace
157 "*Whether dabbrev treats expansions as the same if they differ in case. 157 "Whether dabbrev treats expansions as the same if they differ in case.
158 158
159A value of nil means treat them as different. 159A value of nil means treat them as different.
160A value of `case-replace' means distinguish them if `case-replace' is nil. 160A value of `case-replace' means distinguish them if `case-replace' is nil.
@@ -169,7 +169,7 @@ This variable has an effect only when the value of
169 :version "22.1") 169 :version "22.1")
170 170
171(defcustom dabbrev-case-replace 'case-replace 171(defcustom dabbrev-case-replace 'case-replace
172 "*Whether dabbrev applies the abbreviations's case pattern to the expansion. 172 "Whether dabbrev applies the abbreviations's case pattern to the expansion.
173 173
174A value of nil means preserve the expansion's case pattern. 174A value of nil means preserve the expansion's case pattern.
175A value of `case-replace' means preserve it if `case-replace' is nil. 175A value of `case-replace' means preserve it if `case-replace' is nil.
@@ -184,7 +184,7 @@ This variable has an effect only when the value of
184 :group 'dabbrev) 184 :group 'dabbrev)
185 185
186(defcustom dabbrev-abbrev-char-regexp nil 186(defcustom dabbrev-abbrev-char-regexp nil
187 "*Regexp to recognize a character in an abbreviation or expansion. 187 "Regexp to recognize a character in an abbreviation or expansion.
188This regexp will be surrounded with \\\\( ... \\\\) when actually used. 188This regexp will be surrounded with \\\\( ... \\\\) when actually used.
189 189
190Set this variable to \"\\\\sw\" if you want ordinary words or 190Set this variable to \"\\\\sw\" if you want ordinary words or
@@ -209,7 +209,7 @@ The recommended value is \"\\\\sw\\\\|\\\\s_\"."
209 :group 'dabbrev) 209 :group 'dabbrev)
210 210
211(defcustom dabbrev-check-all-buffers t 211(defcustom dabbrev-check-all-buffers t
212 "*Non-nil means dabbrev package should search *all* buffers. 212 "Non-nil means dabbrev package should search *all* buffers.
213 213
214Dabbrev always searches the current buffer first. Then, if 214Dabbrev always searches the current buffer first. Then, if
215`dabbrev-check-other-buffers' says so, it searches the buffers 215`dabbrev-check-other-buffers' says so, it searches the buffers
@@ -222,21 +222,21 @@ or matched by `dabbrev-ignored-regexps'."
222 :group 'dabbrev) 222 :group 'dabbrev)
223 223
224(defcustom dabbrev-ignored-buffer-names '("*Messages*" "*Buffer List*") 224(defcustom dabbrev-ignored-buffer-names '("*Messages*" "*Buffer List*")
225 "*List of buffer names that dabbrev should not check. 225 "List of buffer names that dabbrev should not check.
226See also `dabbrev-ignored-buffer-regexps'." 226See also `dabbrev-ignored-buffer-regexps'."
227 :type '(repeat (string :tag "Buffer name")) 227 :type '(repeat (string :tag "Buffer name"))
228 :group 'dabbrev 228 :group 'dabbrev
229 :version "20.3") 229 :version "20.3")
230 230
231(defcustom dabbrev-ignored-buffer-regexps nil 231(defcustom dabbrev-ignored-buffer-regexps nil
232 "*List of regexps matching names of buffers that dabbrev should not check. 232 "List of regexps matching names of buffers that dabbrev should not check.
233See also `dabbrev-ignored-buffer-names'." 233See also `dabbrev-ignored-buffer-names'."
234 :type '(repeat regexp) 234 :type '(repeat regexp)
235 :group 'dabbrev 235 :group 'dabbrev
236 :version "21.1") 236 :version "21.1")
237 237
238(defcustom dabbrev-check-other-buffers t 238(defcustom dabbrev-check-other-buffers t
239 "*Should \\[dabbrev-expand] look in other buffers?\ 239 "Should \\[dabbrev-expand] look in other buffers?\
240 240
241nil: Don't look in other buffers. 241nil: Don't look in other buffers.
242t: Also look for expansions in the buffers pointed out by 242t: Also look for expansions in the buffers pointed out by
@@ -263,7 +263,7 @@ for an example.
263A mode setting this variable should make it buffer local.") 263A mode setting this variable should make it buffer local.")
264 264
265(defcustom dabbrev-friend-buffer-function 'dabbrev--same-major-mode-p 265(defcustom dabbrev-friend-buffer-function 'dabbrev--same-major-mode-p
266 "*A function to decide whether dabbrev should search OTHER-BUFFER. 266 "A function to decide whether dabbrev should search OTHER-BUFFER.
267The function should take one argument, OTHER-BUFFER, and return 267The function should take one argument, OTHER-BUFFER, and return
268non-nil if that buffer should be searched. Have a look at 268non-nil if that buffer should be searched. Have a look at
269`dabbrev--same-major-mode-p' for an example. 269`dabbrev--same-major-mode-p' for an example.
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 92e4fe15930..1fe184a84c4 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -129,37 +129,37 @@
129 :group 'internal) 129 :group 'internal)
130 130
131(defcustom delimit-columns-str-before "" 131(defcustom delimit-columns-str-before ""
132 "*Specify a string to be inserted before all columns." 132 "Specify a string to be inserted before all columns."
133 :type '(string :tag "Before All Columns") 133 :type '(string :tag "Before All Columns")
134 :group 'columns) 134 :group 'columns)
135 135
136(defcustom delimit-columns-str-separator ", " 136(defcustom delimit-columns-str-separator ", "
137 "*Specify a string to be inserted between each column." 137 "Specify a string to be inserted between each column."
138 :type '(string :tag "Between Each Column") 138 :type '(string :tag "Between Each Column")
139 :group 'columns) 139 :group 'columns)
140 140
141(defcustom delimit-columns-str-after "" 141(defcustom delimit-columns-str-after ""
142 "*Specify a string to be inserted after all columns." 142 "Specify a string to be inserted after all columns."
143 :type '(string :tag "After All Columns") 143 :type '(string :tag "After All Columns")
144 :group 'columns) 144 :group 'columns)
145 145
146(defcustom delimit-columns-before "" 146(defcustom delimit-columns-before ""
147 "*Specify a string to be inserted before each column." 147 "Specify a string to be inserted before each column."
148 :type '(string :tag "Before Each Column") 148 :type '(string :tag "Before Each Column")
149 :group 'columns) 149 :group 'columns)
150 150
151(defcustom delimit-columns-after "" 151(defcustom delimit-columns-after ""
152 "*Specify a string to be inserted after each column." 152 "Specify a string to be inserted after each column."
153 :type '(string :tag "After Each Column") 153 :type '(string :tag "After Each Column")
154 :group 'columns) 154 :group 'columns)
155 155
156(defcustom delimit-columns-separator "\t" 156(defcustom delimit-columns-separator "\t"
157 "*Specify a regexp which separates each column." 157 "Specify a regexp which separates each column."
158 :type '(regexp :tag "Column Separator") 158 :type '(regexp :tag "Column Separator")
159 :group 'columns) 159 :group 'columns)
160 160
161(defcustom delimit-columns-format t 161(defcustom delimit-columns-format t
162 "*Specify how to format columns. 162 "Specify how to format columns.
163 163
164For examples below, consider: 164For examples below, consider:
165 165
@@ -200,14 +200,14 @@ Any other value is treated as t."
200 :group 'columns) 200 :group 'columns)
201 201
202(defcustom delimit-columns-extra t 202(defcustom delimit-columns-extra t
203 "*Non-nil means that lines will have the same number of columns. 203 "Non-nil means that lines will have the same number of columns.
204 204
205This has effect only when there are lines with different number of columns." 205This has effect only when there are lines with different number of columns."
206 :type '(boolean :tag "Lines With Same Number Of Column") 206 :type '(boolean :tag "Lines With Same Number Of Column")
207 :group 'columns) 207 :group 'columns)
208 208
209(defcustom delimit-columns-start 0 209(defcustom delimit-columns-start 0
210 "*Specify column number to start prettifing. 210 "Specify column number to start prettifing.
211 211
212See also `delimit-columns-end' for documentation. 212See also `delimit-columns-end' for documentation.
213 213
@@ -222,7 +222,7 @@ column (column 0) is located at left corner."
222 :group 'columns) 222 :group 'columns)
223 223
224(defcustom delimit-columns-end 1000000 224(defcustom delimit-columns-end 1000000
225 "*Specify column number to end prettifing. 225 "Specify column number to end prettifing.
226 226
227See also `delimit-columns-start' for documentation. 227See also `delimit-columns-start' for documentation.
228 228
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 6dc91a6cd5b..1189e150296 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -165,7 +165,7 @@ and function `desktop-read' for details."
165 (desktop-save-mode 0)) 165 (desktop-save-mode 0))
166 166
167(defcustom desktop-save 'ask-if-new 167(defcustom desktop-save 'ask-if-new
168 "*Specifies whether the desktop should be saved when it is killed. 168 "Specifies whether the desktop should be saved when it is killed.
169A desktop is killed when the user changes desktop or quits Emacs. 169A desktop is killed when the user changes desktop or quits Emacs.
170Possible values are: 170Possible values are:
171 t -- always save. 171 t -- always save.
@@ -302,7 +302,7 @@ to the value obtained by evaluating FORM."
302 302
303(defcustom desktop-clear-preserve-buffers 303(defcustom desktop-clear-preserve-buffers
304 '("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*") 304 '("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*")
305 "*List of buffers that `desktop-clear' should not delete. 305 "List of buffers that `desktop-clear' should not delete.
306Each element is a regular expression. Buffers with a name matched by any of 306Each element is a regular expression. Buffers with a name matched by any of
307these won't be deleted." 307these won't be deleted."
308 :type '(repeat string) 308 :type '(repeat string)
@@ -355,7 +355,7 @@ modes are restored automatically; they should not be listed here."
355 :group 'desktop) 355 :group 'desktop)
356 356
357(defcustom desktop-file-name-format 'absolute 357(defcustom desktop-file-name-format 'absolute
358 "*Format in which desktop file names should be saved. 358 "Format in which desktop file names should be saved.
359Possible values are: 359Possible values are:
360 absolute -- Absolute file name. 360 absolute -- Absolute file name.
361 tilde -- Relative to ~. 361 tilde -- Relative to ~.
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index b711b0635d6..4eb50899847 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -39,7 +39,7 @@
39 39
40;; - Improve `diff-add-change-log-entries-other-window', 40;; - Improve `diff-add-change-log-entries-other-window',
41;; it is very simplistic now. 41;; it is very simplistic now.
42;; 42;;
43;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks. 43;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
44;; Also allow C-c C-a to delete already-applied hunks. 44;; Also allow C-c C-a to delete already-applied hunks.
45;; 45;;
@@ -77,7 +77,7 @@ Else, it jumps to the new file."
77 :group 'diff-mode) 77 :group 'diff-mode)
78 78
79(defcustom diff-update-on-the-fly t 79(defcustom diff-update-on-the-fly t
80 "*Non-nil means hunk headers are kept up-to-date on-the-fly. 80 "Non-nil means hunk headers are kept up-to-date on-the-fly.
81When editing a diff file, the line numbers in the hunk headers 81When editing a diff file, the line numbers in the hunk headers
82need to be kept consistent with the actual diff. This can 82need to be kept consistent with the actual diff. This can
83either be done on the fly (but this sometimes interacts poorly with the 83either be done on the fly (but this sometimes interacts poorly with the
@@ -87,7 +87,7 @@ when editing big diffs)."
87 :group 'diff-mode) 87 :group 'diff-mode)
88 88
89(defcustom diff-advance-after-apply-hunk t 89(defcustom diff-advance-after-apply-hunk t
90 "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying." 90 "Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
91 :type 'boolean 91 :type 'boolean
92 :group 'diff-mode) 92 :group 'diff-mode)
93 93
@@ -517,7 +517,7 @@ but in the file header instead, in which case move forward to the first hunk."
517 res 517 res
518 (goto-char start) 518 (goto-char start)
519 (error "Can't find the beginning of the file"))))) 519 (error "Can't find the beginning of the file")))))
520 520
521 521
522(defun diff-end-of-file () 522(defun diff-end-of-file ()
523 (re-search-forward "^[-+#!<>0-9@* \\]" nil t) 523 (re-search-forward "^[-+#!<>0-9@* \\]" nil t)
@@ -571,7 +571,7 @@ If the prefix ARG is given, restrict the view to the current file instead."
571 571
572;; "index ", "old mode", "new mode", "new file mode" and 572;; "index ", "old mode", "new mode", "new file mode" and
573;; "deleted file mode" are output by git-diff. 573;; "deleted file mode" are output by git-diff.
574(defconst diff-file-junk-re 574(defconst diff-file-junk-re
575 "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode") 575 "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode")
576 576
577(defun diff-beginning-of-file-and-junk () 577(defun diff-beginning-of-file-and-junk ()
@@ -620,7 +620,7 @@ data such as \"Index: ...\" and such."
620 ;; a file diff but elsewhere. 620 ;; a file diff but elsewhere.
621 (goto-char orig) 621 (goto-char orig)
622 (signal (car err) (cdr err))))) 622 (signal (car err) (cdr err)))))
623 623
624(defun diff-file-kill () 624(defun diff-file-kill ()
625 "Kill current file's hunks." 625 "Kill current file's hunks."
626 (interactive) 626 (interactive)
@@ -1635,7 +1635,7 @@ With a prefix argument, REVERSE the hunk."
1635 ;; for diff-goto-source, and is thus confusing. Also when you don't 1635 ;; for diff-goto-source, and is thus confusing. Also when you don't
1636 ;; know about it it's pretty surprising. 1636 ;; know about it it's pretty surprising.
1637 ;; TODO: make it possible to ask explicitly for this behavior. 1637 ;; TODO: make it possible to ask explicitly for this behavior.
1638 ;; 1638 ;;
1639 ;; This is duplicated in diff-test-hunk. 1639 ;; This is duplicated in diff-test-hunk.
1640 (diff-find-source-location nil reverse) 1640 (diff-find-source-location nil reverse)
1641 (cond 1641 (cond
diff --git a/lisp/diff.el b/lisp/diff.el
index 8fb258cf1e7..e802048c31d 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -35,13 +35,13 @@
35 35
36;;;###autoload 36;;;###autoload
37(defcustom diff-switches "-c" 37(defcustom diff-switches "-c"
38 "*A string or list of strings specifying switches to be passed to diff." 38 "A string or list of strings specifying switches to be passed to diff."
39 :type '(choice string (repeat string)) 39 :type '(choice string (repeat string))
40 :group 'diff) 40 :group 'diff)
41 41
42;;;###autoload 42;;;###autoload
43(defcustom diff-command "diff" 43(defcustom diff-command "diff"
44 "*The command to use to run diff." 44 "The command to use to run diff."
45 :type 'string 45 :type 'string
46 :group 'diff) 46 :group 'diff)
47 47
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 358e852c3ae..f1945386b59 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1166,7 +1166,7 @@ See Info node `(emacs)Subdir switches' for more details."
1166;;; Copy, move/rename, making hard and symbolic links 1166;;; Copy, move/rename, making hard and symbolic links
1167 1167
1168(defcustom dired-backup-overwrite nil 1168(defcustom dired-backup-overwrite nil
1169 "*Non-nil if Dired should ask about making backups before overwriting files. 1169 "Non-nil if Dired should ask about making backups before overwriting files.
1170Special value `always' suppresses confirmation." 1170Special value `always' suppresses confirmation."
1171 :type '(choice (const :tag "off" nil) 1171 :type '(choice (const :tag "off" nil)
1172 (const :tag "suppress" always) 1172 (const :tag "suppress" always)
@@ -2304,7 +2304,7 @@ Use \\[dired-hide-subdir] to (un)hide a particular subdirectory."
2304;; Search only in file names in the Dired buffer. 2304;; Search only in file names in the Dired buffer.
2305 2305
2306(defcustom dired-isearch-filenames nil 2306(defcustom dired-isearch-filenames nil
2307 "*Non-nil to Isearch in file names only. 2307 "Non-nil to Isearch in file names only.
2308If t, Isearch in Dired always matches only file names. 2308If t, Isearch in Dired always matches only file names.
2309If `dwim', Isearch matches file names when initial point position is on 2309If `dwim', Isearch matches file names when initial point position is on
2310a file name. Otherwise, it searches the whole buffer without restrictions." 2310a file name. Otherwise, it searches the whole buffer without restrictions."
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 5495d649132..34494da6422 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -122,29 +122,29 @@
122 :group 'dired-x) 122 :group 'dired-x)
123 123
124(defcustom dired-bind-vm nil 124(defcustom dired-bind-vm nil
125 "*Non-nil means \"V\" runs `dired-vm', otherwise \"V\" runs `dired-rmail'. 125 "Non-nil means \"V\" runs `dired-vm', otherwise \"V\" runs `dired-rmail'.
126Also, RMAIL files contain -*- rmail -*- at the top so \"f\", 126Also, RMAIL files contain -*- rmail -*- at the top so \"f\",
127`dired-advertised-find-file', will run rmail." 127`dired-advertised-find-file', will run rmail."
128 :type 'boolean 128 :type 'boolean
129 :group 'dired-keys) 129 :group 'dired-keys)
130 130
131(defcustom dired-bind-jump t 131(defcustom dired-bind-jump t
132 "*Non-nil means bind `dired-jump' to C-x C-j, otherwise do not." 132 "Non-nil means bind `dired-jump' to C-x C-j, otherwise do not."
133 :type 'boolean 133 :type 'boolean
134 :group 'dired-keys) 134 :group 'dired-keys)
135 135
136(defcustom dired-bind-man t 136(defcustom dired-bind-man t
137 "*Non-nil means bind `dired-man' to \"N\" in dired-mode, otherwise do not." 137 "Non-nil means bind `dired-man' to \"N\" in dired-mode, otherwise do not."
138 :type 'boolean 138 :type 'boolean
139 :group 'dired-keys) 139 :group 'dired-keys)
140 140
141(defcustom dired-bind-info t 141(defcustom dired-bind-info t
142 "*Non-nil means bind `dired-info' to \"I\" in dired-mode, otherwise do not." 142 "Non-nil means bind `dired-info' to \"I\" in dired-mode, otherwise do not."
143 :type 'boolean 143 :type 'boolean
144 :group 'dired-keys) 144 :group 'dired-keys)
145 145
146(defcustom dired-vm-read-only-folders nil 146(defcustom dired-vm-read-only-folders nil
147 "*If non-nil, \\[dired-vm] will visit all folders read-only. 147 "If non-nil, \\[dired-vm] will visit all folders read-only.
148If neither nil nor t, e.g. the symbol `if-file-read-only', only 148If neither nil nor t, e.g. the symbol `if-file-read-only', only
149files not writable by you are visited read-only. 149files not writable by you are visited read-only.
150 150
@@ -171,7 +171,7 @@ plus those ending with extensions in `dired-omit-extensions'."
171(define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1") 171(define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1")
172 172
173(defcustom dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.$" 173(defcustom dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.$"
174 "*Filenames matching this regexp will not be displayed. 174 "Filenames matching this regexp will not be displayed.
175This only has effect when `dired-omit-mode' is t. See interactive function 175This only has effect when `dired-omit-mode' is t. See interactive function
176`dired-omit-mode' \(\\[dired-omit-mode]\) and variable 176`dired-omit-mode' \(\\[dired-omit-mode]\) and variable
177`dired-omit-extensions'. The default is to omit `.', `..', auto-save 177`dired-omit-extensions'. The default is to omit `.', `..', auto-save
@@ -180,7 +180,7 @@ files and lock files."
180 :group 'dired-x) 180 :group 'dired-x)
181 181
182(defcustom dired-find-subdir nil ; t is pretty near to DWIM... 182(defcustom dired-find-subdir nil ; t is pretty near to DWIM...
183 "*If non-nil, Dired always finds a directory in a buffer of its own. 183 "If non-nil, Dired always finds a directory in a buffer of its own.
184If nil, Dired finds the directory as a subdirectory in some other buffer 184If nil, Dired finds the directory as a subdirectory in some other buffer
185if it is present as one. 185if it is present as one.
186 186
@@ -194,13 +194,13 @@ toggle between those two."
194 :group 'dired-x) 194 :group 'dired-x)
195 195
196(defcustom dired-omit-size-limit 30000 196(defcustom dired-omit-size-limit 30000
197 "*Maximum size for the \"omitting\" feature. 197 "Maximum size for the \"omitting\" feature.
198If nil, there is no maximum size." 198If nil, there is no maximum size."
199 :type '(choice (const :tag "no maximum" nil) integer) 199 :type '(choice (const :tag "no maximum" nil) integer)
200 :group 'dired-x) 200 :group 'dired-x)
201 201
202(defcustom dired-enable-local-variables t 202(defcustom dired-enable-local-variables t
203 "*Control use of local-variables lists in Dired. 203 "Control use of local-variables lists in Dired.
204The value can be t, nil or something else. 204The value can be t, nil or something else.
205A value of t means local-variables lists are obeyed; 205A value of t means local-variables lists are obeyed;
206nil means they are ignored; anything else means query. 206nil means they are ignored; anything else means query.
@@ -213,7 +213,7 @@ a directory. See also `dired-local-variables-file'."
213(defcustom dired-guess-shell-gnutar (when (or (eq system-type 'gnu) 213(defcustom dired-guess-shell-gnutar (when (or (eq system-type 'gnu)
214 (eq system-type 'gnu/linux)) 214 (eq system-type 'gnu/linux))
215 "tar") 215 "tar")
216 "*If non-nil, name of GNU tar executable. 216 "If non-nil, name of GNU tar executable.
217\(E.g., \"tar\" or \"gtar\"). The `z' switch will be used with it for 217\(E.g., \"tar\" or \"gtar\"). The `z' switch will be used with it for
218compressed or gzip'ed tar files. If you don't have GNU tar, set this 218compressed or gzip'ed tar files. If you don't have GNU tar, set this
219to nil: a pipe using `zcat' or `gunzip -c' will be used." 219to nil: a pipe using `zcat' or `gunzip -c' will be used."
@@ -222,18 +222,18 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
222 :group 'dired-x) 222 :group 'dired-x)
223 223
224(defcustom dired-guess-shell-gzip-quiet t 224(defcustom dired-guess-shell-gzip-quiet t
225 "*Non-nil says pass -q to gzip overriding verbose GZIP environment." 225 "Non-nil says pass -q to gzip overriding verbose GZIP environment."
226 :type 'boolean 226 :type 'boolean
227 :group 'dired-x) 227 :group 'dired-x)
228 228
229(defcustom dired-guess-shell-znew-switches nil 229(defcustom dired-guess-shell-znew-switches nil
230 "*If non-nil, then string of switches passed to `znew', example: \"-K\"." 230 "If non-nil, then string of switches passed to `znew', example: \"-K\"."
231 :type '(choice (const :tag "None" nil) 231 :type '(choice (const :tag "None" nil)
232 (string :tag "Switches")) 232 (string :tag "Switches"))
233 :group 'dired-x) 233 :group 'dired-x)
234 234
235(defcustom dired-clean-up-buffers-too t 235(defcustom dired-clean-up-buffers-too t
236 "*Non-nil means offer to kill buffers visiting files and dirs deleted in Dired." 236 "Non-nil means offer to kill buffers visiting files and dirs deleted in Dired."
237 :type 'boolean 237 :type 'boolean
238 :group 'dired-x) 238 :group 'dired-x)
239 239
diff --git a/lisp/dired.el b/lisp/dired.el
index 2cb5d86a904..2c219dd1da4 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -50,7 +50,7 @@
50 50
51;;;###autoload 51;;;###autoload
52(defcustom dired-listing-switches "-al" 52(defcustom dired-listing-switches "-al"
53 "*Switches passed to `ls' for Dired. MUST contain the `l' option. 53 "Switches passed to `ls' for Dired. MUST contain the `l' option.
54May contain all other options that don't contradict `-l'; 54May contain all other options that don't contradict `-l';
55may contain even `F', `b', `i' and `s'. See also the variable 55may contain even `F', `b', `i' and `s'. See also the variable
56`dired-ls-F-marks-symlinks' concerning the `F' switch. 56`dired-ls-F-marks-symlinks' concerning the `F' switch.
@@ -88,7 +88,7 @@ If nil, `dired-listing-switches' is used.")
88 88
89;;;###autoload 89;;;###autoload
90(defcustom dired-ls-F-marks-symlinks nil 90(defcustom dired-ls-F-marks-symlinks nil
91 "*Informs Dired about how `ls -lF' marks symbolic links. 91 "Informs Dired about how `ls -lF' marks symbolic links.
92Set this to t if `ls' (or whatever program is specified by 92Set this to t if `ls' (or whatever program is specified by
93`insert-directory-program') with `-lF' marks the symbolic link 93`insert-directory-program') with `-lF' marks the symbolic link
94itself with a trailing @ (usually the case under Ultrix). 94itself with a trailing @ (usually the case under Ultrix).
@@ -105,7 +105,7 @@ always set this variable to t."
105 105
106;;;###autoload 106;;;###autoload
107(defcustom dired-trivial-filenames "^\\.\\.?$\\|^#" 107(defcustom dired-trivial-filenames "^\\.\\.?$\\|^#"
108 "*Regexp of files to skip when finding first file of a directory. 108 "Regexp of files to skip when finding first file of a directory.
109A value of nil means move to the subdir line. 109A value of nil means move to the subdir line.
110A value of t means move to first file." 110A value of t means move to first file."
111 :type '(choice (const :tag "Move to subdir" nil) 111 :type '(choice (const :tag "Move to subdir" nil)
@@ -116,7 +116,7 @@ A value of t means move to first file."
116;;;###autoload 116;;;###autoload
117(defcustom dired-keep-marker-rename t 117(defcustom dired-keep-marker-rename t
118 ;; Use t as default so that moved files "take their markers with them". 118 ;; Use t as default so that moved files "take their markers with them".
119 "*Controls marking of renamed files. 119 "Controls marking of renamed files.
120If t, files keep their previous marks when they are renamed. 120If t, files keep their previous marks when they are renamed.
121If a character, renamed files (whether previously marked or not) 121If a character, renamed files (whether previously marked or not)
122are afterward marked with that character." 122are afterward marked with that character."
@@ -126,7 +126,7 @@ are afterward marked with that character."
126 126
127;;;###autoload 127;;;###autoload
128(defcustom dired-keep-marker-copy ?C 128(defcustom dired-keep-marker-copy ?C
129 "*Controls marking of copied files. 129 "Controls marking of copied files.
130If t, copied files are marked if and as the corresponding original files were. 130If t, copied files are marked if and as the corresponding original files were.
131If a character, copied files are unconditionally marked with that character." 131If a character, copied files are unconditionally marked with that character."
132 :type '(choice (const :tag "Keep" t) 132 :type '(choice (const :tag "Keep" t)
@@ -135,7 +135,7 @@ If a character, copied files are unconditionally marked with that character."
135 135
136;;;###autoload 136;;;###autoload
137(defcustom dired-keep-marker-hardlink ?H 137(defcustom dired-keep-marker-hardlink ?H
138 "*Controls marking of newly made hard links. 138 "Controls marking of newly made hard links.
139If t, they are marked if and as the files linked to were marked. 139If t, they are marked if and as the files linked to were marked.
140If a character, new links are unconditionally marked with that character." 140If a character, new links are unconditionally marked with that character."
141 :type '(choice (const :tag "Keep" t) 141 :type '(choice (const :tag "Keep" t)
@@ -144,7 +144,7 @@ If a character, new links are unconditionally marked with that character."
144 144
145;;;###autoload 145;;;###autoload
146(defcustom dired-keep-marker-symlink ?Y 146(defcustom dired-keep-marker-symlink ?Y
147 "*Controls marking of newly made symbolic links. 147 "Controls marking of newly made symbolic links.
148If t, they are marked if and as the files linked to were marked. 148If t, they are marked if and as the files linked to were marked.
149If a character, new links are unconditionally marked with that character." 149If a character, new links are unconditionally marked with that character."
150 :type '(choice (const :tag "Keep" t) 150 :type '(choice (const :tag "Keep" t)
@@ -153,7 +153,7 @@ If a character, new links are unconditionally marked with that character."
153 153
154;;;###autoload 154;;;###autoload
155(defcustom dired-dwim-target nil 155(defcustom dired-dwim-target nil
156 "*If non-nil, Dired tries to guess a default target directory. 156 "If non-nil, Dired tries to guess a default target directory.
157This means: if there is a dired buffer displayed in the next window, 157This means: if there is a dired buffer displayed in the next window,
158use its current subdir, instead of the current subdir of this dired buffer. 158use its current subdir, instead of the current subdir of this dired buffer.
159 159
@@ -163,7 +163,7 @@ The target is used in the prompt for file copy, rename etc."
163 163
164;;;###autoload 164;;;###autoload
165(defcustom dired-copy-preserve-time t 165(defcustom dired-copy-preserve-time t
166 "*If non-nil, Dired preserves the last-modified time in a file copy. 166 "If non-nil, Dired preserves the last-modified time in a file copy.
167\(This works on only some systems.)" 167\(This works on only some systems.)"
168 :type 'boolean 168 :type 'boolean
169 :group 'dired) 169 :group 'dired)
@@ -2497,7 +2497,7 @@ Optional argument means return a file name relative to `default-directory'."
2497;; Deleting files 2497;; Deleting files
2498 2498
2499(defcustom dired-recursive-deletes 'top 2499(defcustom dired-recursive-deletes 'top
2500 "*Decide whether recursive deletes are allowed. 2500 "Decide whether recursive deletes are allowed.
2501A value of nil means no recursive deletes. 2501A value of nil means no recursive deletes.
2502`always' means delete recursively without asking. This is DANGEROUS! 2502`always' means delete recursively without asking. This is DANGEROUS!
2503`top' means ask for each directory at top level, but delete its subdirectories 2503`top' means ask for each directory at top level, but delete its subdirectories
@@ -3325,7 +3325,7 @@ To be called first in body of `dired-sort-other', etc."
3325;;;; Drag and drop support 3325;;;; Drag and drop support
3326 3326
3327(defcustom dired-recursive-copies 'top 3327(defcustom dired-recursive-copies 'top
3328 "*Decide whether recursive copies are allowed. 3328 "Decide whether recursive copies are allowed.
3329A value of nil means no recursive copies. 3329A value of nil means no recursive copies.
3330`always' means copy recursively without asking. 3330`always' means copy recursively without asking.
3331`top' means ask for each directory at top level. 3331`top' means ask for each directory at top level.
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index eb79766ff88..9d6a4b8ab2e 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -30,12 +30,12 @@
30 :group 'environment) 30 :group 'environment)
31 31
32(defcustom msdos-shells '("command.com" "4dos.com" "ndos.com") 32(defcustom msdos-shells '("command.com" "4dos.com" "ndos.com")
33 "*List of shells that use `/c' instead of `-c' and a backslashed command." 33 "List of shells that use `/c' instead of `-c' and a backslashed command."
34 :type '(repeat string) 34 :type '(repeat string)
35 :group 'dos-fns) 35 :group 'dos-fns)
36 36
37(defcustom dos-codepage-setup-hook nil 37(defcustom dos-codepage-setup-hook nil
38 "*List of functions to be called after the DOS terminal and coding 38 "List of functions to be called after the DOS terminal and coding
39systems are set up. This is the place, e.g., to set specific entries 39systems are set up. This is the place, e.g., to set specific entries
40in `standard-display-table' as appropriate for your codepage, if 40in `standard-display-table' as appropriate for your codepage, if
41`IT-display-table-setup' doesn't do a perfect job." 41`IT-display-table-setup' doesn't do a perfect job."
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 2dd34a9f512..a03bbe1a64d 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -38,11 +38,11 @@
38 :group 'ediff) 38 :group 'ediff)
39 39
40(defcustom ediff-diff-program "diff" 40(defcustom ediff-diff-program "diff"
41 "*Program to use for generating the differential of the two files." 41 "Program to use for generating the differential of the two files."
42 :type 'string 42 :type 'string
43 :group 'ediff-diff) 43 :group 'ediff-diff)
44(defcustom ediff-diff3-program "diff3" 44(defcustom ediff-diff3-program "diff3"
45 "*Program to be used for three-way comparison. 45 "Program to be used for three-way comparison.
46Must produce output compatible with Unix's diff3 program." 46Must produce output compatible with Unix's diff3 program."
47 :type 'string 47 :type 'string
48 :group 'ediff-diff) 48 :group 'ediff-diff)
@@ -57,7 +57,7 @@ Must produce output compatible with Unix's diff3 program."
57 ((memq system-type '(ms-dos windows-nt windows-95)) 57 ((memq system-type '(ms-dos windows-nt windows-95))
58 shell-file-name) ; no standard name on MS-DOS 58 shell-file-name) ; no standard name on MS-DOS
59 (t "sh")) ; UNIX 59 (t "sh")) ; UNIX
60 "*The shell used to run diff and patch. 60 "The shell used to run diff and patch.
61If user's .profile or .cshrc files are set up correctly, any shell 61If user's .profile or .cshrc files are set up correctly, any shell
62will do. However, some people set $prompt or other things 62will do. However, some people set $prompt or other things
63incorrectly, which leads to undesirable output messages. These may 63incorrectly, which leads to undesirable output messages. These may
@@ -67,13 +67,13 @@ you are not using or, better, fix your shell's startup file."
67 :group 'ediff-diff) 67 :group 'ediff-diff)
68 68
69(defcustom ediff-cmp-program "cmp" 69(defcustom ediff-cmp-program "cmp"
70 "*Utility to use to determine if two files are identical. 70 "Utility to use to determine if two files are identical.
71It must return code 0, if its arguments are identical files." 71It must return code 0, if its arguments are identical files."
72 :type 'string 72 :type 'string
73 :group 'ediff-diff) 73 :group 'ediff-diff)
74 74
75(defcustom ediff-cmp-options nil 75(defcustom ediff-cmp-options nil
76 "*Options to pass to `ediff-cmp-program'. 76 "Options to pass to `ediff-cmp-program'.
77If GNU diff is used as `ediff-cmp-program', then the most useful options 77If GNU diff is used as `ediff-cmp-program', then the most useful options
78are `-I REGEXP', to ignore changes whose lines match the REGEXP." 78are `-I REGEXP', to ignore changes whose lines match the REGEXP."
79 :type '(repeat string) 79 :type '(repeat string)
@@ -85,7 +85,7 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP."
85 85
86(defcustom ediff-diff-options 86(defcustom ediff-diff-options
87 (if (memq system-type '(ms-dos windows-nt windows-95)) "--binary" "") 87 (if (memq system-type '(ms-dos windows-nt windows-95)) "--binary" "")
88 "*Options to pass to `ediff-diff-program'. 88 "Options to pass to `ediff-diff-program'.
89If Unix diff is used as `ediff-diff-program', 89If Unix diff is used as `ediff-diff-program',
90then a useful option is `-w', to ignore space. 90then a useful option is `-w', to ignore space.
91Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be 91Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be
@@ -107,12 +107,12 @@ This variable can be set either in .emacs or toggled interactively.
107Use `setq-default' if setting it in .emacs") 107Use `setq-default' if setting it in .emacs")
108 108
109(defcustom ediff-ignore-case-option "-i" 109(defcustom ediff-ignore-case-option "-i"
110 "*Option that causes the diff program to ignore case of letters." 110 "Option that causes the diff program to ignore case of letters."
111 :type 'string 111 :type 'string
112 :group 'ediff-diff) 112 :group 'ediff-diff)
113 113
114(defcustom ediff-ignore-case-option3 "" 114(defcustom ediff-ignore-case-option3 ""
115 "*Option that causes the diff3 program to ignore case of letters. 115 "Option that causes the diff3 program to ignore case of letters.
116GNU diff3 doesn't have such an option." 116GNU diff3 doesn't have such an option."
117 :type 'string 117 :type 'string
118 :group 'ediff-diff) 118 :group 'ediff-diff)
@@ -121,12 +121,12 @@ GNU diff3 doesn't have such an option."
121(ediff-defvar-local ediff-actual-diff-options ediff-diff-options "") 121(ediff-defvar-local ediff-actual-diff-options ediff-diff-options "")
122 122
123(defcustom ediff-custom-diff-program ediff-diff-program 123(defcustom ediff-custom-diff-program ediff-diff-program
124 "*Program to use for generating custom diff output for saving it in a file. 124 "Program to use for generating custom diff output for saving it in a file.
125This output is not used by Ediff internally." 125This output is not used by Ediff internally."
126 :type 'string 126 :type 'string
127 :group 'ediff-diff) 127 :group 'ediff-diff)
128(defcustom ediff-custom-diff-options "-c" 128(defcustom ediff-custom-diff-options "-c"
129 "*Options to pass to `ediff-custom-diff-program'." 129 "Options to pass to `ediff-custom-diff-program'."
130 :type 'string 130 :type 'string
131 :group 'ediff-diff) 131 :group 'ediff-diff)
132 132
@@ -135,7 +135,7 @@ This output is not used by Ediff internally."
135(defvar ediff-match-diff3-line "^====\\(.?\\)\C-m?$" 135(defvar ediff-match-diff3-line "^====\\(.?\\)\C-m?$"
136 "Pattern to match lines produced by diff3 that describe differences.") 136 "Pattern to match lines produced by diff3 that describe differences.")
137(defcustom ediff-diff3-options "" 137(defcustom ediff-diff3-options ""
138 "*Options to pass to `ediff-diff3-program'." 138 "Options to pass to `ediff-diff3-program'."
139 :set 'ediff-set-diff-options 139 :set 'ediff-set-diff-options
140 :type 'string 140 :type 'string
141 :group 'ediff-diff) 141 :group 'ediff-diff)
@@ -145,7 +145,7 @@ This output is not used by Ediff internally."
145 145
146(defcustom ediff-diff3-ok-lines-regexp 146(defcustom ediff-diff3-ok-lines-regexp
147 "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)" 147 "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)"
148 "*Regexp that matches normal output lines from `ediff-diff3-program'. 148 "Regexp that matches normal output lines from `ediff-diff3-program'.
149Lines that do not match are assumed to be error messages." 149Lines that do not match are assumed to be error messages."
150 :type 'regexp 150 :type 'regexp
151 :group 'ediff-diff) 151 :group 'ediff-diff)
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index b503f271743..0346a2070d5 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -81,7 +81,7 @@ p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
81n,SPC -next diff | h -hilighting | rx -restore buf X's old diff 81n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
82 j -jump to diff | @ -auto-refinement | * -refine current region 82 j -jump to diff | @ -auto-refinement | * -refine current region
83 gx -goto X's point| ## -ignore whitespace | ! -update diff regions 83 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
84 C-l -recenter | #c -ignore case | % -narrow/widen buffs 84 C-l -recenter | #c -ignore case | % -narrow/widen buffs
85 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X 85 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
86 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output 86 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
87 ~ -swap variants | m -wide display | 87 ~ -swap variants | m -wide display |
@@ -139,7 +139,7 @@ produce the brief help message. This function must return a string.")
139See `ediff-brief-help-message-function' for more.") 139See `ediff-brief-help-message-function' for more.")
140 140
141(defcustom ediff-use-long-help-message nil 141(defcustom ediff-use-long-help-message nil
142 "*If t, Ediff displays a long help message. Short help message otherwise." 142 "If t, Ediff displays a long help message. Short help message otherwise."
143 :type 'boolean 143 :type 'boolean
144 :group 'ediff-window) 144 :group 'ediff-window)
145 145
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 2dc021380de..0630a760eee 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -387,82 +387,82 @@ It needs to be killed when we quit the session.")
387;; Hook variables 387;; Hook variables
388 388
389(defcustom ediff-before-setup-hook nil 389(defcustom ediff-before-setup-hook nil
390 "*Hooks to run before Ediff begins to set up windows and buffers. 390 "Hooks to run before Ediff begins to set up windows and buffers.
391This hook can be used to save the previous window config, which can be restored 391This hook can be used to save the previous window config, which can be restored
392on ediff-quit or ediff-suspend." 392on ediff-quit or ediff-suspend."
393 :type 'hook 393 :type 'hook
394 :group 'ediff-hook) 394 :group 'ediff-hook)
395(defcustom ediff-before-setup-windows-hook nil 395(defcustom ediff-before-setup-windows-hook nil
396 "*Hooks to run before Ediff sets its window configuration. 396 "Hooks to run before Ediff sets its window configuration.
397This hook is run every time when Ediff arranges its windows. 397This hook is run every time when Ediff arranges its windows.
398This happens each time Ediff detects that the windows were messed up by the 398This happens each time Ediff detects that the windows were messed up by the
399user." 399user."
400 :type 'hook 400 :type 'hook
401 :group 'ediff-hook) 401 :group 'ediff-hook)
402(defcustom ediff-after-setup-windows-hook nil 402(defcustom ediff-after-setup-windows-hook nil
403 "*Hooks to run after Ediff sets its window configuration. 403 "Hooks to run after Ediff sets its window configuration.
404This can be used to set up control window or icon in a desired place." 404This can be used to set up control window or icon in a desired place."
405 :type 'hook 405 :type 'hook
406 :group 'ediff-hook) 406 :group 'ediff-hook)
407(defcustom ediff-before-setup-control-frame-hook nil 407(defcustom ediff-before-setup-control-frame-hook nil
408 "*Hooks run before setting up the frame to display Ediff Control Panel. 408 "Hooks run before setting up the frame to display Ediff Control Panel.
409Can be used to change control frame parameters to position it where it 409Can be used to change control frame parameters to position it where it
410is desirable." 410is desirable."
411 :type 'hook 411 :type 'hook
412 :group 'ediff-hook) 412 :group 'ediff-hook)
413(defcustom ediff-after-setup-control-frame-hook nil 413(defcustom ediff-after-setup-control-frame-hook nil
414 "*Hooks run after setting up the frame to display Ediff Control Panel. 414 "Hooks run after setting up the frame to display Ediff Control Panel.
415Can be used to move the frame where it is desired." 415Can be used to move the frame where it is desired."
416 :type 'hook 416 :type 'hook
417 :group 'ediff-hook) 417 :group 'ediff-hook)
418(defcustom ediff-startup-hook nil 418(defcustom ediff-startup-hook nil
419 "*Hooks to run in the control buffer after Ediff has been set up and is ready for the job." 419 "Hooks to run in the control buffer after Ediff has been set up and is ready for the job."
420 :type 'hook 420 :type 'hook
421 :group 'ediff-hook) 421 :group 'ediff-hook)
422(defcustom ediff-select-hook nil 422(defcustom ediff-select-hook nil
423 "*Hooks to run after a difference has been selected." 423 "Hooks to run after a difference has been selected."
424 :type 'hook 424 :type 'hook
425 :group 'ediff-hook) 425 :group 'ediff-hook)
426(defcustom ediff-unselect-hook nil 426(defcustom ediff-unselect-hook nil
427 "*Hooks to run after a difference has been unselected." 427 "Hooks to run after a difference has been unselected."
428 :type 'hook 428 :type 'hook
429 :group 'ediff-hook) 429 :group 'ediff-hook)
430(defcustom ediff-prepare-buffer-hook nil 430(defcustom ediff-prepare-buffer-hook nil
431 "*Hooks run after buffers A, B, and C are set up. 431 "Hooks run after buffers A, B, and C are set up.
432For each buffer, the hooks are run with that buffer made current." 432For each buffer, the hooks are run with that buffer made current."
433 :type 'hook 433 :type 'hook
434 :group 'ediff-hook) 434 :group 'ediff-hook)
435(defcustom ediff-load-hook nil 435(defcustom ediff-load-hook nil
436 "*Hook run after Ediff is loaded. Can be used to change defaults." 436 "Hook run after Ediff is loaded. Can be used to change defaults."
437 :type 'hook 437 :type 'hook
438 :group 'ediff-hook) 438 :group 'ediff-hook)
439 439
440(defcustom ediff-mode-hook nil 440(defcustom ediff-mode-hook nil
441 "*Hook run just after ediff-mode is set up in the control buffer. 441 "Hook run just after ediff-mode is set up in the control buffer.
442This is done before any windows or frames are created. One can use it to 442This is done before any windows or frames are created. One can use it to
443set local variables that determine how the display looks like." 443set local variables that determine how the display looks like."
444 :type 'hook 444 :type 'hook
445 :group 'ediff-hook) 445 :group 'ediff-hook)
446(defcustom ediff-keymap-setup-hook nil 446(defcustom ediff-keymap-setup-hook nil
447 "*Hook run just after the default bindings in Ediff keymap are set up." 447 "Hook run just after the default bindings in Ediff keymap are set up."
448 :type 'hook 448 :type 'hook
449 :group 'ediff-hook) 449 :group 'ediff-hook)
450 450
451(defcustom ediff-display-help-hook nil 451(defcustom ediff-display-help-hook nil
452 "*Hooks run after preparing the help message." 452 "Hooks run after preparing the help message."
453 :type 'hook 453 :type 'hook
454 :group 'ediff-hook) 454 :group 'ediff-hook)
455 455
456(defcustom ediff-suspend-hook nil 456(defcustom ediff-suspend-hook nil
457 "*Hooks to run in the Ediff control buffer when Ediff is suspended." 457 "Hooks to run in the Ediff control buffer when Ediff is suspended."
458 :type 'hook 458 :type 'hook
459 :group 'ediff-hook) 459 :group 'ediff-hook)
460(defcustom ediff-quit-hook nil 460(defcustom ediff-quit-hook nil
461 "*Hooks to run in the Ediff control buffer after finishing Ediff." 461 "Hooks to run in the Ediff control buffer after finishing Ediff."
462 :type 'hook 462 :type 'hook
463 :group 'ediff-hook) 463 :group 'ediff-hook)
464(defcustom ediff-cleanup-hook nil 464(defcustom ediff-cleanup-hook nil
465 "*Hooks to run on exiting Ediff but before killing the control and variant buffers." 465 "Hooks to run on exiting Ediff but before killing the control and variant buffers."
466 :type 'hook 466 :type 'hook
467 :group 'ediff-hook) 467 :group 'ediff-hook)
468 468
@@ -537,24 +537,24 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.")
537 537
538;; Highlighting 538;; Highlighting
539(defcustom ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>") 539(defcustom ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>")
540 "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." 540 "Flag placed before a highlighted block of differences, if block starts at beginning of a line."
541 :type 'string 541 :type 'string
542 :tag "Region before-flag at beginning of line" 542 :tag "Region before-flag at beginning of line"
543 :group 'ediff) 543 :group 'ediff)
544 544
545(defcustom ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") 545(defcustom ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-")
546 "*Flag placed after a highlighted block of differences, if block ends at end of a line." 546 "Flag placed after a highlighted block of differences, if block ends at end of a line."
547 :type 'string 547 :type 'string
548 :tag "Region after-flag at end of line" 548 :tag "Region after-flag at end of line"
549 :group 'ediff) 549 :group 'ediff)
550 550
551(defcustom ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>") 551(defcustom ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>")
552 "*Flag placed before a highlighted block of differences, if block starts in mid-line." 552 "Flag placed before a highlighted block of differences, if block starts in mid-line."
553 :type 'string 553 :type 'string
554 :tag "Region before-flag in the middle of line" 554 :tag "Region before-flag in the middle of line"
555 :group 'ediff) 555 :group 'ediff)
556(defcustom ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") 556(defcustom ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-")
557 "*Flag placed after a highlighted block of differences, if block ends in mid-line." 557 "Flag placed after a highlighted block of differences, if block ends in mid-line."
558 :type 'string 558 :type 'string
559 :tag "Region after-flag in the middle of line" 559 :tag "Region after-flag in the middle of line"
560 :group 'ediff) 560 :group 'ediff)
@@ -598,7 +598,7 @@ highlighted using ASCII flags."
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
601 "*nil means prompt to remove unmodified buffers A/B/C at session end. 601 "nil means prompt to remove unmodified buffers A/B/C at session end.
602Supplying a prefix argument to the quit command `q' temporarily reverses the 602Supplying a prefix argument to the quit command `q' temporarily reverses the
603meaning of this variable." 603meaning of this variable."
604 :type 'boolean 604 :type 'boolean
@@ -718,7 +718,7 @@ appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire."
718 :group 'ediff) 718 :group 'ediff)
719 719
720(defcustom ediff-coding-system-for-read 'raw-text 720(defcustom ediff-coding-system-for-read 'raw-text
721 "*The coding system for read to use when running the diff program as a subprocess. 721 "The coding system for read to use when running the diff program as a subprocess.
722In most cases, the default will do. However, under certain circumstances in 722In most cases, the default will do. However, under certain circumstances in
723MS-Windows you might need to use something like 'raw-text-dos here. 723MS-Windows you might need to use something like 'raw-text-dos here.
724So, if the output that your diff program sends to Emacs contains extra ^M's, 724So, if the output that your diff program sends to Emacs contains extra ^M's,
@@ -728,7 +728,7 @@ work."
728 :group 'ediff) 728 :group 'ediff)
729 729
730(defcustom ediff-coding-system-for-write 'emacs-internal 730(defcustom ediff-coding-system-for-write 'emacs-internal
731 "*The coding system for write to use when writing out difference regions 731 "The coding system for write to use when writing out difference regions
732to temp files in buffer jobs and when Ediff needs to find fine differences." 732to temp files in buffer jobs and when Ediff needs to find fine differences."
733 :type 'symbol 733 :type 'symbol
734 :group 'ediff) 734 :group 'ediff)
@@ -1355,7 +1355,7 @@ Normally, this is the `toggle-read-only' function, but, if version
1355control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.") 1355control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.")
1356 1356
1357(defcustom ediff-make-buffers-readonly-at-startup nil 1357(defcustom ediff-make-buffers-readonly-at-startup nil
1358 "*Make all variant buffers read-only when Ediff starts up. 1358 "Make all variant buffers read-only when Ediff starts up.
1359This property can be toggled interactively." 1359This property can be toggled interactively."
1360 :type 'boolean 1360 :type 'boolean
1361 :group 'ediff) 1361 :group 'ediff)
@@ -1367,7 +1367,7 @@ This property can be toggled interactively."
1367(defvar ediff-verbose-p t) 1367(defvar ediff-verbose-p t)
1368 1368
1369(defcustom ediff-autostore-merges 'group-jobs-only 1369(defcustom ediff-autostore-merges 'group-jobs-only
1370 "*Save the results of merge jobs automatically. 1370 "Save the results of merge jobs automatically.
1371With value nil, don't save automatically. With value t, always 1371With value nil, don't save automatically. With value t, always
1372save. Anything else means save automatically only if the merge 1372save. Anything else means save automatically only if the merge
1373job is part of a group of jobs, such as `ediff-merge-directory' 1373job is part of a group of jobs, such as `ediff-merge-directory'
@@ -1380,12 +1380,12 @@ or `ediff-merge-directory-revisions'."
1380(ediff-defvar-local ediff-merge-store-file nil "") 1380(ediff-defvar-local ediff-merge-store-file nil "")
1381 1381
1382(defcustom ediff-merge-filename-prefix "merge_" 1382(defcustom ediff-merge-filename-prefix "merge_"
1383 "*Prefix to be attached to saved merge buffers." 1383 "Prefix to be attached to saved merge buffers."
1384 :type 'string 1384 :type 'string
1385 :group 'ediff-merge) 1385 :group 'ediff-merge)
1386 1386
1387(defcustom ediff-no-emacs-help-in-control-buffer nil 1387(defcustom ediff-no-emacs-help-in-control-buffer nil
1388 "*Non-nil means C-h should not invoke Emacs help in control buffer. 1388 "Non-nil means C-h should not invoke Emacs help in control buffer.
1389Instead, C-h would jump to previous difference." 1389Instead, C-h would jump to previous difference."
1390 :type 'boolean 1390 :type 'boolean
1391 :group 'ediff) 1391 :group 'ediff)
@@ -1402,13 +1402,13 @@ Instead, C-h would jump to previous difference."
1402;;; (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp")) 1402;;; (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
1403;;; (t 1403;;; (t
1404;;; (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp")))) 1404;;; (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
1405 "*Prefix to put on Ediff temporary file names. 1405 "Prefix to put on Ediff temporary file names.
1406Do not start with `~/' or `~USERNAME/'." 1406Do not start with `~/' or `~USERNAME/'."
1407 :type 'string 1407 :type 'string
1408 :group 'ediff) 1408 :group 'ediff)
1409 1409
1410(defcustom ediff-temp-file-mode 384 ; u=rw only 1410(defcustom ediff-temp-file-mode 384 ; u=rw only
1411 "*Mode for Ediff temporary files." 1411 "Mode for Ediff temporary files."
1412 :type 'integer 1412 :type 'integer
1413 :group 'ediff) 1413 :group 'ediff)
1414 1414
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 0a847772d3b..ea6a32d9753 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -39,21 +39,21 @@
39(require 'ediff-init) 39(require 'ediff-init)
40 40
41(defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge 41(defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge
42 "*Hooks to run before quitting a merge job. 42 "Hooks to run before quitting a merge job.
43The most common use is to save and delete the merge buffer." 43The most common use is to save and delete the merge buffer."
44 :type 'hook 44 :type 'hook
45 :group 'ediff-merge) 45 :group 'ediff-merge)
46 46
47 47
48(defcustom ediff-default-variant 'combined 48(defcustom ediff-default-variant 'combined
49 "*The variant to be used as a default for buffer C in merging. 49 "The variant to be used as a default for buffer C in merging.
50Valid values are the symbols `default-A', `default-B', and `combined'." 50Valid values are the symbols `default-A', `default-B', and `combined'."
51 :type '(radio (const default-A) (const default-B) (const combined)) 51 :type '(radio (const default-A) (const default-B) (const combined))
52 :group 'ediff-merge) 52 :group 'ediff-merge)
53 53
54(defcustom ediff-combination-pattern 54(defcustom ediff-combination-pattern
55 '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") 55 '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end")
56 "*Pattern to be used for combining difference regions in buffers A and B. 56 "Pattern to be used for combining difference regions in buffers A and B.
57The value must be a list of the form 57The value must be a list of the form
58\(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) 58\(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4)
59where bufspec is the symbol A, B, or Ancestor. For instance, if the value is 59where bufspec is the symbol A, B, or Ancestor. For instance, if the value is
@@ -73,7 +73,7 @@ STRING4
73 :group 'ediff-merge) 73 :group 'ediff-merge)
74 74
75(defcustom ediff-show-clashes-only nil 75(defcustom ediff-show-clashes-only nil
76 "*If t, show only those diff regions where both buffers disagree with the ancestor. 76 "If t, show only those diff regions where both buffers disagree with the ancestor.
77This means that regions that have status prefer-A or prefer-B will be 77This means that regions that have status prefer-A or prefer-B will be
78skipped over. A value of nil means show all regions." 78skipped over. A value of nil means show all regions."
79 :type 'boolean 79 :type 'boolean
@@ -82,7 +82,7 @@ skipped over. A value of nil means show all regions."
82(make-variable-buffer-local 'ediff-show-clashes-only) 82(make-variable-buffer-local 'ediff-show-clashes-only)
83 83
84(defcustom ediff-skip-merge-regions-that-differ-from-default nil 84(defcustom ediff-skip-merge-regions-that-differ-from-default nil
85 "*If t, show only the regions that have not been changed by the user. 85 "If t, show only the regions that have not been changed by the user.
86A region is considered to have been changed if it is different from the current 86A region is considered to have been changed if it is different from the current
87default (`default-A', `default-B', `combined') and it hasn't been marked as 87default (`default-A', `default-B', `combined') and it hasn't been marked as
88`prefer-A' or `prefer-B'. 88`prefer-A' or `prefer-B'.
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 522155ccdd3..eae55755c05 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -202,47 +202,47 @@ Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil."
202(defvar ediff-session-registry nil) 202(defvar ediff-session-registry nil)
203 203
204(defcustom ediff-meta-truncate-filenames t 204(defcustom ediff-meta-truncate-filenames t
205 "*If non-nil, truncate long file names in the session group buffers. 205 "If non-nil, truncate long file names in the session group buffers.
206This can be toggled with `ediff-toggle-filename-truncation'." 206This can be toggled with `ediff-toggle-filename-truncation'."
207 :type 'boolean 207 :type 'boolean
208 :group 'ediff-mult) 208 :group 'ediff-mult)
209 209
210(defcustom ediff-meta-mode-hook nil 210(defcustom ediff-meta-mode-hook nil
211 "*Hooks run just after setting up meta mode." 211 "Hooks run just after setting up meta mode."
212 :type 'hook 212 :type 'hook
213 :group 'ediff-mult) 213 :group 'ediff-mult)
214 214
215(defcustom ediff-registry-setup-hook nil 215(defcustom ediff-registry-setup-hook nil
216 "*Hooks run just after the registry control panel is set up." 216 "Hooks run just after the registry control panel is set up."
217 :type 'hook 217 :type 'hook
218 :group 'ediff-mult) 218 :group 'ediff-mult)
219 219
220(defcustom ediff-before-session-group-setup-hooks nil 220(defcustom ediff-before-session-group-setup-hooks nil
221 "*Hooks to run before Ediff arranges the window for group-level operations. 221 "Hooks to run before Ediff arranges the window for group-level operations.
222It is used by commands such as `ediff-directories'. 222It is used by commands such as `ediff-directories'.
223This hook can be used to save the previous window config, which can be restored 223This hook can be used to save the previous window config, which can be restored
224on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'." 224on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'."
225 :type 'hook 225 :type 'hook
226 :group 'ediff-hook) 226 :group 'ediff-hook)
227(defcustom ediff-after-session-group-setup-hook nil 227(defcustom ediff-after-session-group-setup-hook nil
228 "*Hooks run just after a meta-buffer controlling a session group, such as 228 "Hooks run just after a meta-buffer controlling a session group, such as
229ediff-directories, is run." 229ediff-directories, is run."
230 :type 'hook 230 :type 'hook
231 :group 'ediff-mult) 231 :group 'ediff-mult)
232(defcustom ediff-quit-session-group-hook nil 232(defcustom ediff-quit-session-group-hook nil
233 "*Hooks run just before exiting a session group." 233 "Hooks run just before exiting a session group."
234 :type 'hook 234 :type 'hook
235 :group 'ediff-mult) 235 :group 'ediff-mult)
236(defcustom ediff-show-registry-hook nil 236(defcustom ediff-show-registry-hook nil
237 "*Hooks run just after the registry buffer is shown." 237 "Hooks run just after the registry buffer is shown."
238 :type 'hook 238 :type 'hook
239 :group 'ediff-mult) 239 :group 'ediff-mult)
240(defcustom ediff-show-session-group-hook '(delete-other-windows) 240(defcustom ediff-show-session-group-hook '(delete-other-windows)
241 "*Hooks run just after a session group buffer is shown." 241 "Hooks run just after a session group buffer is shown."
242 :type 'hook 242 :type 'hook
243 :group 'ediff-mult) 243 :group 'ediff-mult)
244(defcustom ediff-meta-buffer-keymap-setup-hook nil 244(defcustom ediff-meta-buffer-keymap-setup-hook nil
245 "*Hooks run just after setting up the `ediff-meta-buffer-map'. 245 "Hooks run just after setting up the `ediff-meta-buffer-map'.
246This keymap controls key bindings in the meta buffer and is a local variable. 246This keymap controls key bindings in the meta buffer and is a local variable.
247This means that you can set different bindings for different kinds of meta 247This means that you can set different bindings for different kinds of meta
248buffers." 248buffers."
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index ce6e88611be..2ec1e55a7c5 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -41,12 +41,12 @@
41(require 'ediff-init) 41(require 'ediff-init)
42 42
43(defcustom ediff-patch-program "patch" 43(defcustom ediff-patch-program "patch"
44 "*Name of the program that applies patches. 44 "Name of the program that applies patches.
45It is recommended to use GNU-compatible versions." 45It is recommended to use GNU-compatible versions."
46 :type 'string 46 :type 'string
47 :group 'ediff-ptch) 47 :group 'ediff-ptch)
48(defcustom ediff-patch-options "-f" 48(defcustom ediff-patch-options "-f"
49 "*Options to pass to ediff-patch-program. 49 "Options to pass to ediff-patch-program.
50 50
51Note: the `-b' option should be specified in `ediff-backup-specs'. 51Note: the `-b' option should be specified in `ediff-backup-specs'.
52 52
@@ -93,7 +93,7 @@ See also `ediff-backup-specs'."
93 (t 93 (t
94 ;; traditional `patch' 94 ;; traditional `patch'
95 (format "-b %s" ediff-backup-extension)))) 95 (format "-b %s" ediff-backup-extension))))
96 "*Backup directives to pass to the patch program. 96 "Backup directives to pass to the patch program.
97Ediff requires that the old version of the file \(before applying the patch\) 97Ediff requires that the old version of the file \(before applying the patch\)
98be saved in a file named `the-patch-file.extension'. Usually `extension' is 98be saved in a file named `the-patch-file.extension'. Usually `extension' is
99`.orig', but this can be changed by the user and may depend on the system. 99`.orig', but this can be changed by the user and may depend on the system.
@@ -117,7 +117,7 @@ patch. So, don't change these variables, unless the default doesn't work."
117 117
118 118
119(defcustom ediff-patch-default-directory nil 119(defcustom ediff-patch-default-directory nil
120 "*Default directory to look for patches." 120 "Default directory to look for patches."
121 :type '(choice (const nil) string) 121 :type '(choice (const nil) string)
122 :group 'ediff-ptch) 122 :group 'ediff-ptch)
123 123
@@ -129,7 +129,7 @@ patch. So, don't change these variables, unless the default doesn't work."
129 "\\|" ; GNU unified format diff 2-liner 129 "\\|" ; GNU unified format diff 2-liner
130 "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)" 130 "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)"
131 "\\)") 131 "\\)")
132 "*Regexp matching filename 2-liners at the start of each context diff. 132 "Regexp matching filename 2-liners at the start of each context diff.
133You probably don't want to change that, unless you are using an obscure patch 133You probably don't want to change that, unless you are using an obscure patch
134program." 134program."
135 :type 'regexp 135 :type 'regexp
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index fdd68a8bbb6..266a7457205 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -43,7 +43,7 @@
43;; end pacifier 43;; end pacifier
44 44
45(defcustom ediff-keep-tmp-versions nil 45(defcustom ediff-keep-tmp-versions nil
46 "*If t, do not delete temporary previous versions for the files on which 46 "If t, do not delete temporary previous versions for the files on which
47comparison or merge operations are being performed." 47comparison or merge operations are being performed."
48 :type 'boolean 48 :type 'boolean
49 :group 'ediff-vers 49 :group 'ediff-vers
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index e21817289ff..17551066eb5 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -68,7 +68,7 @@
68 'ediff-setup-windows-plain)) 68 'ediff-setup-windows-plain))
69 69
70(defcustom ediff-window-setup-function (ediff-choose-window-setup-function-automatically) 70(defcustom ediff-window-setup-function (ediff-choose-window-setup-function-automatically)
71 "*Function called to set up windows. 71 "Function called to set up windows.
72Ediff provides a choice of two functions: `ediff-setup-windows-plain', for 72Ediff provides a choice of two functions: `ediff-setup-windows-plain', for
73doing everything in one frame and `ediff-setup-windows-multiframe', which sets 73doing everything in one frame and `ediff-setup-windows-multiframe', which sets
74the control panel in a separate frame. By default, the appropriate function is 74the control panel in a separate frame. By default, the appropriate function is
@@ -124,7 +124,7 @@ provided functions are written."
124 124
125 125
126(defcustom ediff-split-window-function 'split-window-vertically 126(defcustom ediff-split-window-function 'split-window-vertically
127 "*The function used to split the main window between buffer-A and buffer-B. 127 "The function used to split the main window between buffer-A and buffer-B.
128You can set it to a horizontal split instead of the default vertical split 128You can set it to a horizontal split instead of the default vertical split
129by setting this variable to `split-window-horizontally'. 129by setting this variable to `split-window-horizontally'.
130You can also have your own function to do fancy splits. 130You can also have your own function to do fancy splits.
@@ -137,7 +137,7 @@ In this case, Ediff will use those frames to display these buffers."
137 :group 'ediff-window) 137 :group 'ediff-window)
138 138
139(defcustom ediff-merge-split-window-function 'split-window-horizontally 139(defcustom ediff-merge-split-window-function 'split-window-horizontally
140 "*The function used to split the main window between buffer-A and buffer-B. 140 "The function used to split the main window between buffer-A and buffer-B.
141You can set it to a vertical split instead of the default horizontal split 141You can set it to a vertical split instead of the default horizontal split
142by setting this variable to `split-window-vertically'. 142by setting this variable to `split-window-vertically'.
143You can also have your own function to do fancy splits. 143You can also have your own function to do fancy splits.
@@ -194,7 +194,7 @@ Used internally---not a user option.")
194 "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.") 194 "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.")
195 195
196(defcustom ediff-grab-mouse t 196(defcustom ediff-grab-mouse t
197 "*If t, Ediff will always grab the mouse and put it in the control frame. 197 "If t, Ediff will always grab the mouse and put it in the control frame.
198If 'maybe, Ediff will do it sometimes, but not after operations that require 198If 'maybe, Ediff will do it sometimes, but not after operations that require
199relatively long time. If nil, the mouse will be entirely user's 199relatively long time. If nil, the mouse will be entirely user's
200responsibility." 200responsibility."
@@ -210,7 +210,7 @@ of the form \(\(top . <position>\) \(left . <position>\)\)"
210 :group 'ediff-window) 210 :group 'ediff-window)
211 211
212(defcustom ediff-control-frame-upward-shift 42 212(defcustom ediff-control-frame-upward-shift 42
213 "*The upward shift of control frame from the top of buffer A's frame. 213 "The upward shift of control frame from the top of buffer A's frame.
214Measured in pixels. 214Measured in pixels.
215This is used by the default control frame positioning function, 215This is used by the default control frame positioning function,
216`ediff-make-frame-position'. This variable is provided for easy 216`ediff-make-frame-position'. This variable is provided for easy
@@ -219,7 +219,7 @@ customization of the default control frame positioning."
219 :group 'ediff-window) 219 :group 'ediff-window)
220 220
221(defcustom ediff-narrow-control-frame-leftward-shift (if (featurep 'xemacs) 7 3) 221(defcustom ediff-narrow-control-frame-leftward-shift (if (featurep 'xemacs) 7 3)
222 "*The leftward shift of control frame from the right edge of buf A's frame. 222 "The leftward shift of control frame from the right edge of buf A's frame.
223Measured in characters. 223Measured in characters.
224This is used by the default control frame positioning function, 224This is used by the default control frame positioning function,
225`ediff-make-frame-position' to adjust the position of the control frame 225`ediff-make-frame-position' to adjust the position of the control frame
@@ -229,7 +229,7 @@ customization of the default."
229 :group 'ediff-window) 229 :group 'ediff-window)
230 230
231(defcustom ediff-wide-control-frame-rightward-shift 7 231(defcustom ediff-wide-control-frame-rightward-shift 7
232 "*The rightward shift of control frame from the left edge of buf A's frame. 232 "The rightward shift of control frame from the left edge of buf A's frame.
233Measured in characters. 233Measured in characters.
234This is used by the default control frame positioning function, 234This is used by the default control frame positioning function,
235`ediff-make-frame-position' to adjust the position of the control frame 235`ediff-make-frame-position' to adjust the position of the control frame
@@ -261,7 +261,7 @@ the frame used for the wide display.")
261(ediff-defvar-local ediff-control-frame nil "") 261(ediff-defvar-local ediff-control-frame nil "")
262 262
263(defcustom ediff-prefer-iconified-control-frame nil 263(defcustom ediff-prefer-iconified-control-frame nil
264 "*If t, keep control panel iconified when help message is off. 264 "If t, keep control panel iconified when help message is off.
265This has effect only on a windowing system. 265This has effect only on a windowing system.
266If t, hitting `?' to toggle control panel off iconifies it. 266If t, hitting `?' to toggle control panel off iconifies it.
267 267
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 42af9d82cbb..27d5247ded1 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -133,7 +133,7 @@
133 133
134 134
135(defcustom ediff-use-last-dir nil 135(defcustom ediff-use-last-dir nil
136 "*If t, Ediff will use previous directory as default when reading file name." 136 "If t, Ediff will use previous directory as default when reading file name."
137 :type 'boolean 137 :type 'boolean
138 :group 'ediff) 138 :group 'ediff)
139 139
diff --git a/lisp/emerge.el b/lisp/emerge.el
index 182cfa4b7fd..fea4313098b 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -137,55 +137,55 @@ When called interactively, displays the version."
137;; finicky details of their output, including the somewhat strange 137;; finicky details of their output, including the somewhat strange
138;; way they number lines of a file. 138;; way they number lines of a file.
139(defcustom emerge-diff-program "diff" 139(defcustom emerge-diff-program "diff"
140 "*Name of the program which compares two files." 140 "Name of the program which compares two files."
141 :type 'string 141 :type 'string
142 :group 'emerge) 142 :group 'emerge)
143(defcustom emerge-diff3-program "diff3" 143(defcustom emerge-diff3-program "diff3"
144 "*Name of the program which compares three files. 144 "Name of the program which compares three files.
145Its arguments are the ancestor file and the two variant files." 145Its arguments are the ancestor file and the two variant files."
146 :type 'string 146 :type 'string
147 :group 'emerge) 147 :group 'emerge)
148(defcustom emerge-diff-options "" 148(defcustom emerge-diff-options ""
149 "*Options to pass to `emerge-diff-program' and `emerge-diff3-program'." 149 "Options to pass to `emerge-diff-program' and `emerge-diff3-program'."
150 :type 'string 150 :type 'string
151 :group 'emerge) 151 :group 'emerge)
152(defcustom emerge-match-diff-line 152(defcustom emerge-match-diff-line
153 (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) 153 (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)"))
154 (concat "^" x "\\([acd]\\)" x "$")) 154 (concat "^" x "\\([acd]\\)" x "$"))
155 "*Pattern to match lines produced by diff that describe differences. 155 "Pattern to match lines produced by diff that describe differences.
156This is as opposed to lines from the source files." 156This is as opposed to lines from the source files."
157 :type 'regexp 157 :type 'regexp
158 :group 'emerge) 158 :group 'emerge)
159(defcustom emerge-diff-ok-lines-regexp 159(defcustom emerge-diff-ok-lines-regexp
160 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)" 160 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)"
161 "*Regexp that matches normal output lines from `emerge-diff-program'. 161 "Regexp that matches normal output lines from `emerge-diff-program'.
162Lines that do not match are assumed to be error messages." 162Lines that do not match are assumed to be error messages."
163 :type 'regexp 163 :type 'regexp
164 :group 'emerge) 164 :group 'emerge)
165(defcustom emerge-diff3-ok-lines-regexp 165(defcustom emerge-diff3-ok-lines-regexp
166 "^\\([1-3]:\\|====\\| \\)" 166 "^\\([1-3]:\\|====\\| \\)"
167 "*Regexp that matches normal output lines from `emerge-diff3-program'. 167 "Regexp that matches normal output lines from `emerge-diff3-program'.
168Lines that do not match are assumed to be error messages." 168Lines that do not match are assumed to be error messages."
169 :type 'regexp 169 :type 'regexp
170 :group 'emerge) 170 :group 'emerge)
171 171
172(defcustom emerge-rcs-ci-program "ci" 172(defcustom emerge-rcs-ci-program "ci"
173 "*Name of the program that checks in RCS revisions." 173 "Name of the program that checks in RCS revisions."
174 :type 'string 174 :type 'string
175 :group 'emerge) 175 :group 'emerge)
176(defcustom emerge-rcs-co-program "co" 176(defcustom emerge-rcs-co-program "co"
177 "*Name of the program that checks out RCS revisions." 177 "Name of the program that checks out RCS revisions."
178 :type 'string 178 :type 'string
179 :group 'emerge) 179 :group 'emerge)
180 180
181(defcustom emerge-process-local-variables nil 181(defcustom emerge-process-local-variables nil
182 "*Non-nil if Emerge should process local-variables lists in merge buffers. 182 "Non-nil if Emerge should process local-variables lists in merge buffers.
183\(You can explicitly request processing the local-variables 183\(You can explicitly request processing the local-variables
184by executing `(hack-local-variables)'.)" 184by executing `(hack-local-variables)'.)"
185 :type 'boolean 185 :type 'boolean
186 :group 'emerge) 186 :group 'emerge)
187(defcustom emerge-execute-line-deletions nil 187(defcustom emerge-execute-line-deletions nil
188 "*If non-nil: `emerge-execute-line' makes no output if an input was deleted. 188 "If non-nil: `emerge-execute-line' makes no output if an input was deleted.
189It concludes that an input version has been deleted when an ancestor entry 189It concludes that an input version has been deleted when an ancestor entry
190is present, only one A or B entry is present, and an output entry is present. 190is present, only one A or B entry is present, and an output entry is present.
191If nil: In such circumstances, the A or B file that is present will be 191If nil: In such circumstances, the A or B file that is present will be
@@ -194,13 +194,13 @@ copied to the designated output file."
194 :group 'emerge) 194 :group 'emerge)
195 195
196(defcustom emerge-before-flag "vvvvvvvvvvvvvvvvvvvv\n" 196(defcustom emerge-before-flag "vvvvvvvvvvvvvvvvvvvv\n"
197 "*Flag placed above the highlighted block of code. Must end with newline. 197 "Flag placed above the highlighted block of code. Must end with newline.
198Must be set before Emerge is loaded, or emerge-new-flags must be run 198Must be set before Emerge is loaded, or emerge-new-flags must be run
199after setting." 199after setting."
200 :type 'string 200 :type 'string
201 :group 'emerge) 201 :group 'emerge)
202(defcustom emerge-after-flag "^^^^^^^^^^^^^^^^^^^^\n" 202(defcustom emerge-after-flag "^^^^^^^^^^^^^^^^^^^^\n"
203 "*Flag placed below the highlighted block of code. Must end with newline. 203 "Flag placed below the highlighted block of code. Must end with newline.
204Must be set before Emerge is loaded, or emerge-new-flags must be run 204Must be set before Emerge is loaded, or emerge-new-flags must be run
205after setting." 205after setting."
206 :type 'string 206 :type 'string
@@ -209,16 +209,16 @@ after setting."
209;; Hook variables 209;; Hook variables
210 210
211(defcustom emerge-startup-hook nil 211(defcustom emerge-startup-hook nil
212 "*Hook to run in the merge buffer after the merge has been set up." 212 "Hook to run in the merge buffer after the merge has been set up."
213 :type 'hook 213 :type 'hook
214 :group 'emerge) 214 :group 'emerge)
215(defcustom emerge-select-hook nil 215(defcustom emerge-select-hook nil
216 "*Hook to run after a difference has been selected. 216 "Hook to run after a difference has been selected.
217The variable `n' holds the (internal) number of the difference." 217The variable `n' holds the (internal) number of the difference."
218 :type 'hook 218 :type 'hook
219 :group 'emerge) 219 :group 'emerge)
220(defcustom emerge-unselect-hook nil 220(defcustom emerge-unselect-hook nil
221 "*Hook to run after a difference has been unselected. 221 "Hook to run after a difference has been unselected.
222The variable `n' holds the (internal) number of the difference." 222The variable `n' holds the (internal) number of the difference."
223 :type 'hook 223 :type 'hook
224 :group 'emerge) 224 :group 'emerge)
@@ -227,7 +227,7 @@ The variable `n' holds the (internal) number of the difference."
227;; Emerge commands. 227;; Emerge commands.
228 228
229(defcustom emerge-default-last-directories nil 229(defcustom emerge-default-last-directories nil
230 "*If nil, default dir for filenames in emerge is `default-directory'. 230 "If nil, default dir for filenames in emerge is `default-directory'.
231If non-nil, filenames complete in the directory of the last argument of the 231If non-nil, filenames complete in the directory of the last argument of the
232same type to an `emerge-files...' command." 232same type to an `emerge-files...' command."
233 :type 'boolean 233 :type 'boolean
@@ -292,26 +292,26 @@ depend on the flags."
292(emerge-new-flags) 292(emerge-new-flags)
293 293
294(defcustom emerge-min-visible-lines 3 294(defcustom emerge-min-visible-lines 3
295 "*Number of lines that we want to show above and below the flags when we are 295 "Number of lines that we want to show above and below the flags when we are
296displaying a difference." 296displaying a difference."
297 :type 'integer 297 :type 'integer
298 :group 'emerge) 298 :group 'emerge)
299 299
300(defcustom emerge-temp-file-prefix 300(defcustom emerge-temp-file-prefix
301 (expand-file-name "emerge" temporary-file-directory) 301 (expand-file-name "emerge" temporary-file-directory)
302 "*Prefix to put on Emerge temporary file names. 302 "Prefix to put on Emerge temporary file names.
303Do not start with `~/' or `~USERNAME/'." 303Do not start with `~/' or `~USERNAME/'."
304 :type 'string 304 :type 'string
305 :group 'emerge) 305 :group 'emerge)
306 306
307(defcustom emerge-temp-file-mode 384 ; u=rw only 307(defcustom emerge-temp-file-mode 384 ; u=rw only
308 "*Mode for Emerge temporary files." 308 "Mode for Emerge temporary files."
309 :type 'integer 309 :type 'integer
310 :group 'emerge) 310 :group 'emerge)
311 311
312(defcustom emerge-combine-versions-template 312(defcustom emerge-combine-versions-template
313 "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n" 313 "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
314 "*Template for `emerge-combine-versions' to combine the two versions. 314 "Template for `emerge-combine-versions' to combine the two versions.
315The template is inserted as a string, with the following interpolations: 315The template is inserted as a string, with the following interpolations:
316 %a the A version of the difference 316 %a the A version of the difference
317 %b the B version of the difference 317 %b the B version of the difference
@@ -343,7 +343,7 @@ Makes Emerge commands directly available.")
343 (make-sparse-keymap "Move")) 343 (make-sparse-keymap "Move"))
344 344
345(defcustom emerge-command-prefix "\C-c\C-c" 345(defcustom emerge-command-prefix "\C-c\C-c"
346 "*Command prefix for Emerge commands in `edit' mode. 346 "Command prefix for Emerge commands in `edit' mode.
347Must be set before Emerge is loaded." 347Must be set before Emerge is loaded."
348 :type 'string 348 :type 'string
349 :group 'emerge) 349 :group 'emerge)
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index a6d83f949f6..33c41c82c0e 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -120,7 +120,7 @@ If you change this variable after loading facemenu.el, you will need to call
120 :group 'facemenu) 120 :group 'facemenu)
121 121
122(defcustom facemenu-new-faces-at-end t 122(defcustom facemenu-new-faces-at-end t
123 "*Where in the menu to insert newly-created faces. 123 "Where in the menu to insert newly-created faces.
124This should be nil to put them at the top of the menu, or t to put them 124This should be nil to put them at the top of the menu, or t to put them
125just before \"Other\" at the end." 125just before \"Other\" at the end."
126 :type 'boolean 126 :type 'boolean
@@ -136,7 +136,7 @@ just before \"Other\" at the end."
136 "22.1,\n and has no effect on the Face menu") 136 "22.1,\n and has no effect on the Face menu")
137 137
138(defcustom facemenu-listed-faces nil 138(defcustom facemenu-listed-faces nil
139 "*List of faces to include in the Face menu. 139 "List of faces to include in the Face menu.
140Each element should be a symbol, the name of a face. 140Each element should be a symbol, the name of a face.
141The \"basic \" faces in `facemenu-keybindings' are automatically 141The \"basic \" faces in `facemenu-keybindings' are automatically
142added to the Face menu, and need not be in this list. 142added to the Face menu, and need not be in this list.
diff --git a/lisp/faces.el b/lisp/faces.el
index 661cb9db4f0..5e1e4c9b264 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -49,7 +49,7 @@ of `history-length', which see.")
49 49
50(defcustom face-font-selection-order 50(defcustom face-font-selection-order
51 '(:width :height :weight :slant) 51 '(:width :height :weight :slant)
52 "*A list specifying how face font selection chooses fonts. 52 "A list specifying how face font selection chooses fonts.
53Each of the four symbols `:width', `:height', `:weight', and `:slant' 53Each of the four symbols `:width', `:height', `:weight', and `:slant'
54must appear once in the list, and the list must not contain any other 54must appear once in the list, and the list must not contain any other
55elements. Font selection first tries to find a best matching font 55elements. Font selection first tries to find a best matching font
@@ -73,7 +73,7 @@ a font height that isn't optimal."
73 ("courier" "CMU Typewriter Text" "fixed") 73 ("courier" "CMU Typewriter Text" "fixed")
74 ("Sans Serif" "helv" "helvetica" "arial" "fixed") 74 ("Sans Serif" "helv" "helvetica" "arial" "fixed")
75 ("helv" "helvetica" "arial" "fixed")) 75 ("helv" "helvetica" "arial" "fixed"))
76 "*Alist of alternative font family names. 76 "Alist of alternative font family names.
77Each element has the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...). 77Each element has the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...).
78If fonts of family FAMILY can't be loaded, try ALTERNATIVE1, then 78If fonts of family FAMILY can't be loaded, try ALTERNATIVE1, then
79ALTERNATIVE2 etc." 79ALTERNATIVE2 etc."
@@ -97,7 +97,7 @@ ALTERNATIVE2 etc."
97 ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978") 97 ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
98 ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987") 98 ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
99 ("muletibetan-2" "muletibetan-0"))) 99 ("muletibetan-2" "muletibetan-0")))
100 "*Alist of alternative font registry names. 100 "Alist of alternative font registry names.
101Each element has the form (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...). 101Each element has the form (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...).
102If fonts of registry REGISTRY can be loaded, font selection 102If fonts of registry REGISTRY can be loaded, font selection
103tries to find a best matching font among all fonts of registry 103tries to find a best matching font among all fonts of registry
@@ -303,7 +303,7 @@ If FRAME is omitted or nil, use the selected frame."
303 (:italic (".attributeItalic" . "Face.AttributeItalic")) 303 (:italic (".attributeItalic" . "Face.AttributeItalic"))
304 (:font (".attributeFont" . "Face.AttributeFont")) 304 (:font (".attributeFont" . "Face.AttributeFont"))
305 (:inherit (".attributeInherit" . "Face.AttributeInherit"))) 305 (:inherit (".attributeInherit" . "Face.AttributeInherit")))
306 "*List of X resources and classes for face attributes. 306 "List of X resources and classes for face attributes.
307Each element has the form (ATTRIBUTE ENTRY1 ENTRY2...) where ATTRIBUTE is 307Each element has the form (ATTRIBUTE ENTRY1 ENTRY2...) where ATTRIBUTE is
308the name of a face attribute, and each ENTRY is a cons of the form 308the name of a face attribute, and each ENTRY is a cons of the form
309\(RESOURCE . CLASS) with RESOURCE being the resource and CLASS being the 309\(RESOURCE . CLASS) with RESOURCE being the resource and CLASS being the
@@ -1812,7 +1812,7 @@ Return nil if it has no specified face."
1812;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1812;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1813 1813
1814(defcustom frame-background-mode nil 1814(defcustom frame-background-mode nil
1815 "*The brightness of the background. 1815 "The brightness of the background.
1816Set this to the symbol `dark' if your background color is dark, 1816Set this to the symbol `dark' if your background color is dark,
1817`light' if your background is light, or nil (automatic by default) 1817`light' if your background is light, or nil (automatic by default)
1818if you want Emacs to examine the brightness for you. Don't set this 1818if you want Emacs to examine the brightness for you. Don't set this
@@ -2016,7 +2016,7 @@ frame parameters in PARAMETERS and `default-frame-alist'."
2016 ;; X resouces for the default face are applied during 2016 ;; X resouces for the default face are applied during
2017 ;; x-create-frame. 2017 ;; x-create-frame.
2018 (and (not (eq face 'default)) 2018 (and (not (eq face 'default))
2019 (memq (window-system frame) '(x w32 ns)) 2019 (memq (window-system frame) '(x w32 ns))
2020 (make-face-x-resource-internal face frame)) 2020 (make-face-x-resource-internal face frame))
2021 ;; Apply attributes specified by face-new-frame-defaults 2021 ;; Apply attributes specified by face-new-frame-defaults
2022 (internal-merge-in-global-face face frame)) 2022 (internal-merge-in-global-face face frame))
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 72efcb33542..c063adf7f10 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -148,7 +148,7 @@ If nil, ffap doesn't do shell prompt stripping."
148 ;; This used to test for ange-ftp or efs being present, but it should be 148 ;; This used to test for ange-ftp or efs being present, but it should be
149 ;; harmless (and simpler) to give it this value unconditionally. 149 ;; harmless (and simpler) to give it this value unconditionally.
150 "\\`/[^/:]+:" 150 "\\`/[^/:]+:"
151 "*File names matching this regexp are treated as remote ffap. 151 "File names matching this regexp are treated as remote ffap.
152If nil, ffap neither recognizes nor generates such names." 152If nil, ffap neither recognizes nor generates such names."
153 :type '(choice (const :tag "Disable" nil) 153 :type '(choice (const :tag "Disable" nil)
154 (const :tag "Standard" "\\`/[^/:]+:") 154 (const :tag "Standard" "\\`/[^/:]+:")
@@ -156,18 +156,18 @@ If nil, ffap neither recognizes nor generates such names."
156 :group 'ffap) 156 :group 'ffap)
157 157
158(defcustom ffap-url-unwrap-local t 158(defcustom ffap-url-unwrap-local t
159 "*If non-nil, convert `file:' URL to local file name before prompting." 159 "If non-nil, convert `file:' URL to local file name before prompting."
160 :type 'boolean 160 :type 'boolean
161 :group 'ffap) 161 :group 'ffap)
162 162
163(defcustom ffap-url-unwrap-remote t 163(defcustom ffap-url-unwrap-remote t
164 "*If non-nil, convert `ftp:' URL to remote file name before prompting. 164 "If non-nil, convert `ftp:' URL to remote file name before prompting.
165This is ignored if `ffap-ftp-regexp' is nil." 165This is ignored if `ffap-ftp-regexp' is nil."
166 :type 'boolean 166 :type 'boolean
167 :group 'ffap) 167 :group 'ffap)
168 168
169(defcustom ffap-ftp-default-user "anonymous" 169(defcustom ffap-ftp-default-user "anonymous"
170 "*User name in ftp file names generated by `ffap-host-to-path'. 170 "User name in ftp file names generated by `ffap-host-to-path'.
171Note this name may be omitted if it equals the default 171Note this name may be omitted if it equals the default
172\(either `efs-default-user' or `ange-ftp-default-user'\)." 172\(either `efs-default-user' or `ange-ftp-default-user'\)."
173 :type 'string 173 :type 'string
@@ -177,7 +177,7 @@ Note this name may be omitted if it equals the default
177 ;; Remote file access built into file system? HP rfa or Andrew afs: 177 ;; Remote file access built into file system? HP rfa or Andrew afs:
178 "\\`/\\(afs\\|net\\)/." 178 "\\`/\\(afs\\|net\\)/."
179 ;; afs only: (and (file-exists-p "/afs") "\\`/afs/.") 179 ;; afs only: (and (file-exists-p "/afs") "\\`/afs/.")
180 "*Matching file names are treated as remote. Use nil to disable." 180 "Matching file names are treated as remote. Use nil to disable."
181 :type 'regexp 181 :type 'regexp
182 :group 'ffap) 182 :group 'ffap)
183 183
@@ -194,7 +194,7 @@ Note this name may be omitted if it equals the default
194 "Regexp matching URL's. nil to disable URL features in ffap.") 194 "Regexp matching URL's. nil to disable URL features in ffap.")
195 195
196(defcustom ffap-foo-at-bar-prefix "mailto" 196(defcustom ffap-foo-at-bar-prefix "mailto"
197 "*Presumed URL prefix type of strings like \"<foo.9z@bar>\". 197 "Presumed URL prefix type of strings like \"<foo.9z@bar>\".
198Sensible values are nil, \"news\", or \"mailto\"." 198Sensible values are nil, \"news\", or \"mailto\"."
199 :type '(choice (const "mailto") 199 :type '(choice (const "mailto")
200 (const "news") 200 (const "news")
@@ -213,7 +213,7 @@ Sensible values are nil, \"news\", or \"mailto\"."
213;; enabler in your .emacs file. 213;; enabler in your .emacs file.
214 214
215(defcustom ffap-dired-wildcards "[*?][^/]*\\'" 215(defcustom ffap-dired-wildcards "[*?][^/]*\\'"
216 "*A regexp matching filename wildcard characters, or nil. 216 "A regexp matching filename wildcard characters, or nil.
217 217
218If `find-file-at-point' gets a filename matching this pattern, 218If `find-file-at-point' gets a filename matching this pattern,
219and `ffap-pass-wildcards-to-dired' is nil, it passes it on to 219and `ffap-pass-wildcards-to-dired' is nil, it passes it on to
@@ -233,33 +233,33 @@ it passes it on to `dired'."
233 :group 'ffap) 233 :group 'ffap)
234 234
235(defcustom ffap-pass-wildcards-to-dired nil 235(defcustom ffap-pass-wildcards-to-dired nil
236 "*If non-nil, pass filenames matching `ffap-dired-wildcards' to dired." 236 "If non-nil, pass filenames matching `ffap-dired-wildcards' to dired."
237 :type 'boolean 237 :type 'boolean
238 :group 'ffap) 238 :group 'ffap)
239 239
240(defcustom ffap-newfile-prompt nil 240(defcustom ffap-newfile-prompt nil
241 ;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is 241 ;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is
242 ;; better handled by `find-file-not-found-hooks'. 242 ;; better handled by `find-file-not-found-hooks'.
243 "*Whether `find-file-at-point' prompts about a nonexistent file." 243 "Whether `find-file-at-point' prompts about a nonexistent file."
244 :type 'boolean 244 :type 'boolean
245 :group 'ffap) 245 :group 'ffap)
246 246
247(defcustom ffap-require-prefix nil 247(defcustom ffap-require-prefix nil
248 ;; Suggestion from RHOGEE, 20 Oct 1994. 248 ;; Suggestion from RHOGEE, 20 Oct 1994.
249 "*If set, reverses the prefix argument to `find-file-at-point'. 249 "If set, reverses the prefix argument to `find-file-at-point'.
250This is nil so neophytes notice ffap. Experts may prefer to disable 250This is nil so neophytes notice ffap. Experts may prefer to disable
251ffap most of the time." 251ffap most of the time."
252 :type 'boolean 252 :type 'boolean
253 :group 'ffap) 253 :group 'ffap)
254 254
255(defcustom ffap-file-finder 'find-file 255(defcustom ffap-file-finder 'find-file
256 "*The command called by `find-file-at-point' to find a file." 256 "The command called by `find-file-at-point' to find a file."
257 :type 'function 257 :type 'function
258 :group 'ffap) 258 :group 'ffap)
259(put 'ffap-file-finder 'risky-local-variable t) 259(put 'ffap-file-finder 'risky-local-variable t)
260 260
261(defcustom ffap-directory-finder 'dired 261(defcustom ffap-directory-finder 'dired
262 "*The command called by `dired-at-point' to find a directory." 262 "The command called by `dired-at-point' to find a directory."
263 :type 'function 263 :type 'function
264 :group 'ffap) 264 :group 'ffap)
265(put 'ffap-directory-finder 'risky-local-variable t) 265(put 'ffap-directory-finder 'risky-local-variable t)
@@ -271,7 +271,7 @@ ffap most of the time."
271 ;; Remote control references: 271 ;; Remote control references:
272 ;; http://www.ncsa.uiuc.edu/SDG/Software/XMosaic/remote-control.html 272 ;; http://www.ncsa.uiuc.edu/SDG/Software/XMosaic/remote-control.html
273 ;; http://home.netscape.com/newsref/std/x-remote.html 273 ;; http://home.netscape.com/newsref/std/x-remote.html
274 "*A function of one argument, called by ffap to fetch an URL. 274 "A function of one argument, called by ffap to fetch an URL.
275Reasonable choices are `w3-fetch' or a `browse-url-*' function. 275Reasonable choices are `w3-fetch' or a `browse-url-*' function.
276For a fancy alternative, get `ffap-url.el'." 276For a fancy alternative, get `ffap-url.el'."
277 :type '(choice (const w3-fetch) 277 :type '(choice (const w3-fetch)
@@ -309,7 +309,7 @@ For a fancy alternative, get `ffap-url.el'."
309 ;; It pays to put a big fancy regexp here, since ffap-guesser is 309 ;; It pays to put a big fancy regexp here, since ffap-guesser is
310 ;; much more time-consuming than regexp searching: 310 ;; much more time-consuming than regexp searching:
311 "[/:.~[:alpha:]]/\\|@[[:alpha:]][-[:alnum:]]*\\." 311 "[/:.~[:alpha:]]/\\|@[[:alpha:]][-[:alnum:]]*\\."
312 "*Regular expression governing movements of `ffap-next'." 312 "Regular expression governing movements of `ffap-next'."
313 :type 'regexp 313 :type 'regexp
314 :group 'ffap) 314 :group 'ffap)
315 315
@@ -375,14 +375,14 @@ Actual search is done by `ffap-next-guess'."
375;; particular, if `Pinging...' is broken or takes too long on your 375;; particular, if `Pinging...' is broken or takes too long on your
376;; machine, try setting these all to accept or reject. 376;; machine, try setting these all to accept or reject.
377(defcustom ffap-machine-p-local 'reject ; this happens often 377(defcustom ffap-machine-p-local 'reject ; this happens often
378 "*What `ffap-machine-p' does with hostnames that have no domain. 378 "What `ffap-machine-p' does with hostnames that have no domain.
379Value should be a symbol, one of `ping', `accept', and `reject'." 379Value should be a symbol, one of `ping', `accept', and `reject'."
380 :type '(choice (const ping) 380 :type '(choice (const ping)
381 (const accept) 381 (const accept)
382 (const reject)) 382 (const reject))
383 :group 'ffap) 383 :group 'ffap)
384(defcustom ffap-machine-p-known 'ping ; `accept' for higher speed 384(defcustom ffap-machine-p-known 'ping ; `accept' for higher speed
385 "*What `ffap-machine-p' does with hostnames that have a known domain. 385 "What `ffap-machine-p' does with hostnames that have a known domain.
386Value should be a symbol, one of `ping', `accept', and `reject'. 386Value should be a symbol, one of `ping', `accept', and `reject'.
387See `mail-extr.el' for the known domains." 387See `mail-extr.el' for the known domains."
388 :type '(choice (const ping) 388 :type '(choice (const ping)
@@ -390,7 +390,7 @@ See `mail-extr.el' for the known domains."
390 (const reject)) 390 (const reject))
391 :group 'ffap) 391 :group 'ffap)
392(defcustom ffap-machine-p-unknown 'reject 392(defcustom ffap-machine-p-unknown 'reject
393 "*What `ffap-machine-p' does with hostnames that have an unknown domain. 393 "What `ffap-machine-p' does with hostnames that have an unknown domain.
394Value should be a symbol, one of `ping', `accept', and `reject'. 394Value should be a symbol, one of `ping', `accept', and `reject'.
395See `mail-extr.el' for the known domains." 395See `mail-extr.el' for the known domains."
396 :type '(choice (const ping) 396 :type '(choice (const ping)
@@ -1770,7 +1770,7 @@ Only intended for interactive use."
1770 1770
1771 1771
1772(defcustom dired-at-point-require-prefix nil 1772(defcustom dired-at-point-require-prefix nil
1773 "*If set, reverses the prefix argument to `dired-at-point'. 1773 "If set, reverses the prefix argument to `dired-at-point'.
1774This is nil so neophytes notice ffap. Experts may prefer to disable 1774This is nil so neophytes notice ffap. Experts may prefer to disable
1775ffap most of the time." 1775ffap most of the time."
1776 :type 'boolean 1776 :type 'boolean
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 9e06d6f23ef..19d6fdf5c5e 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -157,7 +157,7 @@
157(defcustom file-cache-filter-regexps 157(defcustom file-cache-filter-regexps
158 (list "~$" "\\.o$" "\\.exe$" "\\.a$" "\\.elc$" ",v$" "\\.output$" 158 (list "~$" "\\.o$" "\\.exe$" "\\.a$" "\\.elc$" ",v$" "\\.output$"
159 "\\.$" "#$" "\\.class$") 159 "\\.$" "#$" "\\.class$")
160 "*List of regular expressions used as filters by the file cache. 160 "List of regular expressions used as filters by the file cache.
161File names which match these expressions will not be added to the cache. 161File names which match these expressions will not be added to the cache.
162Note that the functions `file-cache-add-file' and `file-cache-add-file-list' 162Note that the functions `file-cache-add-file' and `file-cache-add-file-list'
163do not use this variable." 163do not use this variable."
@@ -165,12 +165,12 @@ do not use this variable."
165 :group 'file-cache) 165 :group 'file-cache)
166 166
167(defcustom file-cache-find-command "find" 167(defcustom file-cache-find-command "find"
168 "*External program used by `file-cache-add-directory-using-find'." 168 "External program used by `file-cache-add-directory-using-find'."
169 :type 'string 169 :type 'string
170 :group 'file-cache) 170 :group 'file-cache)
171 171
172(defcustom file-cache-find-command-posix-flag 'not-defined 172(defcustom file-cache-find-command-posix-flag 'not-defined
173 "*Set to t, if `file-cache-find-command' handles wildcards POSIX style. 173 "Set to t, if `file-cache-find-command' handles wildcards POSIX style.
174This variable is automatically set to nil or non-nil 174This variable is automatically set to nil or non-nil
175if it has the initial value `not-defined' whenever you first 175if it has the initial value `not-defined' whenever you first
176call the `file-cache-add-directory-using-find'. 176call the `file-cache-add-directory-using-find'.
@@ -183,7 +183,7 @@ should be t."
183 :group 'file-cache) 183 :group 'file-cache)
184 184
185(defcustom file-cache-locate-command "locate" 185(defcustom file-cache-locate-command "locate"
186 "*External program used by `file-cache-add-directory-using-locate'." 186 "External program used by `file-cache-add-directory-using-locate'."
187 :type 'string 187 :type 'string
188 :group 'file-cache) 188 :group 'file-cache)
189 189
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 0e4ba8f7436..508ee7e1a16 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -40,7 +40,7 @@
40(defcustom find-ls-option 40(defcustom find-ls-option
41 (if (eq system-type 'berkeley-unix) '("-ls" . "-gilsb") 41 (if (eq system-type 'berkeley-unix) '("-ls" . "-gilsb")
42 '("-exec ls -ld {} \\;" . "-ld")) 42 '("-exec ls -ld {} \\;" . "-ld"))
43 "*Description of the option to `find' to produce an `ls -l'-type listing. 43 "Description of the option to `find' to produce an `ls -l'-type listing.
44This is a cons of two strings (FIND-OPTION . LS-SWITCHES). FIND-OPTION 44This is a cons of two strings (FIND-OPTION . LS-SWITCHES). FIND-OPTION
45gives the option (or options) to `find' that produce the desired output. 45gives the option (or options) to `find' that produce the desired output.
46LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output." 46LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output."
@@ -64,7 +64,7 @@ them for `find-ls-option'."
64 (string-match "solaris2" system-configuration) 64 (string-match "solaris2" system-configuration)
65 (string-match "irix" system-configuration)) 65 (string-match "irix" system-configuration))
66 "-s" "-q") 66 "-s" "-q")
67 "*Option to grep to be as silent as possible. 67 "Option to grep to be as silent as possible.
68On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it. 68On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it.
69On other systems, the closest you can come is to use `-l'." 69On other systems, the closest you can come is to use `-l'."
70 :type 'string 70 :type 'string
@@ -75,7 +75,7 @@ On other systems, the closest you can come is to use `-l'."
75 (if read-file-name-completion-ignore-case 75 (if read-file-name-completion-ignore-case
76 "-iname" 76 "-iname"
77 "-name") 77 "-name")
78 "*Argument used to specify file name pattern. 78 "Argument used to specify file name pattern.
79If `read-file-name-completion-ignore-case' is non-nil, -iname is used so that 79If `read-file-name-completion-ignore-case' is non-nil, -iname is used so that
80find also ignores case. Otherwise, -name is used." 80find also ignores case. Otherwise, -name is used."
81 :type 'string 81 :type 'string
diff --git a/lisp/font-core.el b/lisp/font-core.el
index e3c34b012ce..b50509f04df 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -262,7 +262,7 @@ this function onto `change-major-mode-hook'."
262;; would also be contrary to the Principle of Least Surprise. sm. 262;; would also be contrary to the Principle of Least Surprise. sm.
263 263
264(defcustom font-lock-global-modes t 264(defcustom font-lock-global-modes t
265 "*Modes for which Font Lock mode is automagically turned on. 265 "Modes for which Font Lock mode is automagically turned on.
266Global Font Lock mode is controlled by the command `global-font-lock-mode'. 266Global Font Lock mode is controlled by the command `global-font-lock-mode'.
267If nil, means no modes have Font Lock mode automatically turned on. 267If nil, means no modes have Font Lock mode automatically turned on.
268If t, all modes that support Font Lock mode have it automatically turned on. 268If t, all modes that support Font Lock mode have it automatically turned on.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 0758a6dae48..d688fd85354 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -227,7 +227,7 @@
227;; User variables. 227;; User variables.
228 228
229(defcustom font-lock-maximum-size 256000 229(defcustom font-lock-maximum-size 256000
230 "*Maximum size of a buffer for buffer fontification. 230 "Maximum size of a buffer for buffer fontification.
231Only buffers less than this can be fontified when Font Lock mode is turned on. 231Only buffers less than this can be fontified when Font Lock mode is turned on.
232If nil, means size is irrelevant. 232If nil, means size is irrelevant.
233If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE), 233If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE),
@@ -249,7 +249,7 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
249 :group 'font-lock) 249 :group 'font-lock)
250 250
251(defcustom font-lock-maximum-decoration t 251(defcustom font-lock-maximum-decoration t
252 "*Maximum decoration level for fontification. 252 "Maximum decoration level for fontification.
253If nil, use the default decoration (typically the minimum available). 253If nil, use the default decoration (typically the minimum available).
254If t, use the maximum decoration available. 254If t, use the maximum decoration available.
255If a number, use that level of decoration (or if not available the maximum). 255If a number, use that level of decoration (or if not available the maximum).
@@ -274,7 +274,7 @@ decoration for buffers in C++ mode, and level 1 decoration otherwise."
274 :group 'font-lock) 274 :group 'font-lock)
275 275
276(defcustom font-lock-verbose 0 276(defcustom font-lock-verbose 0
277 "*If non-nil, means show status messages for buffer fontification. 277 "If non-nil, means show status messages for buffer fontification.
278If a number, only buffers greater than this size have fontification messages." 278If a number, only buffers greater than this size have fontification messages."
279 :type '(choice (const :tag "never" nil) 279 :type '(choice (const :tag "never" nil)
280 (other :tag "always" t) 280 (other :tag "always" t)
@@ -851,7 +851,7 @@ happens, so the major mode can be corrected."
851;; themselves. 851;; themselves.
852 852
853(defcustom font-lock-support-mode 'jit-lock-mode 853(defcustom font-lock-support-mode 'jit-lock-mode
854 "*Support mode for Font Lock mode. 854 "Support mode for Font Lock mode.
855Support modes speed up Font Lock mode by being choosy about when fontification 855Support modes speed up Font Lock mode by being choosy about when fontification
856occurs. The default support mode, Just-in-time Lock mode (symbol 856occurs. The default support mode, Just-in-time Lock mode (symbol
857`jit-lock-mode'), is recommended. 857`jit-lock-mode'), is recommended.
diff --git a/lisp/forms.el b/lisp/forms.el
index 5e4c4f84c14..d7b486b9c38 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -319,7 +319,7 @@
319;;; Optional variables with default values. 319;;; Optional variables with default values.
320 320
321(defcustom forms-check-number-of-fields t 321(defcustom forms-check-number-of-fields t
322 "*If non-nil, warn about records with wrong number of fields." 322 "If non-nil, warn about records with wrong number of fields."
323 :group 'forms 323 :group 'forms
324 :type 'boolean) 324 :type 'boolean)
325 325
@@ -334,13 +334,13 @@ This is set automatically if the file permissions don't let you write it.")
334If not nil: use this character to separate multi-line fields (default C-k).") 334If not nil: use this character to separate multi-line fields (default C-k).")
335 335
336(defcustom forms-forms-scroll nil 336(defcustom forms-forms-scroll nil
337 "*Non-nil means replace scroll-up/down commands in Forms mode. 337 "Non-nil means replace scroll-up/down commands in Forms mode.
338The replacement commands performs forms-next/prev-record." 338The replacement commands performs forms-next/prev-record."
339 :group 'forms 339 :group 'forms
340 :type 'boolean) 340 :type 'boolean)
341 341
342(defcustom forms-forms-jump nil 342(defcustom forms-forms-jump nil
343 "*Non-nil means redefine beginning/end-of-buffer in Forms mode. 343 "Non-nil means redefine beginning/end-of-buffer in Forms mode.
344The replacement commands performs forms-first/last-record." 344The replacement commands performs forms-first/last-record."
345 :group 'forms 345 :group 'forms
346 :type 'boolean) 346 :type 'boolean)
@@ -366,13 +366,13 @@ This variable is for use by the filter routines only.
366The contents may NOT be modified.") 366The contents may NOT be modified.")
367 367
368(defcustom forms-use-text-properties t 368(defcustom forms-use-text-properties t
369 "*Non-nil means: use text properties. 369 "Non-nil means: use text properties.
370Defaults to t if this Emacs is capable of handling text properties." 370Defaults to t if this Emacs is capable of handling text properties."
371 :group 'forms 371 :group 'forms
372 :type 'boolean) 372 :type 'boolean)
373 373
374(defcustom forms-insert-after nil 374(defcustom forms-insert-after nil
375 "*Non-nil means: inserts of new records go after current record. 375 "Non-nil means: inserts of new records go after current record.
376Also, initial position is at last record." 376Also, initial position is at last record."
377 :group 'forms 377 :group 'forms
378 :type 'boolean) 378 :type 'boolean)
diff --git a/lisp/fringe.el b/lisp/fringe.el
index d7ecd7ec634..5cb2eb9dc65 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -135,7 +135,7 @@ See `fringe-mode' for possible values and their effect."
135 (custom-initialize-reset symbol value)))) 135 (custom-initialize-reset symbol value))))
136 136
137(defcustom fringe-mode nil 137(defcustom fringe-mode nil
138 "*Specify appearance of fringes on all frames. 138 "Specify appearance of fringes on all frames.
139This variable can be nil (the default) meaning the fringes should have 139This variable can be nil (the default) meaning the fringes should have
140the default width (8 pixels), it can be an integer value specifying 140the default width (8 pixels), it can be an integer value specifying
141the width of both left and right fringe (where 0 means no fringe), or 141the width of both left and right fringe (where 0 means no fringe), or
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index ae32af8ec86..c1cf24760ae 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -104,7 +104,7 @@ internally to enable `help-at-pt-display-when-idle'. Do not set it
104yourself.") 104yourself.")
105 105
106(defcustom help-at-pt-timer-delay 1 106(defcustom help-at-pt-timer-delay 1
107 "*Delay before displaying local help. 107 "Delay before displaying local help.
108This is used if `help-at-pt-display-when-idle' is enabled. 108This is used if `help-at-pt-display-when-idle' is enabled.
109The value may be an integer or floating point number. 109The value may be an integer or floating point number.
110 110
@@ -146,7 +146,7 @@ This is done by setting a timer, if none is currently active."
146 146
147;;;###autoload 147;;;###autoload
148(defcustom help-at-pt-display-when-idle 'never 148(defcustom help-at-pt-display-when-idle 'never
149 "*Automatically show local help on point-over. 149 "Automatically show local help on point-over.
150If the value is t, the string obtained from any `kbd-help' or 150If the value is t, the string obtained from any `kbd-help' or
151`help-echo' property at point is automatically printed in the 151`help-echo' property at point is automatically printed in the
152echo area, if nothing else is already displayed there, or after a 152echo area, if nothing else is already displayed there, or after a
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index c8722df46b3..d3a06b8bd29 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -220,31 +220,31 @@ or insert functions in this list."
220 220
221;;;###autoload 221;;;###autoload
222(defcustom hippie-expand-verbose t 222(defcustom hippie-expand-verbose t
223 "*Non-nil makes `hippie-expand' output which function it is trying." 223 "Non-nil makes `hippie-expand' output which function it is trying."
224 :type 'boolean 224 :type 'boolean
225 :group 'hippie-expand) 225 :group 'hippie-expand)
226 226
227;;;###autoload 227;;;###autoload
228(defcustom hippie-expand-dabbrev-skip-space nil 228(defcustom hippie-expand-dabbrev-skip-space nil
229 "*Non-nil means tolerate trailing spaces in the abbreviation to expand." 229 "Non-nil means tolerate trailing spaces in the abbreviation to expand."
230 :group 'hippie-expand 230 :group 'hippie-expand
231 :type 'boolean) 231 :type 'boolean)
232 232
233;;;###autoload 233;;;###autoload
234(defcustom hippie-expand-dabbrev-as-symbol t 234(defcustom hippie-expand-dabbrev-as-symbol t
235 "*Non-nil means expand as symbols, i.e. syntax `_' is considered a letter." 235 "Non-nil means expand as symbols, i.e. syntax `_' is considered a letter."
236 :group 'hippie-expand 236 :group 'hippie-expand
237 :type 'boolean) 237 :type 'boolean)
238 238
239;;;###autoload 239;;;###autoload
240(defcustom hippie-expand-no-restriction t 240(defcustom hippie-expand-no-restriction t
241 "*Non-nil means that narrowed buffers are widened during search." 241 "Non-nil means that narrowed buffers are widened during search."
242 :group 'hippie-expand 242 :group 'hippie-expand
243 :type 'boolean) 243 :type 'boolean)
244 244
245;;;###autoload 245;;;###autoload
246(defcustom hippie-expand-max-buffers () 246(defcustom hippie-expand-max-buffers ()
247 "*The maximum number of buffers (apart from the current) searched. 247 "The maximum number of buffers (apart from the current) searched.
248If nil, all buffers are searched." 248If nil, all buffers are searched."
249 :type '(choice (const :tag "All" nil) 249 :type '(choice (const :tag "All" nil)
250 integer) 250 integer)
@@ -252,7 +252,7 @@ If nil, all buffers are searched."
252 252
253;;;###autoload 253;;;###autoload
254(defcustom hippie-expand-ignore-buffers '("^ \\*.*\\*$" dired-mode) 254(defcustom hippie-expand-ignore-buffers '("^ \\*.*\\*$" dired-mode)
255 "*A list specifying which buffers not to search (if not current). 255 "A list specifying which buffers not to search (if not current).
256Can contain both regexps matching buffer names (as strings) and major modes 256Can contain both regexps matching buffer names (as strings) and major modes
257\(as atoms)" 257\(as atoms)"
258 :type '(repeat (choice regexp (symbol :tag "Major Mode"))) 258 :type '(repeat (choice regexp (symbol :tag "Major Mode")))
@@ -260,7 +260,7 @@ Can contain both regexps matching buffer names (as strings) and major modes
260 260
261;;;###autoload 261;;;###autoload
262(defcustom hippie-expand-only-buffers () 262(defcustom hippie-expand-only-buffers ()
263 "*A list specifying the only buffers to search (in addition to current). 263 "A list specifying the only buffers to search (in addition to current).
264Can contain both regexps matching buffer names (as strings) and major modes 264Can contain both regexps matching buffer names (as strings) and major modes
265\(as atoms). If non-nil, this variable overrides the variable 265\(as atoms). If non-nil, this variable overrides the variable
266`hippie-expand-ignore-buffers'." 266`hippie-expand-ignore-buffers'."
diff --git a/lisp/ido.el b/lisp/ido.el
index 78b890fb9ac..a25c13c301b 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -377,13 +377,13 @@ call the function `ido-everywhere'."
377 :group 'ido) 377 :group 'ido)
378 378
379(defcustom ido-case-fold case-fold-search 379(defcustom ido-case-fold case-fold-search
380 "*Non-nil if searching of buffer and file names should ignore case." 380 "Non-nil if searching of buffer and file names should ignore case."
381 :type 'boolean 381 :type 'boolean
382 :group 'ido) 382 :group 'ido)
383 383
384(defcustom ido-ignore-buffers 384(defcustom ido-ignore-buffers
385 '("\\` ") 385 '("\\` ")
386 "*List of regexps or functions matching buffer names to ignore. 386 "List of regexps or functions matching buffer names to ignore.
387For example, traditional behavior is not to list buffers whose names begin 387For example, traditional behavior is not to list buffers whose names begin
388with a space, for which the regexp is `\\` '. See the source file for 388with a space, for which the regexp is `\\` '. See the source file for
389example functions that filter buffer names." 389example functions that filter buffer names."
@@ -392,7 +392,7 @@ example functions that filter buffer names."
392 392
393(defcustom ido-ignore-files 393(defcustom ido-ignore-files
394 '("\\`CVS/" "\\`#" "\\`.#" "\\`\\.\\./" "\\`\\./") 394 '("\\`CVS/" "\\`#" "\\`.#" "\\`\\.\\./" "\\`\\./")
395 "*List of regexps or functions matching file names to ignore. 395 "List of regexps or functions matching file names to ignore.
396For example, traditional behavior is not to list files whose names begin 396For example, traditional behavior is not to list files whose names begin
397with a #, for which the regexp is `\\`#'. See the source file for 397with a #, for which the regexp is `\\`#'. See the source file for
398example functions that filter filenames." 398example functions that filter filenames."
@@ -400,18 +400,18 @@ example functions that filter filenames."
400 :group 'ido) 400 :group 'ido)
401 401
402(defcustom ido-ignore-extensions t 402(defcustom ido-ignore-extensions t
403 "*Non-nil means ignore files in `completion-ignored-extensions' list." 403 "Non-nil means ignore files in `completion-ignored-extensions' list."
404 :type 'boolean 404 :type 'boolean
405 :group 'ido) 405 :group 'ido)
406 406
407(defcustom ido-show-dot-for-dired nil 407(defcustom ido-show-dot-for-dired nil
408 "*Non-nil means to always put . as the first item in file name lists. 408 "Non-nil means to always put . as the first item in file name lists.
409This allows the current directory to be opened immediately with `dired'." 409This allows the current directory to be opened immediately with `dired'."
410 :type 'boolean 410 :type 'boolean
411 :group 'ido) 411 :group 'ido)
412 412
413(defcustom ido-file-extensions-order nil 413(defcustom ido-file-extensions-order nil
414 "*List of file extensions specifying preferred order of file selections. 414 "List of file extensions specifying preferred order of file selections.
415Each element is either a string with `.' as the first char, an empty 415Each element is either a string with `.' as the first char, an empty
416string matching files without extension, or t which is the default order 416string matching files without extension, or t which is the default order
417for files with an unlisted file extension." 417for files with an unlisted file extension."
@@ -421,12 +421,12 @@ for files with an unlisted file extension."
421 421
422(defcustom ido-ignore-directories 422(defcustom ido-ignore-directories
423 '("\\`CVS/" "\\`\\.\\./" "\\`\\./") 423 '("\\`CVS/" "\\`\\.\\./" "\\`\\./")
424 "*List of regexps or functions matching sub-directory names to ignore." 424 "List of regexps or functions matching sub-directory names to ignore."
425 :type '(repeat (choice regexp function)) 425 :type '(repeat (choice regexp function))
426 :group 'ido) 426 :group 'ido)
427 427
428(defcustom ido-ignore-directories-merge nil 428(defcustom ido-ignore-directories-merge nil
429 "*List of regexps or functions matching directory names to ignore during merge. 429 "List of regexps or functions matching directory names to ignore during merge.
430Directory names matched by one of the regexps in this list are not inserted 430Directory names matched by one of the regexps in this list are not inserted
431in merged file and directory lists." 431in merged file and directory lists."
432 :type '(repeat (choice regexp function)) 432 :type '(repeat (choice regexp function))
@@ -444,7 +444,7 @@ in merged file and directory lists."
444;;(setq ido-ignore-files '("^ " "\\.c\\'" "\\.h\\'")) 444;;(setq ido-ignore-files '("^ " "\\.c\\'" "\\.h\\'"))
445 445
446(defcustom ido-default-file-method 'raise-frame 446(defcustom ido-default-file-method 'raise-frame
447 "*How to visit a new file when using `ido-find-file'. 447 "How to visit a new file when using `ido-find-file'.
448Possible values: 448Possible values:
449`selected-window' Show new file in selected window 449`selected-window' Show new file in selected window
450`other-window' Show new file in another window (same frame) 450`other-window' Show new file in another window (same frame)
@@ -464,7 +464,7 @@ Possible values:
464 :group 'ido) 464 :group 'ido)
465 465
466(defcustom ido-default-buffer-method 'raise-frame 466(defcustom ido-default-buffer-method 'raise-frame
467 "*How to switch to new buffer when using `ido-switch-buffer'. 467 "How to switch to new buffer when using `ido-switch-buffer'.
468See `ido-default-file-method' for details." 468See `ido-default-file-method' for details."
469 :type '(choice (const :tag "Show in selected window" selected-window) 469 :type '(choice (const :tag "Show in selected window" selected-window)
470 (const :tag "Show in other window" other-window) 470 (const :tag "Show in other window" other-window)
@@ -481,7 +481,7 @@ See `ido-default-file-method' for details."
481 :group 'ido) 481 :group 'ido)
482 482
483(defcustom ido-enable-flex-matching nil 483(defcustom ido-enable-flex-matching nil
484 "*Non-nil means that `ido' will do flexible string matching. 484 "Non-nil means that `ido' will do flexible string matching.
485Flexible matching means that if the entered string does not 485Flexible matching means that if the entered string does not
486match any item, any item containing the entered characters 486match any item, any item containing the entered characters
487in the given sequence will match." 487in the given sequence will match."
@@ -490,13 +490,13 @@ in the given sequence will match."
490 490
491 491
492(defcustom ido-enable-regexp nil 492(defcustom ido-enable-regexp nil
493 "*Non-nil means that `ido' will do regexp matching. 493 "Non-nil means that `ido' will do regexp matching.
494Value can be toggled within `ido' using `ido-toggle-regexp'." 494Value can be toggled within `ido' using `ido-toggle-regexp'."
495 :type 'boolean 495 :type 'boolean
496 :group 'ido) 496 :group 'ido)
497 497
498(defcustom ido-enable-prefix nil 498(defcustom ido-enable-prefix nil
499 "*Non-nil means only match if the entered text is a prefix of file name. 499 "Non-nil means only match if the entered text is a prefix of file name.
500This behavior is like the standard Emacs completion. 500This behavior is like the standard Emacs completion.
501If nil, match if the entered text is an arbitrary substring. 501If nil, match if the entered text is an arbitrary substring.
502Value can be toggled within `ido' using `ido-toggle-prefix'." 502Value can be toggled within `ido' using `ido-toggle-prefix'."
@@ -504,21 +504,21 @@ Value can be toggled within `ido' using `ido-toggle-prefix'."
504 :group 'ido) 504 :group 'ido)
505 505
506(defcustom ido-enable-dot-prefix nil 506(defcustom ido-enable-dot-prefix nil
507 "*Non-nil means to match leading dot as prefix. 507 "Non-nil means to match leading dot as prefix.
508I.e. hidden files and buffers will match only if you type a dot 508I.e. hidden files and buffers will match only if you type a dot
509as first char even if `ido-enable-prefix' is nil." 509as first char even if `ido-enable-prefix' is nil."
510 :type 'boolean 510 :type 'boolean
511 :group 'ido) 511 :group 'ido)
512 512
513(defcustom ido-confirm-unique-completion nil 513(defcustom ido-confirm-unique-completion nil
514 "*Non-nil means that even a unique completion must be confirmed. 514 "Non-nil means that even a unique completion must be confirmed.
515This means that \\[ido-complete] must always be followed by \\[ido-exit-minibuffer] 515This means that \\[ido-complete] must always be followed by \\[ido-exit-minibuffer]
516even when there is only one unique completion." 516even when there is only one unique completion."
517 :type 'boolean 517 :type 'boolean
518 :group 'ido) 518 :group 'ido)
519 519
520(defcustom ido-cannot-complete-command 'ido-completion-help 520(defcustom ido-cannot-complete-command 'ido-completion-help
521 "*Command run when `ido-complete' can't complete any more. 521 "Command run when `ido-complete' can't complete any more.
522The most useful values are `ido-completion-help', which pops up a 522The most useful values are `ido-completion-help', which pops up a
523window with completion alternatives, or `ido-next-match' or 523window with completion alternatives, or `ido-next-match' or
524`ido-prev-match', which cycle the buffer list." 524`ido-prev-match', which cycle the buffer list."
@@ -527,20 +527,20 @@ window with completion alternatives, or `ido-next-match' or
527 527
528 528
529(defcustom ido-record-commands t 529(defcustom ido-record-commands t
530 "*Non-nil means that `ido' will record commands in command history. 530 "Non-nil means that `ido' will record commands in command history.
531Note that the non-ido equivalent command is recorded." 531Note that the non-ido equivalent command is recorded."
532 :type 'boolean 532 :type 'boolean
533 :group 'ido) 533 :group 'ido)
534 534
535(defcustom ido-max-prospects 12 535(defcustom ido-max-prospects 12
536 "*Non-zero means that the prospect list will be limited to that number of items. 536 "Non-zero means that the prospect list will be limited to that number of items.
537For a long list of prospects, building the full list for the minibuffer can take a 537For a long list of prospects, building the full list for the minibuffer can take a
538non-negligible amount of time; setting this variable reduces that time." 538non-negligible amount of time; setting this variable reduces that time."
539 :type 'integer 539 :type 'integer
540 :group 'ido) 540 :group 'ido)
541 541
542(defcustom ido-max-file-prompt-width 0.35 542(defcustom ido-max-file-prompt-width 0.35
543 "*Non-zero means that the prompt string be limited to that number of characters. 543 "Non-zero means that the prompt string be limited to that number of characters.
544If value is a floating point number, it specifies a fraction of the frame width." 544If value is a floating point number, it specifies a fraction of the frame width."
545 :type '(choice 545 :type '(choice
546 (integer :tag "Characters" :value 20) 546 (integer :tag "Characters" :value 20)
@@ -550,7 +550,7 @@ If value is a floating point number, it specifies a fraction of the frame width.
550 :group 'ido) 550 :group 'ido)
551 551
552(defcustom ido-max-window-height nil 552(defcustom ido-max-window-height nil
553 "*Non-nil specifies a value to override `max-mini-window-height'." 553 "Non-nil specifies a value to override `max-mini-window-height'."
554 :type '(choice 554 :type '(choice
555 (const :tag "Don't override" nil) 555 (const :tag "Don't override" nil)
556 (integer :tag "Number of lines" :value 1) 556 (integer :tag "Number of lines" :value 1)
@@ -561,20 +561,20 @@ If value is a floating point number, it specifies a fraction of the frame width.
561 :group 'ido) 561 :group 'ido)
562 562
563(defcustom ido-enable-last-directory-history t 563(defcustom ido-enable-last-directory-history t
564 "*Non-nil means that `ido' will remember latest selected directory names. 564 "Non-nil means that `ido' will remember latest selected directory names.
565See `ido-last-directory-list' and `ido-save-directory-list-file'." 565See `ido-last-directory-list' and `ido-save-directory-list-file'."
566 :type 'boolean 566 :type 'boolean
567 :group 'ido) 567 :group 'ido)
568 568
569(defcustom ido-max-work-directory-list 50 569(defcustom ido-max-work-directory-list 50
570 "*Maximum number of working directories to record. 570 "Maximum number of working directories to record.
571This is the list of directories where files have most recently been opened. 571This is the list of directories where files have most recently been opened.
572See `ido-work-directory-list' and `ido-save-directory-list-file'." 572See `ido-work-directory-list' and `ido-save-directory-list-file'."
573 :type 'integer 573 :type 'integer
574 :group 'ido) 574 :group 'ido)
575 575
576(defcustom ido-work-directory-list-ignore-regexps nil 576(defcustom ido-work-directory-list-ignore-regexps nil
577 "*List of regexps matching directories which should not be recorded. 577 "List of regexps matching directories which should not be recorded.
578Directory names matched by one of the regexps in this list are not inserted in 578Directory names matched by one of the regexps in this list are not inserted in
579the `ido-work-directory-list' list." 579the `ido-work-directory-list' list."
580 :type '(repeat regexp) 580 :type '(repeat regexp)
@@ -582,7 +582,7 @@ the `ido-work-directory-list' list."
582 582
583 583
584(defcustom ido-use-filename-at-point nil 584(defcustom ido-use-filename-at-point nil
585 "*Non-nil means that ido shall look for a filename at point. 585 "Non-nil means that ido shall look for a filename at point.
586May use `ffap-guesser' to guess whether text at point is a filename. 586May use `ffap-guesser' to guess whether text at point is a filename.
587If found, use that as the starting point for filename selection." 587If found, use that as the starting point for filename selection."
588 :type '(choice 588 :type '(choice
@@ -593,44 +593,44 @@ If found, use that as the starting point for filename selection."
593 593
594 594
595(defcustom ido-use-url-at-point nil 595(defcustom ido-use-url-at-point nil
596 "*Non-nil means that ido shall look for a URL at point. 596 "Non-nil means that ido shall look for a URL at point.
597If found, call `find-file-at-point' to visit it." 597If found, call `find-file-at-point' to visit it."
598 :type 'boolean 598 :type 'boolean
599 :group 'ido) 599 :group 'ido)
600 600
601 601
602(defcustom ido-enable-tramp-completion t 602(defcustom ido-enable-tramp-completion t
603 "*Non-nil means that ido shall perform tramp method and server name completion. 603 "Non-nil means that ido shall perform tramp method and server name completion.
604A tramp file name uses the following syntax: /method:user@host:filename." 604A tramp file name uses the following syntax: /method:user@host:filename."
605 :type 'boolean 605 :type 'boolean
606 :group 'ido) 606 :group 'ido)
607 607
608(defcustom ido-record-ftp-work-directories t 608(defcustom ido-record-ftp-work-directories t
609 "*Non-nil means record ftp file names in the work directory list." 609 "Non-nil means record ftp file names in the work directory list."
610 :type 'boolean 610 :type 'boolean
611 :group 'ido) 611 :group 'ido)
612 612
613(defcustom ido-merge-ftp-work-directories nil 613(defcustom ido-merge-ftp-work-directories nil
614 "*If nil, merging ignores ftp file names in the work directory list." 614 "If nil, merging ignores ftp file names in the work directory list."
615 :type 'boolean 615 :type 'boolean
616 :group 'ido) 616 :group 'ido)
617 617
618(defcustom ido-cache-ftp-work-directory-time 1.0 618(defcustom ido-cache-ftp-work-directory-time 1.0
619 "*Maximum time to cache contents of an ftp directory (in hours). 619 "Maximum time to cache contents of an ftp directory (in hours).
620Use C-l in prompt to refresh list. 620Use C-l in prompt to refresh list.
621If zero, ftp directories are not cached." 621If zero, ftp directories are not cached."
622 :type 'number 622 :type 'number
623 :group 'ido) 623 :group 'ido)
624 624
625(defcustom ido-slow-ftp-hosts nil 625(defcustom ido-slow-ftp-hosts nil
626 "*List of slow ftp hosts where ido prompting should not be used. 626 "List of slow ftp hosts where ido prompting should not be used.
627If an ftp host is on this list, ido automatically switches to the non-ido 627If an ftp host is on this list, ido automatically switches to the non-ido
628equivalent function, e.g. `find-file' rather than `ido-find-file'." 628equivalent function, e.g. `find-file' rather than `ido-find-file'."
629 :type '(repeat string) 629 :type '(repeat string)
630 :group 'ido) 630 :group 'ido)
631 631
632(defcustom ido-slow-ftp-host-regexps nil 632(defcustom ido-slow-ftp-host-regexps nil
633 "*List of regexps matching slow ftp hosts (see `ido-slow-ftp-hosts')." 633 "List of regexps matching slow ftp hosts (see `ido-slow-ftp-hosts')."
634 :type '(repeat regexp) 634 :type '(repeat regexp)
635 :group 'ido) 635 :group 'ido)
636 636
@@ -638,7 +638,7 @@ equivalent function, e.g. `find-file' rather than `ido-find-file'."
638 "Cached value from `ido-unc-hosts' function.") 638 "Cached value from `ido-unc-hosts' function.")
639 639
640(defcustom ido-unc-hosts nil 640(defcustom ido-unc-hosts nil
641 "*List of known UNC host names to complete after initial //. 641 "List of known UNC host names to complete after initial //.
642If value is a function, that function is called to search network for 642If value is a function, that function is called to search network for
643hosts on first use of UNC path." 643hosts on first use of UNC path."
644 :type '(choice (repeat :tag "List of UNC host names" string) 644 :type '(choice (repeat :tag "List of UNC host names" string)
@@ -651,32 +651,32 @@ hosts on first use of UNC path."
651 :group 'ido) 651 :group 'ido)
652 652
653(defcustom ido-downcase-unc-hosts t 653(defcustom ido-downcase-unc-hosts t
654 "*Non-nil if UNC host names should be downcased." 654 "Non-nil if UNC host names should be downcased."
655 :type 'boolean 655 :type 'boolean
656 :group 'ido) 656 :group 'ido)
657 657
658(defcustom ido-ignore-unc-host-regexps nil 658(defcustom ido-ignore-unc-host-regexps nil
659 "*List of regexps matching UNC hosts to ignore. 659 "List of regexps matching UNC hosts to ignore.
660Case is ignored if `ido-downcase-unc-hosts' is set." 660Case is ignored if `ido-downcase-unc-hosts' is set."
661 :type '(repeat regexp) 661 :type '(repeat regexp)
662 :group 'ido) 662 :group 'ido)
663 663
664(defcustom ido-cache-unc-host-shares-time 8.0 664(defcustom ido-cache-unc-host-shares-time 8.0
665 "*Maximum time to cache shares of an UNC host (in hours). 665 "Maximum time to cache shares of an UNC host (in hours).
666Use C-l in prompt to refresh list. 666Use C-l in prompt to refresh list.
667If zero, UNC host shares are not cached." 667If zero, UNC host shares are not cached."
668 :type 'number 668 :type 'number
669 :group 'ido) 669 :group 'ido)
670 670
671(defcustom ido-max-work-file-list 10 671(defcustom ido-max-work-file-list 10
672 "*Maximum number of names of recently opened files to record. 672 "Maximum number of names of recently opened files to record.
673This is the list of the file names (sans directory) which have most recently 673This is the list of the file names (sans directory) which have most recently
674been opened. See `ido-work-file-list' and `ido-save-directory-list-file'." 674been opened. See `ido-work-file-list' and `ido-save-directory-list-file'."
675 :type 'integer 675 :type 'integer
676 :group 'ido) 676 :group 'ido)
677 677
678(defcustom ido-work-directory-match-only t 678(defcustom ido-work-directory-match-only t
679 "*Non-nil means to skip non-matching directories in the directory history. 679 "Non-nil means to skip non-matching directories in the directory history.
680When some text is already entered at the `ido-find-file' prompt, using 680When some text is already entered at the `ido-find-file' prompt, using
681\\[ido-prev-work-directory] or \\[ido-next-work-directory] will skip directories 681\\[ido-prev-work-directory] or \\[ido-next-work-directory] will skip directories
682without any matching entries." 682without any matching entries."
@@ -684,7 +684,7 @@ without any matching entries."
684 :group 'ido) 684 :group 'ido)
685 685
686(defcustom ido-auto-merge-work-directories-length 0 686(defcustom ido-auto-merge-work-directories-length 0
687 "*Automatically switch to merged work directories during file name input. 687 "Automatically switch to merged work directories during file name input.
688The value is number of characters to type before switching to merged mode. 688The value is number of characters to type before switching to merged mode.
689If zero, the switch happens when no matches are found in the current directory. 689If zero, the switch happens when no matches are found in the current directory.
690Automatic merging is disabled if the value is negative." 690Automatic merging is disabled if the value is negative."
@@ -692,12 +692,12 @@ Automatic merging is disabled if the value is negative."
692 :group 'ido) 692 :group 'ido)
693 693
694(defcustom ido-auto-merge-delay-time 0.70 694(defcustom ido-auto-merge-delay-time 0.70
695 "*Delay in seconds to wait for more input before doing auto merge." 695 "Delay in seconds to wait for more input before doing auto merge."
696 :type 'number 696 :type 'number
697 :group 'ido) 697 :group 'ido)
698 698
699(defcustom ido-auto-merge-inhibit-characters-regexp "[][*?~]" 699(defcustom ido-auto-merge-inhibit-characters-regexp "[][*?~]"
700 "*Regexp matching characters which should inhibit automatic merging. 700 "Regexp matching characters which should inhibit automatic merging.
701When a (partial) file name matches this regexp, merging is inhibited." 701When a (partial) file name matches this regexp, merging is inhibited."
702 :type 'regexp 702 :type 'regexp
703 :group 'ido) 703 :group 'ido)
@@ -708,7 +708,7 @@ When a (partial) file name matches this regexp, merging is inhibited."
708 :group 'ido) 708 :group 'ido)
709 709
710(defcustom ido-max-dir-file-cache 100 710(defcustom ido-max-dir-file-cache 100
711 "*Maximum number of working directories to be cached. 711 "Maximum number of working directories to be cached.
712This is the size of the cache of `file-name-all-completions' results. 712This is the size of the cache of `file-name-all-completions' results.
713Each cache entry is time stamped with the modification time of the 713Each cache entry is time stamped with the modification time of the
714directory. Some systems, like Windows, have unreliable directory 714directory. Some systems, like Windows, have unreliable directory
@@ -720,7 +720,7 @@ See also `ido-dir-file-cache' and `ido-save-directory-list-file'."
720 :group 'ido) 720 :group 'ido)
721 721
722(defcustom ido-max-directory-size 30000 722(defcustom ido-max-directory-size 30000
723 "*Maximum size (in bytes) for directories to use ido completion. 723 "Maximum size (in bytes) for directories to use ido completion.
724If you enter a directory with a size larger than this size, ido will 724If you enter a directory with a size larger than this size, ido will
725not provide the normal completion. To show the completions, use C-a." 725not provide the normal completion. To show the completions, use C-a."
726 :type '(choice (const :tag "No limit" nil) 726 :type '(choice (const :tag "No limit" nil)
@@ -728,12 +728,12 @@ not provide the normal completion. To show the completions, use C-a."
728 :group 'ido) 728 :group 'ido)
729 729
730(defcustom ido-rotate-file-list-default nil 730(defcustom ido-rotate-file-list-default nil
731 "*Non-nil means that `ido' will always rotate file list to get default in front." 731 "Non-nil means that `ido' will always rotate file list to get default in front."
732 :type 'boolean 732 :type 'boolean
733 :group 'ido) 733 :group 'ido)
734 734
735(defcustom ido-enter-matching-directory 'only 735(defcustom ido-enter-matching-directory 'only
736 "*Additional methods to enter sub-directory of first/only matching item. 736 "Additional methods to enter sub-directory of first/only matching item.
737If value is 'first, enter first matching sub-directory when typing a slash. 737If value is 'first, enter first matching sub-directory when typing a slash.
738If value is 'only, typing a slash only enters the sub-directory if it is 738If value is 'only, typing a slash only enters the sub-directory if it is
739the only matching item. 739the only matching item.
@@ -746,7 +746,7 @@ matching item, even without typing a slash."
746 :group 'ido) 746 :group 'ido)
747 747
748(defcustom ido-create-new-buffer 'prompt 748(defcustom ido-create-new-buffer 'prompt
749 "*Specify whether a new buffer is created if no buffer matches substring. 749 "Specify whether a new buffer is created if no buffer matches substring.
750Choices are 'always to create new buffers unconditionally, 'prompt to 750Choices are 'always to create new buffers unconditionally, 'prompt to
751ask user whether to create buffer, or 'never to never create new buffer." 751ask user whether to create buffer, or 'never to never create new buffer."
752 :type '(choice (const always) 752 :type '(choice (const always)
@@ -755,7 +755,7 @@ ask user whether to create buffer, or 'never to never create new buffer."
755 :group 'ido) 755 :group 'ido)
756 756
757(defcustom ido-setup-hook nil 757(defcustom ido-setup-hook nil
758 "*Hook run after the ido variables and keymap have been setup. 758 "Hook run after the ido variables and keymap have been setup.
759The dynamic variable `ido-cur-item' contains the current type of item that 759The dynamic variable `ido-cur-item' contains the current type of item that
760is read by ido; possible values are file, dir, buffer, and list. 760is read by ido; possible values are file, dir, buffer, and list.
761Additional keys can be defined in `ido-completion-map'." 761Additional keys can be defined in `ido-completion-map'."
@@ -763,13 +763,13 @@ Additional keys can be defined in `ido-completion-map'."
763 :group 'ido) 763 :group 'ido)
764 764
765(defcustom ido-separator nil 765(defcustom ido-separator nil
766 "*String used by ido to separate the alternatives in the minibuffer. 766 "String used by ido to separate the alternatives in the minibuffer.
767Obsolete. Set 3rd element of `ido-decorations' instead." 767Obsolete. Set 3rd element of `ido-decorations' instead."
768 :type '(choice string (const nil)) 768 :type '(choice string (const nil))
769 :group 'ido) 769 :group 'ido)
770 770
771(defcustom ido-decorations '( "{" "}" " | " " | ..." "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]") 771(defcustom ido-decorations '( "{" "}" " | " " | ..." "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]")
772 "*List of strings used by ido to display the alternatives in the minibuffer. 772 "List of strings used by ido to display the alternatives in the minibuffer.
773There are 10 elements in this list: 773There are 10 elements in this list:
7741st and 2nd elements are used as brackets around the prospect list, 7741st and 2nd elements are used as brackets around the prospect list,
7753rd element is the separator between prospects (ignored if `ido-separator' is set), 7753rd element is the separator between prospects (ignored if `ido-separator' is set),
@@ -784,19 +784,19 @@ can be completed using TAB,
784 :group 'ido) 784 :group 'ido)
785 785
786(defcustom ido-use-faces t 786(defcustom ido-use-faces t
787 "*Non-nil means use ido faces to highlighting first match, only match and 787 "Non-nil means use ido faces to highlighting first match, only match and
788subdirs in the alternatives." 788subdirs in the alternatives."
789 :type 'boolean 789 :type 'boolean
790 :group 'ido) 790 :group 'ido)
791 791
792(defface ido-first-match '((t (:bold t))) 792(defface ido-first-match '((t (:bold t)))
793 "*Face used by ido for highlighting first match." 793 "Face used by ido for highlighting first match."
794 :group 'ido) 794 :group 'ido)
795 795
796(defface ido-only-match '((((class color)) 796(defface ido-only-match '((((class color))
797 (:foreground "ForestGreen")) 797 (:foreground "ForestGreen"))
798 (t (:italic t))) 798 (t (:italic t)))
799 "*Face used by ido for highlighting only match." 799 "Face used by ido for highlighting only match."
800 :group 'ido) 800 :group 'ido)
801 801
802(defface ido-subdir '((((min-colors 88) (class color)) 802(defface ido-subdir '((((min-colors 88) (class color))
@@ -804,7 +804,7 @@ subdirs in the alternatives."
804 (((class color)) 804 (((class color))
805 (:foreground "red")) 805 (:foreground "red"))
806 (t (:underline t))) 806 (t (:underline t)))
807 "*Face used by ido for highlighting subdirs in the alternatives." 807 "Face used by ido for highlighting subdirs in the alternatives."
808 :group 'ido) 808 :group 'ido)
809 809
810(defface ido-indicator '((((min-colors 88) (class color)) 810(defface ido-indicator '((((min-colors 88) (class color))
@@ -816,7 +816,7 @@ subdirs in the alternatives."
816 :background "red" 816 :background "red"
817 :width condensed)) 817 :width condensed))
818 (t (:inverse-video t))) 818 (t (:inverse-video t)))
819 "*Face used by ido for highlighting its indicators." 819 "Face used by ido for highlighting its indicators."
820 :group 'ido) 820 :group 'ido)
821 821
822(defface ido-incomplete-regexp 822(defface ido-incomplete-regexp
@@ -826,28 +826,28 @@ subdirs in the alternatives."
826 :group 'ido) 826 :group 'ido)
827 827
828(defcustom ido-make-file-list-hook nil 828(defcustom ido-make-file-list-hook nil
829 "*List of functions to run when the list of matching files is created. 829 "List of functions to run when the list of matching files is created.
830Each function on the list may modify the dynamically bound variable 830Each function on the list may modify the dynamically bound variable
831`ido-temp-list' which contains the current list of matching files." 831`ido-temp-list' which contains the current list of matching files."
832 :type 'hook 832 :type 'hook
833 :group 'ido) 833 :group 'ido)
834 834
835(defcustom ido-make-dir-list-hook nil 835(defcustom ido-make-dir-list-hook nil
836 "*List of functions to run when the list of matching directories is created. 836 "List of functions to run when the list of matching directories is created.
837Each function on the list may modify the dynamically bound variable 837Each function on the list may modify the dynamically bound variable
838`ido-temp-list' which contains the current list of matching directories." 838`ido-temp-list' which contains the current list of matching directories."
839 :type 'hook 839 :type 'hook
840 :group 'ido) 840 :group 'ido)
841 841
842(defcustom ido-make-buffer-list-hook nil 842(defcustom ido-make-buffer-list-hook nil
843 "*List of functions to run when the list of matching buffers is created. 843 "List of functions to run when the list of matching buffers is created.
844Each function on the list may modify the dynamically bound variable 844Each function on the list may modify the dynamically bound variable
845`ido-temp-list' which contains the current list of matching buffer names." 845`ido-temp-list' which contains the current list of matching buffer names."
846 :type 'hook 846 :type 'hook
847 :group 'ido) 847 :group 'ido)
848 848
849(defcustom ido-rewrite-file-prompt-functions nil 849(defcustom ido-rewrite-file-prompt-functions nil
850 "*List of functions to run when the find-file prompt is created. 850 "List of functions to run when the find-file prompt is created.
851Each function on the list may modify the following dynamically bound 851Each function on the list may modify the following dynamically bound
852variables: 852variables:
853 dirname - the (abbreviated) directory name 853 dirname - the (abbreviated) directory name
@@ -875,13 +875,13 @@ also modify the dynamic variables described for the variable
875`ido-rewrite-file-prompt-functions'.") 875`ido-rewrite-file-prompt-functions'.")
876 876
877(defcustom ido-completion-buffer "*Ido Completions*" 877(defcustom ido-completion-buffer "*Ido Completions*"
878 "*Name of completion buffer used by ido. 878 "Name of completion buffer used by ido.
879Set to nil to disable completion buffers popping up." 879Set to nil to disable completion buffers popping up."
880 :type 'string 880 :type 'string
881 :group 'ido) 881 :group 'ido)
882 882
883(defcustom ido-completion-buffer-all-completions nil 883(defcustom ido-completion-buffer-all-completions nil
884 "*Non-nil means to show all completions in completion buffer. 884 "Non-nil means to show all completions in completion buffer.
885Otherwise, only the current list of matches is shown." 885Otherwise, only the current list of matches is shown."
886 :type 'boolean 886 :type 'boolean
887 :group 'ido) 887 :group 'ido)
@@ -891,7 +891,7 @@ Otherwise, only the current list of matches is shown."
891See documentation of `walk-windows' for useful values.") 891See documentation of `walk-windows' for useful values.")
892 892
893(defcustom ido-minibuffer-setup-hook nil 893(defcustom ido-minibuffer-setup-hook nil
894 "*Ido-specific customization of minibuffer setup. 894 "Ido-specific customization of minibuffer setup.
895 895
896This hook is run during minibuffer setup if `ido' is active. 896This hook is run during minibuffer setup if `ido' is active.
897It is intended for use in customizing ido for interoperation 897It is intended for use in customizing ido for interoperation
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 3084c4a1c2d..b545635ee8e 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -38,7 +38,7 @@
38;;;###autoload 38;;;###autoload
39(defcustom image-file-name-extensions 39(defcustom image-file-name-extensions
40 '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg") 40 '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")
41 "*A list of image-file filename extensions. 41 "A list of image-file filename extensions.
42Filenames having one of these extensions are considered image files, 42Filenames having one of these extensions are considered image files,
43in addition to those matching `image-file-name-regexps'. 43in addition to those matching `image-file-name-regexps'.
44 44
@@ -57,7 +57,7 @@ the variable is set using \\[customize]."
57 57
58;;;###autoload 58;;;###autoload
59(defcustom image-file-name-regexps nil 59(defcustom image-file-name-regexps nil
60 "*List of regexps matching image-file filenames. 60 "List of regexps matching image-file filenames.
61Filenames matching one of these regexps are considered image files, 61Filenames matching one of these regexps are considered image files,
62in addition to those with an extension in `image-file-name-extensions'. 62in addition to those with an extension in `image-file-name-extensions'.
63 63
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 370875c3d54..65213ef1b28 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -76,7 +76,7 @@
76 :link '(custom-manual "(elisp)Imenu")) 76 :link '(custom-manual "(elisp)Imenu"))
77 77
78(defcustom imenu-use-markers t 78(defcustom imenu-use-markers t
79 "*Non-nil means use markers instead of integers for Imenu buffer positions. 79 "Non-nil means use markers instead of integers for Imenu buffer positions.
80 80
81Setting this to nil makes Imenu work a little faster but editing the 81Setting this to nil makes Imenu work a little faster but editing the
82buffer will make the generated index positions wrong. 82buffer will make the generated index positions wrong.
@@ -87,18 +87,18 @@ This might not yet be honored by all index-building functions."
87 87
88 88
89(defcustom imenu-max-item-length 60 89(defcustom imenu-max-item-length 60
90 "*If a number, truncate Imenu entries to that length." 90 "If a number, truncate Imenu entries to that length."
91 :type '(choice integer 91 :type '(choice integer
92 (const :tag "Unlimited")) 92 (const :tag "Unlimited"))
93 :group 'imenu) 93 :group 'imenu)
94 94
95(defcustom imenu-auto-rescan nil 95(defcustom imenu-auto-rescan nil
96 "*Non-nil means Imenu should always rescan the buffers." 96 "Non-nil means Imenu should always rescan the buffers."
97 :type 'boolean 97 :type 'boolean
98 :group 'imenu) 98 :group 'imenu)
99 99
100(defcustom imenu-auto-rescan-maxout 60000 100(defcustom imenu-auto-rescan-maxout 60000
101 "*Imenu auto-rescan is disabled in buffers larger than this size (in bytes). 101 "Imenu auto-rescan is disabled in buffers larger than this size (in bytes).
102This variable is buffer-local." 102This variable is buffer-local."
103 :type 'integer 103 :type 'integer
104 :group 'imenu) 104 :group 'imenu)
@@ -128,7 +128,7 @@ If `on-mouse' use a popup menu when `imenu' was invoked with the mouse."
128 :version "22.1") 128 :version "22.1")
129 129
130(defcustom imenu-after-jump-hook nil 130(defcustom imenu-after-jump-hook nil
131 "*Hooks called after jumping to a place in the buffer. 131 "Hooks called after jumping to a place in the buffer.
132 132
133Useful things to use here include `reposition-window', `recenter', and 133Useful things to use here include `reposition-window', `recenter', and
134\(lambda () (recenter 0)) to show at top of screen." 134\(lambda () (recenter 0)) to show at top of screen."
@@ -137,7 +137,7 @@ Useful things to use here include `reposition-window', `recenter', and
137 137
138;;;###autoload 138;;;###autoload
139(defcustom imenu-sort-function nil 139(defcustom imenu-sort-function nil
140 "*The function to use for sorting the index mouse-menu. 140 "The function to use for sorting the index mouse-menu.
141 141
142Affects only the mouse index menu. 142Affects only the mouse index menu.
143 143
@@ -156,7 +156,7 @@ element should come before the second. The arguments are cons cells;
156 :group 'imenu) 156 :group 'imenu)
157 157
158(defcustom imenu-max-items 25 158(defcustom imenu-max-items 25
159 "*Maximum number of elements in a mouse menu for Imenu." 159 "Maximum number of elements in a mouse menu for Imenu."
160 :type 'integer 160 :type 'integer
161 :group 'imenu) 161 :group 'imenu)
162 162
@@ -173,14 +173,14 @@ element should come before the second. The arguments are cons cells;
173;; :group 'imenu) 173;; :group 'imenu)
174 174
175(defcustom imenu-space-replacement "." 175(defcustom imenu-space-replacement "."
176 "*The replacement string for spaces in index names. 176 "The replacement string for spaces in index names.
177Used when presenting the index in a completion buffer to make the 177Used when presenting the index in a completion buffer to make the
178names work as tokens." 178names work as tokens."
179 :type '(choice string (const nil)) 179 :type '(choice string (const nil))
180 :group 'imenu) 180 :group 'imenu)
181 181
182(defcustom imenu-level-separator ":" 182(defcustom imenu-level-separator ":"
183 "*The separator between index names of different levels. 183 "The separator between index names of different levels.
184Used for making mouse-menu titles and for flattening nested indexes 184Used for making mouse-menu titles and for flattening nested indexes
185with name concatenation." 185with name concatenation."
186 :type 'string 186 :type 'string
@@ -665,7 +665,7 @@ and speed-up matching.")
665(make-variable-buffer-local 'imenu-syntax-alist) 665(make-variable-buffer-local 'imenu-syntax-alist)
666 666
667(defun imenu-default-create-index-function () 667(defun imenu-default-create-index-function ()
668 "*Default function to create an index alist of the current buffer. 668 "Default function to create an index alist of the current buffer.
669 669
670The most general method is to move point to end of buffer, then repeatedly call 670The most general method is to move point to end of buffer, then repeatedly call
671`imenu-prev-index-position-function' and `imenu-extract-index-name-function'. 671`imenu-prev-index-position-function' and `imenu-extract-index-name-function'.
diff --git a/lisp/indent.el b/lisp/indent.el
index f962cf4686f..eaa0e922415 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -32,7 +32,7 @@
32 :group 'editing) 32 :group 'editing)
33 33
34(defcustom standard-indent 4 34(defcustom standard-indent 4
35 "*Default number of columns for margin-changing functions to indent." 35 "Default number of columns for margin-changing functions to indent."
36 :group 'indent 36 :group 'indent
37 :type 'integer) 37 :type 'integer)
38 38
@@ -45,7 +45,7 @@ Setting this function is all you need to make TAB indent appropriately.
45Don't rebind TAB unless you really need to.") 45Don't rebind TAB unless you really need to.")
46 46
47(defcustom tab-always-indent t 47(defcustom tab-always-indent t
48 "*Controls the operation of the TAB key. 48 "Controls the operation of the TAB key.
49If t, hitting TAB always just indents the current line. 49If t, hitting TAB always just indents the current line.
50If nil, hitting TAB indents the current line if point is at the left margin 50If nil, hitting TAB indents the current line if point is at the left margin
51or in the line's indentation, otherwise it inserts a \"real\" TAB character. 51or in the line's indentation, otherwise it inserts a \"real\" TAB character.
@@ -467,7 +467,7 @@ See also `indent-relative-maybe'."
467 467
468(defcustom tab-stop-list 468(defcustom tab-stop-list
469 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120) 469 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120)
470 "*List of tab stop positions used by `tab-to-tab-stop'. 470 "List of tab stop positions used by `tab-to-tab-stop'.
471This should be a list of integers, ordered from smallest to largest." 471This should be a list of integers, ordered from smallest to largest."
472 :group 'indent 472 :group 'indent
473 :type '(repeat integer)) 473 :type '(repeat integer))
diff --git a/lisp/info.el b/lisp/info.el
index 15a557ad946..b120d3d7379 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -55,7 +55,7 @@ Each element of the stack is a list (FILENAME NODENAME BUFFERPOS).")
55Each element of the list is a list (FILENAME NODENAME).") 55Each element of the list is a list (FILENAME NODENAME).")
56 56
57(defcustom Info-enable-edit nil 57(defcustom Info-enable-edit nil
58 "*Non-nil means the \\<Info-mode-map>\\[Info-edit] command in Info can edit the current node. 58 "Non-nil means the \\<Info-mode-map>\\[Info-edit] command in Info can edit the current node.
59This is convenient if you want to write Info files by hand. 59This is convenient if you want to write Info files by hand.
60However, we recommend that you not do this. 60However, we recommend that you not do this.
61It is better to write a Texinfo file and generate the Info file from that, 61It is better to write a Texinfo file and generate the Info file from that,
@@ -139,19 +139,19 @@ The Lisp code is executed when the node is selected.")
139 :group 'info) 139 :group 'info)
140 140
141(defcustom Info-fontify-visited-nodes t 141(defcustom Info-fontify-visited-nodes t
142 "*Non-nil to fontify references to visited nodes in `info-xref-visited' face." 142 "Non-nil to fontify references to visited nodes in `info-xref-visited' face."
143 :version "22.1" 143 :version "22.1"
144 :type 'boolean 144 :type 'boolean
145 :group 'info) 145 :group 'info)
146 146
147(defcustom Info-fontify-maximum-menu-size 100000 147(defcustom Info-fontify-maximum-menu-size 100000
148 "*Maximum size of menu to fontify if `font-lock-mode' is non-nil. 148 "Maximum size of menu to fontify if `font-lock-mode' is non-nil.
149Set to nil to disable node fontification." 149Set to nil to disable node fontification."
150 :type 'integer 150 :type 'integer
151 :group 'info) 151 :group 'info)
152 152
153(defcustom Info-use-header-line t 153(defcustom Info-use-header-line t
154 "*Non-nil means to put the beginning-of-node links in an Emacs header-line. 154 "Non-nil means to put the beginning-of-node links in an Emacs header-line.
155A header-line does not scroll with the rest of the buffer." 155A header-line does not scroll with the rest of the buffer."
156 :type 'boolean 156 :type 'boolean
157 :group 'info) 157 :group 'info)
@@ -203,7 +203,7 @@ These directories are searched after those in `Info-directory-list'."
203 :group 'info) 203 :group 'info)
204 204
205(defcustom Info-scroll-prefer-subnodes nil 205(defcustom Info-scroll-prefer-subnodes nil
206 "*If non-nil, \\<Info-mode-map>\\[Info-scroll-up] in a menu visits subnodes. 206 "If non-nil, \\<Info-mode-map>\\[Info-scroll-up] in a menu visits subnodes.
207 207
208If this is non-nil, and you scroll far enough in a node that its menu 208If this is non-nil, and you scroll far enough in a node that its menu
209appears on the screen, the next \\<Info-mode-map>\\[Info-scroll-up] 209appears on the screen, the next \\<Info-mode-map>\\[Info-scroll-up]
@@ -218,7 +218,7 @@ when you hit the end of the current node."
218 :group 'info) 218 :group 'info)
219 219
220(defcustom Info-hide-note-references t 220(defcustom Info-hide-note-references t
221 "*If non-nil, hide the tag and section reference in *note and * menu items. 221 "If non-nil, hide the tag and section reference in *note and * menu items.
222If value is non-nil but not `hide', also replaces the \"*note\" with \"see\". 222If value is non-nil but not `hide', also replaces the \"*note\" with \"see\".
223If value is non-nil but not t or `hide', the reference section is still shown. 223If value is non-nil but not t or `hide', the reference section is still shown.
224`nil' completely disables this feature. If this is non-nil, you might 224`nil' completely disables this feature. If this is non-nil, you might
@@ -231,7 +231,7 @@ want to set `Info-refill-paragraphs'."
231 :group 'info) 231 :group 'info)
232 232
233(defcustom Info-refill-paragraphs nil 233(defcustom Info-refill-paragraphs nil
234 "*If non-nil, attempt to refill paragraphs with hidden references. 234 "If non-nil, attempt to refill paragraphs with hidden references.
235This refilling may accidentally remove explicit line breaks in the Info 235This refilling may accidentally remove explicit line breaks in the Info
236file, so be prepared for a few surprises if you enable this feature. 236file, so be prepared for a few surprises if you enable this feature.
237This only has an effect if `Info-hide-note-references' is non-nil." 237This only has an effect if `Info-hide-note-references' is non-nil."
@@ -245,7 +245,7 @@ This only has an effect if `Info-hide-note-references' is non-nil."
245 :type 'integer) 245 :type 'integer)
246 246
247(defcustom Info-search-whitespace-regexp "\\s-+" 247(defcustom Info-search-whitespace-regexp "\\s-+"
248 "*If non-nil, regular expression to match a sequence of whitespace chars. 248 "If non-nil, regular expression to match a sequence of whitespace chars.
249This applies to Info search for regular expressions. 249This applies to Info search for regular expressions.
250You might want to use something like \"[ \\t\\r\\n]+\" instead. 250You might want to use something like \"[ \\t\\r\\n]+\" instead.
251In the Customization buffer, that is `[' followed by a space, 251In the Customization buffer, that is `[' followed by a space,
@@ -254,7 +254,7 @@ a tab, a carriage return (control-M), a newline, and `]+'."
254 :group 'info) 254 :group 'info)
255 255
256(defcustom Info-isearch-search t 256(defcustom Info-isearch-search t
257 "*If non-nil, isearch in Info searches through multiple nodes. 257 "If non-nil, isearch in Info searches through multiple nodes.
258Before leaving the initial Info node, where isearch was started, 258Before leaving the initial Info node, where isearch was started,
259it fails once with the error message [initial node], and with 259it fails once with the error message [initial node], and with
260subsequent C-s/C-r continues through other nodes without failing 260subsequent C-s/C-r continues through other nodes without failing
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index ced3781e5c8..bd5135a7e00 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -82,14 +82,14 @@
82 :group 'iswitchb) 82 :group 'iswitchb)
83 83
84(defcustom isearchb-idle-timeout nil 84(defcustom isearchb-idle-timeout nil
85 "*Number of idle seconds before isearchb turns itself off. 85 "Number of idle seconds before isearchb turns itself off.
86If nil, don't use a timeout." 86If nil, don't use a timeout."
87 :type '(choice (integer :tag "Seconds") 87 :type '(choice (integer :tag "Seconds")
88 (const :tag "Disable" nil)) 88 (const :tag "Disable" nil))
89 :group 'isearchb) 89 :group 'isearchb)
90 90
91(defcustom isearchb-show-completions t 91(defcustom isearchb-show-completions t
92 "*If non-nil, show possible completions in the minibuffer." 92 "If non-nil, show possible completions in the minibuffer."
93 :type 'boolean 93 :type 'boolean
94 :group 'isearchb) 94 :group 'isearchb)
95 95
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index b3dce824c36..7af1d2d93a1 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -257,7 +257,7 @@
257 :link '(emacs-library-link :tag "Lisp File" "iswitchb.el")) 257 :link '(emacs-library-link :tag "Lisp File" "iswitchb.el"))
258 258
259(defcustom iswitchb-case case-fold-search 259(defcustom iswitchb-case case-fold-search
260 "*Non-nil if searching of buffer names should ignore case. 260 "Non-nil if searching of buffer names should ignore case.
261If this is non-nil but the user input has any upper case letters, matching 261If this is non-nil but the user input has any upper case letters, matching
262is temporarily case sensitive." 262is temporarily case sensitive."
263 :type 'boolean 263 :type 'boolean
@@ -265,7 +265,7 @@ is temporarily case sensitive."
265 265
266(defcustom iswitchb-buffer-ignore 266(defcustom iswitchb-buffer-ignore
267 '("^ ") 267 '("^ ")
268 "*List of regexps or functions matching buffer names to ignore. 268 "List of regexps or functions matching buffer names to ignore.
269For example, traditional behavior is not to list buffers whose names begin 269For example, traditional behavior is not to list buffers whose names begin
270with a space, for which the regexp is `^ '. See the source file for 270with a space, for which the regexp is `^ '. See the source file for
271example functions that filter buffer names." 271example functions that filter buffer names."
@@ -274,7 +274,7 @@ example functions that filter buffer names."
274(put 'iswitchb-buffer-ignore 'risky-local-variable t) 274(put 'iswitchb-buffer-ignore 'risky-local-variable t)
275 275
276(defcustom iswitchb-max-to-show nil 276(defcustom iswitchb-max-to-show nil
277 "*If non-nil, limit the number of names shown in the minibuffer. 277 "If non-nil, limit the number of names shown in the minibuffer.
278If this value is N, and N is greater than the number of matching 278If this value is N, and N is greater than the number of matching
279buffers, the first N/2 and the last N/2 matching buffers are 279buffers, the first N/2 and the last N/2 matching buffers are
280shown. This can greatly speed up iswitchb if you have a 280shown. This can greatly speed up iswitchb if you have a
@@ -283,7 +283,7 @@ multitude of buffers open."
283 :group 'iswitchb) 283 :group 'iswitchb)
284 284
285(defcustom iswitchb-use-virtual-buffers nil 285(defcustom iswitchb-use-virtual-buffers nil
286 "*If non-nil, refer to past buffers when none match. 286 "If non-nil, refer to past buffers when none match.
287This feature relies upon the `recentf' package, which will be 287This feature relies upon the `recentf' package, which will be
288enabled if this variable is configured to a non-nil value." 288enabled if this variable is configured to a non-nil value."
289 :type 'boolean 289 :type 'boolean
@@ -297,7 +297,7 @@ enabled if this variable is configured to a non-nil value."
297(defvar iswitchb-virtual-buffers nil) 297(defvar iswitchb-virtual-buffers nil)
298 298
299(defcustom iswitchb-cannot-complete-hook 'iswitchb-completion-help 299(defcustom iswitchb-cannot-complete-hook 'iswitchb-completion-help
300 "*Hook run when `iswitchb-complete' can't complete any more. 300 "Hook run when `iswitchb-complete' can't complete any more.
301The most useful values are `iswitchb-completion-help', which pops up a 301The most useful values are `iswitchb-completion-help', which pops up a
302window with completion alternatives, or `iswitchb-next-match' or 302window with completion alternatives, or `iswitchb-next-match' or
303`iswitchb-prev-match', which cycle the buffer list." 303`iswitchb-prev-match', which cycle the buffer list."
@@ -314,7 +314,7 @@ window with completion alternatives, or `iswitchb-next-match' or
314;;(setq iswitchb-buffer-ignore '("^ " "\\.c\\'" "\\.h\\'")) 314;;(setq iswitchb-buffer-ignore '("^ " "\\.c\\'" "\\.h\\'"))
315 315
316(defcustom iswitchb-default-method 'always-frame 316(defcustom iswitchb-default-method 'always-frame
317 "*How to switch to new buffer when using `iswitchb-buffer'. 317 "How to switch to new buffer when using `iswitchb-buffer'.
318Possible values: 318Possible values:
319`samewindow' Show new buffer in same window 319`samewindow' Show new buffer in same window
320`otherwindow' Show new buffer in another window (same frame) 320`otherwindow' Show new buffer in another window (same frame)
@@ -334,19 +334,19 @@ Possible values:
334 :group 'iswitchb) 334 :group 'iswitchb)
335 335
336(defcustom iswitchb-regexp nil 336(defcustom iswitchb-regexp nil
337 "*Non-nil means that `iswitchb' will do regexp matching. 337 "Non-nil means that `iswitchb' will do regexp matching.
338Value can be toggled within `iswitchb' using `iswitchb-toggle-regexp'." 338Value can be toggled within `iswitchb' using `iswitchb-toggle-regexp'."
339 :type 'boolean 339 :type 'boolean
340 :group 'iswitchb) 340 :group 'iswitchb)
341 341
342(defcustom iswitchb-newbuffer t 342(defcustom iswitchb-newbuffer t
343 "*Non-nil means create new buffer if no buffer matches substring. 343 "Non-nil means create new buffer if no buffer matches substring.
344See also `iswitchb-prompt-newbuffer'." 344See also `iswitchb-prompt-newbuffer'."
345 :type 'boolean 345 :type 'boolean
346 :group 'iswitchb) 346 :group 'iswitchb)
347 347
348(defcustom iswitchb-prompt-newbuffer t 348(defcustom iswitchb-prompt-newbuffer t
349 "*Non-nil means prompt user to confirm before creating new buffer. 349 "Non-nil means prompt user to confirm before creating new buffer.
350See also `iswitchb-newbuffer'." 350See also `iswitchb-newbuffer'."
351 :type 'boolean 351 :type 'boolean
352 :group 'iswitchb) 352 :group 'iswitchb)
@@ -354,12 +354,12 @@ See also `iswitchb-newbuffer'."
354(define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1") 354(define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1")
355 355
356(defcustom iswitchb-use-faces t 356(defcustom iswitchb-use-faces t
357 "*Non-nil means use font-lock faces for showing first match." 357 "Non-nil means use font-lock faces for showing first match."
358 :type 'boolean 358 :type 'boolean
359 :group 'iswitchb) 359 :group 'iswitchb)
360 360
361(defcustom iswitchb-use-frame-buffer-list nil 361(defcustom iswitchb-use-frame-buffer-list nil
362 "*Non-nil means use the currently selected frame's buffer list." 362 "Non-nil means use the currently selected frame's buffer list."
363 :type 'boolean 363 :type 'boolean
364 :group 'iswitchb) 364 :group 'iswitchb)
365 365
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 594fdba4628..3dc92aebb64 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -65,7 +65,7 @@ Preserves the `buffer-modified-p' state of the current buffer."
65 :group 'font-lock) 65 :group 'font-lock)
66 66
67(defcustom jit-lock-chunk-size 500 67(defcustom jit-lock-chunk-size 500
68 "*Jit-lock fontifies chunks of at most this many characters at a time. 68 "Jit-lock fontifies chunks of at most this many characters at a time.
69 69
70This variable controls both display-time and stealth fontification." 70This variable controls both display-time and stealth fontification."
71 :type 'integer 71 :type 'integer
@@ -73,7 +73,7 @@ This variable controls both display-time and stealth fontification."
73 73
74 74
75(defcustom jit-lock-stealth-time nil 75(defcustom jit-lock-stealth-time nil
76 "*Time in seconds to wait before beginning stealth fontification. 76 "Time in seconds to wait before beginning stealth fontification.
77Stealth fontification occurs if there is no input within this time. 77Stealth fontification occurs if there is no input within this time.
78If nil, stealth fontification is never performed. 78If nil, stealth fontification is never performed.
79 79
@@ -84,7 +84,7 @@ The value of this variable is used when JIT Lock mode is turned on."
84 84
85 85
86(defcustom jit-lock-stealth-nice 0.5 86(defcustom jit-lock-stealth-nice 0.5
87 "*Time in seconds to pause between chunks of stealth fontification. 87 "Time in seconds to pause between chunks of stealth fontification.
88Each iteration of stealth fontification is separated by this amount of time, 88Each iteration of stealth fontification is separated by this amount of time,
89thus reducing the demand that stealth fontification makes on the system. 89thus reducing the demand that stealth fontification makes on the system.
90If nil, means stealth fontification is never paused. 90If nil, means stealth fontification is never paused.
@@ -98,7 +98,7 @@ See also `jit-lock-stealth-load'."
98 98
99(defcustom jit-lock-stealth-load 99(defcustom jit-lock-stealth-load
100 (if (condition-case nil (load-average) (error)) 200) 100 (if (condition-case nil (load-average) (error)) 200)
101 "*Load in percentage above which stealth fontification is suspended. 101 "Load in percentage above which stealth fontification is suspended.
102Stealth fontification pauses when the system short-term load average (as 102Stealth fontification pauses when the system short-term load average (as
103returned by the function `load-average' if supported) goes above this level, 103returned by the function `load-average' if supported) goes above this level,
104thus reducing the demand that stealth fontification makes on the system. 104thus reducing the demand that stealth fontification makes on the system.
@@ -114,14 +114,14 @@ See also `jit-lock-stealth-nice'."
114 114
115 115
116(defcustom jit-lock-stealth-verbose nil 116(defcustom jit-lock-stealth-verbose nil
117 "*If non-nil, means stealth fontification should show status messages." 117 "If non-nil, means stealth fontification should show status messages."
118 :type 'boolean 118 :type 'boolean
119 :group 'jit-lock) 119 :group 'jit-lock)
120 120
121 121
122(defvaralias 'jit-lock-defer-contextually 'jit-lock-contextually) 122(defvaralias 'jit-lock-defer-contextually 'jit-lock-contextually)
123(defcustom jit-lock-contextually 'syntax-driven 123(defcustom jit-lock-contextually 'syntax-driven
124 "*If non-nil, means fontification should be syntactically true. 124 "If non-nil, means fontification should be syntactically true.
125If nil, means fontification occurs only on those lines modified. This 125If nil, means fontification occurs only on those lines modified. This
126means where modification on a line causes syntactic change on subsequent lines, 126means where modification on a line causes syntactic change on subsequent lines,
127those subsequent lines are not refontified to reflect their new context. 127those subsequent lines are not refontified to reflect their new context.
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index fe7adb92c1d..c04b38662c9 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -93,7 +93,7 @@
93(require 'jka-cmpr-hook) 93(require 'jka-cmpr-hook)
94 94
95(defcustom jka-compr-shell "sh" 95(defcustom jka-compr-shell "sh"
96 "*Shell to be used for calling compression programs. 96 "Shell to be used for calling compression programs.
97NOTE: Not used in MS-DOS and Windows systems." 97NOTE: Not used in MS-DOS and Windows systems."
98 :type 'string 98 :type 'string
99 :group 'jka-compr) 99 :group 'jka-compr)
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index d19f9841e23..093ec654cdd 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -95,14 +95,14 @@
95 :help "Search backwards through comment history for substring match of str"])) 95 :help "Search backwards through comment history for substring match of str"]))
96 96
97(defcustom log-edit-confirm 'changed 97(defcustom log-edit-confirm 'changed
98 "*If non-nil, `log-edit-done' will request confirmation. 98 "If non-nil, `log-edit-done' will request confirmation.
99If 'changed, only request confirmation if the list of files has 99If 'changed, only request confirmation if the list of files has
100 changed since the beginning of the log-edit session." 100 changed since the beginning of the log-edit session."
101 :group 'log-edit 101 :group 'log-edit
102 :type '(choice (const changed) (const t) (const nil))) 102 :type '(choice (const changed) (const t) (const nil)))
103 103
104(defcustom log-edit-keep-buffer nil 104(defcustom log-edit-keep-buffer nil
105 "*If non-nil, don't hide the buffer after `log-edit-done'." 105 "If non-nil, don't hide the buffer after `log-edit-done'."
106 :group 'log-edit 106 :group 'log-edit
107 :type 'boolean) 107 :type 'boolean)
108 108
@@ -113,20 +113,20 @@ If 'changed, only request confirmation if the list of files has
113 113
114(defcustom log-edit-require-final-newline 114(defcustom log-edit-require-final-newline
115 cvs-commit-buffer-require-final-newline 115 cvs-commit-buffer-require-final-newline
116 "*Enforce a newline at the end of commit log messages. 116 "Enforce a newline at the end of commit log messages.
117Enforce it silently if t, query if non-nil and don't do anything if nil." 117Enforce it silently if t, query if non-nil and don't do anything if nil."
118 :group 'log-edit 118 :group 'log-edit
119 :type '(choice (const ask) (const t) (const nil))) 119 :type '(choice (const ask) (const t) (const nil)))
120 120
121(defcustom log-edit-setup-invert nil 121(defcustom log-edit-setup-invert nil
122 "*Non-nil means `log-edit' should invert the meaning of its SETUP arg. 122 "Non-nil means `log-edit' should invert the meaning of its SETUP arg.
123If SETUP is 'force, this variable has no effect." 123If SETUP is 'force, this variable has no effect."
124 :group 'log-edit 124 :group 'log-edit
125 :type 'boolean) 125 :type 'boolean)
126 126
127(defcustom log-edit-hook '(log-edit-insert-cvs-template 127(defcustom log-edit-hook '(log-edit-insert-cvs-template
128 log-edit-insert-changelog) 128 log-edit-insert-changelog)
129 "*Hook run at the end of `log-edit'." 129 "Hook run at the end of `log-edit'."
130 :group 'log-edit 130 :group 'log-edit
131 :type '(hook :options (log-edit-insert-changelog 131 :type '(hook :options (log-edit-insert-changelog
132 log-edit-insert-cvs-rcstemplate 132 log-edit-insert-cvs-rcstemplate
@@ -134,12 +134,12 @@ If SETUP is 'force, this variable has no effect."
134 log-edit-insert-filenames))) 134 log-edit-insert-filenames)))
135 135
136(defcustom log-edit-mode-hook (if (boundp 'vc-log-mode-hook) vc-log-mode-hook) 136(defcustom log-edit-mode-hook (if (boundp 'vc-log-mode-hook) vc-log-mode-hook)
137 "*Hook run when entering `log-edit-mode'." 137 "Hook run when entering `log-edit-mode'."
138 :group 'log-edit 138 :group 'log-edit
139 :type 'hook) 139 :type 'hook)
140 140
141(defcustom log-edit-done-hook nil 141(defcustom log-edit-done-hook nil
142 "*Hook run before doing the actual commit. 142 "Hook run before doing the actual commit.
143This hook can be used to cleanup the message, enforce various 143This hook can be used to cleanup the message, enforce various
144conventions, or to allow recording the message in some other database, 144conventions, or to allow recording the message in some other database,
145such as a bug-tracking system. The list of files about to be committed 145such as a bug-tracking system. The list of files about to be committed
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 04b77a30a0e..882072eaa7c 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -46,7 +46,7 @@
46;;;###autoload 46;;;###autoload
47(defcustom printer-name 47(defcustom printer-name
48 (and (memq system-type '(emx ms-dos)) "PRN") 48 (and (memq system-type '(emx ms-dos)) "PRN")
49 "*The name of a local printer to which data is sent for printing. 49 "The name of a local printer to which data is sent for printing.
50\(Note that PostScript files are sent to `ps-printer-name', which see.\) 50\(Note that PostScript files are sent to `ps-printer-name', which see.\)
51 51
52On Unix-like systems, a string value should be a name understood by 52On Unix-like systems, a string value should be a name understood by
@@ -68,7 +68,7 @@ file. If you want to discard the printed output, set this to \"NUL\"."
68 68
69;;;###autoload 69;;;###autoload
70(defcustom lpr-switches nil 70(defcustom lpr-switches nil
71 "*List of strings to pass as extra options for the printer program. 71 "List of strings to pass as extra options for the printer program.
72It is recommended to set `printer-name' instead of including an explicit 72It is recommended to set `printer-name' instead of including an explicit
73switch on this list. 73switch on this list.
74See `lpr-command'." 74See `lpr-command'."
@@ -76,7 +76,7 @@ See `lpr-command'."
76 :group 'lpr) 76 :group 'lpr)
77 77
78(defcustom lpr-add-switches (memq system-type '(berkeley-unix gnu/linux)) 78(defcustom lpr-add-switches (memq system-type '(berkeley-unix gnu/linux))
79 "*Non-nil means construct `-T' and `-J' options for the printer program. 79 "Non-nil means construct `-T' and `-J' options for the printer program.
80These are made assuming that the program is `lpr'; 80These are made assuming that the program is `lpr';
81if you are using some other incompatible printer program, 81if you are using some other incompatible printer program,
82this variable should be nil." 82this variable should be nil."
@@ -87,7 +87,7 @@ this variable should be nil."
87 (if lpr-lp-system 87 (if lpr-lp-system
88 "-d " 88 "-d "
89 "-P") 89 "-P")
90 "*Printer switch, that is, something like \"-P\", \"-d \", \"/D:\", etc. 90 "Printer switch, that is, something like \"-P\", \"-d \", \"/D:\", etc.
91This switch is used in conjunction with `printer-name'." 91This switch is used in conjunction with `printer-name'."
92 :type '(choice :menu-tag "Printer Name Switch" 92 :type '(choice :menu-tag "Printer Name Switch"
93 :tag "Printer Name Switch" 93 :tag "Printer Name Switch"
@@ -104,7 +104,7 @@ This switch is used in conjunction with `printer-name'."
104 "lp") 104 "lp")
105 (t 105 (t
106 "lpr")) 106 "lpr"))
107 "*Name of program for printing a file. 107 "Name of program for printing a file.
108 108
109On MS-DOS and MS-Windows systems, if the value is an empty string then 109On MS-DOS and MS-Windows systems, if the value is an empty string then
110Emacs will write directly to the printer port named by `printer-name'. 110Emacs will write directly to the printer port named by `printer-name'.
@@ -119,7 +119,7 @@ argument."
119;; Default is nil, because that enables us to use pr -f 119;; Default is nil, because that enables us to use pr -f
120;; which is more reliable than pr with no args, which is what lpr -p does. 120;; which is more reliable than pr with no args, which is what lpr -p does.
121(defcustom lpr-headers-switches nil 121(defcustom lpr-headers-switches nil
122 "*List of strings of options to request page headings in the printer program. 122 "List of strings of options to request page headings in the printer program.
123If nil, we run `lpr-page-header-program' to make page headings 123If nil, we run `lpr-page-header-program' to make page headings
124and print the result." 124and print the result."
125 :type '(repeat (string :tag "Argument")) 125 :type '(repeat (string :tag "Argument"))
@@ -132,14 +132,14 @@ See definition of `print-region-1' for calling conventions."
132 :group 'lpr) 132 :group 'lpr)
133 133
134(defcustom lpr-page-header-program "pr" 134(defcustom lpr-page-header-program "pr"
135 "*Name of program for adding page headers to a file." 135 "Name of program for adding page headers to a file."
136 :type 'string 136 :type 'string
137 :group 'lpr) 137 :group 'lpr)
138 138
139;; Berkeley systems support -F, and GNU pr supports both -f and -F, 139;; Berkeley systems support -F, and GNU pr supports both -f and -F,
140;; So it looks like -F is a better default. 140;; So it looks like -F is a better default.
141(defcustom lpr-page-header-switches '("-h" "%s" "-F") 141(defcustom lpr-page-header-switches '("-h" "%s" "-F")
142 "*List of strings to use as options for the page-header-generating program. 142 "List of strings to use as options for the page-header-generating program.
143If `%s' appears in any of the strings, it is substituted by the page title. 143If `%s' appears in any of the strings, it is substituted by the page title.
144Note that for correct quoting, `%s' should normally be a separate element. 144Note that for correct quoting, `%s' should normally be a separate element.
145The variable `lpr-page-header-program' specifies the program to use." 145The variable `lpr-page-header-program' specifies the program to use."
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index feedce0790f..609c06baa15 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -76,7 +76,7 @@
76 '(hpux usg-unix-v unisoft-unix irix berkeley-unix)) 76 '(hpux usg-unix-v unisoft-unix irix berkeley-unix))
77 'UNIX)) ; very similar to GNU 77 'UNIX)) ; very similar to GNU
78 ;; Anything else defaults to nil, meaning GNU. 78 ;; Anything else defaults to nil, meaning GNU.
79 "*Platform to emulate: GNU (default), MacOS, MS-Windows, UNIX. 79 "Platform to emulate: GNU (default), MacOS, MS-Windows, UNIX.
80Corresponding value is one of the atoms: nil, MacOS, MS-Windows, UNIX. 80Corresponding value is one of the atoms: nil, MacOS, MS-Windows, UNIX.
81Sets default values for: `ls-lisp-ignore-case', `ls-lisp-dirs-first', 81Sets default values for: `ls-lisp-ignore-case', `ls-lisp-dirs-first',
82`ls-lisp-verbosity'. Need not match actual platform. Changing this 82`ls-lisp-verbosity'. Need not match actual platform. Changing this
@@ -91,12 +91,12 @@ option will have no effect until you restart Emacs."
91 ;; Name change for consistency with other option names. 91 ;; Name change for consistency with other option names.
92 (or (memq ls-lisp-emulation '(MS-Windows MacOS)) 92 (or (memq ls-lisp-emulation '(MS-Windows MacOS))
93 (and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case)) 93 (and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case))
94 "*Non-nil causes ls-lisp alphabetic sorting to ignore case." 94 "Non-nil causes ls-lisp alphabetic sorting to ignore case."
95 :type 'boolean 95 :type 'boolean
96 :group 'ls-lisp) 96 :group 'ls-lisp)
97 97
98(defcustom ls-lisp-dirs-first (eq ls-lisp-emulation 'MS-Windows) 98(defcustom ls-lisp-dirs-first (eq ls-lisp-emulation 'MS-Windows)
99 "*Non-nil causes ls-lisp to sort directories first in any ordering. 99 "Non-nil causes ls-lisp to sort directories first in any ordering.
100\(Or last if it is reversed.) Follows Microsoft Windows Explorer." 100\(Or last if it is reversed.) Follows Microsoft Windows Explorer."
101 ;; Functionality suggested by Chris McMahan <cmcmahan@one.net> 101 ;; Functionality suggested by Chris McMahan <cmcmahan@one.net>
102 :type 'boolean 102 :type 'boolean
@@ -109,7 +109,7 @@ option will have no effect until you restart Emacs."
109 '(links))) ; distinguish NT/2K from 9x 109 '(links))) ; distinguish NT/2K from 9x
110 ((eq ls-lisp-emulation 'UNIX) '(links uid)) ; UNIX ls 110 ((eq ls-lisp-emulation 'UNIX) '(links uid)) ; UNIX ls
111 (t '(links uid gid))) ; GNU ls 111 (t '(links uid gid))) ; GNU ls
112 "*A list of optional file attributes that ls-lisp should display. 112 "A list of optional file attributes that ls-lisp should display.
113It should contain none or more of the symbols: links, uid, gid. 113It should contain none or more of the symbols: links, uid, gid.
114A value of nil (or an empty list) means display none of them. 114A value of nil (or an empty list) means display none of them.
115 115
@@ -130,7 +130,7 @@ if emulation is GNU then default is `(links uid gid)'."
130 130
131(defcustom ls-lisp-use-insert-directory-program 131(defcustom ls-lisp-use-insert-directory-program
132 (not (memq system-type '(macos ms-dos windows-nt))) 132 (not (memq system-type '(macos ms-dos windows-nt)))
133 "*Non-nil causes ls-lisp to revert back to using `insert-directory-program'. 133 "Non-nil causes ls-lisp to revert back to using `insert-directory-program'.
134This is useful on platforms where ls-lisp is dumped into Emacs, such as 134This is useful on platforms where ls-lisp is dumped into Emacs, such as
135Microsoft Windows, but you would still like to use a program to list 135Microsoft Windows, but you would still like to use a program to list
136the contents of a directory." 136the contents of a directory."
@@ -140,7 +140,7 @@ the contents of a directory."
140;;; Autoloaded because it is let-bound in `recover-session', `mail-recover-1'. 140;;; Autoloaded because it is let-bound in `recover-session', `mail-recover-1'.
141;;;###autoload 141;;;###autoload
142(defcustom ls-lisp-support-shell-wildcards t 142(defcustom ls-lisp-support-shell-wildcards t
143 "*Non-nil means ls-lisp treats file patterns as shell wildcards. 143 "Non-nil means ls-lisp treats file patterns as shell wildcards.
144Otherwise they are treated as Emacs regexps (for backward compatibility)." 144Otherwise they are treated as Emacs regexps (for backward compatibility)."
145 :type 'boolean 145 :type 'boolean
146 :group 'ls-lisp) 146 :group 'ls-lisp)
@@ -148,7 +148,7 @@ Otherwise they are treated as Emacs regexps (for backward compatibility)."
148(defcustom ls-lisp-format-time-list 148(defcustom ls-lisp-format-time-list
149 '("%b %e %H:%M" 149 '("%b %e %H:%M"
150 "%b %e %Y") 150 "%b %e %Y")
151 "*List of `format-time-string' specs to display file time stamps. 151 "List of `format-time-string' specs to display file time stamps.
152These specs are used ONLY if a valid locale can not be determined. 152These specs are used ONLY if a valid locale can not be determined.
153 153
154If `ls-lisp-use-localized-time-format' is non-nil, these specs are used 154If `ls-lisp-use-localized-time-format' is non-nil, these specs are used
@@ -168,7 +168,7 @@ current year. The OLD-TIME-FORMAT is used for older files. To use ISO
168 :group 'ls-lisp) 168 :group 'ls-lisp)
169 169
170(defcustom ls-lisp-use-localized-time-format nil 170(defcustom ls-lisp-use-localized-time-format nil
171 "*Non-nil causes ls-lisp to use `ls-lisp-format-time-list' even if 171 "Non-nil causes ls-lisp to use `ls-lisp-format-time-list' even if
172a valid locale is specified. 172a valid locale is specified.
173 173
174WARNING: Using localized date/time format might cause Dired columns 174WARNING: Using localized date/time format might cause Dired columns
diff --git a/lisp/man.el b/lisp/man.el
index 5b77b0b12d6..967fe5172dc 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -108,7 +108,7 @@
108 108
109(defvar Man-notify) 109(defvar Man-notify)
110(defcustom Man-filter-list nil 110(defcustom Man-filter-list nil
111 "*Manpage cleaning filter command phrases. 111 "Manpage cleaning filter command phrases.
112This variable contains a list of the following form: 112This variable contains a list of the following form:
113 113
114'((command-string phrase-string*)*) 114'((command-string phrase-string*)*)
@@ -425,9 +425,9 @@ Otherwise, the value is whatever the function
425 'func nil 425 'func nil
426 'action #'Man-xref-button-action) 426 'action #'Man-xref-button-action)
427 427
428(defun Man-xref-button-action (button) 428(defun Man-xref-button-action (button)
429 (let ((target (button-get button 'Man-target-string))) 429 (let ((target (button-get button 'Man-target-string)))
430 (funcall 430 (funcall
431 (button-get button 'func) 431 (button-get button 'func)
432 (cond ((null target) 432 (cond ((null target)
433 (button-label button)) 433 (button-label button))
@@ -435,7 +435,7 @@ Otherwise, the value is whatever the function
435 (funcall target (button-start button))) 435 (funcall target (button-start button)))
436 (t target))))) 436 (t target)))))
437 437
438(define-button-type 'Man-xref-man-page 438(define-button-type 'Man-xref-man-page
439 :supertype 'Man-abstract-xref-man-page 439 :supertype 'Man-abstract-xref-man-page
440 'func 'man-follow) 440 'func 'man-follow)
441 441
@@ -1011,7 +1011,7 @@ default type, `Man-xref-man-page' is used for the buttons."
1011 (Man-highlight-references0 nil Man-apropos-regexp 1 1011 (Man-highlight-references0 nil Man-apropos-regexp 1
1012 'Man-default-man-entry 1012 'Man-default-man-entry
1013 (or xref-man-type 'Man-xref-man-page))) 1013 (or xref-man-type 'Man-xref-man-page)))
1014 (Man-highlight-references0 Man-see-also-regexp Man-reference-regexp 1 1014 (Man-highlight-references0 Man-see-also-regexp Man-reference-regexp 1
1015 'Man-default-man-entry 1015 'Man-default-man-entry
1016 (or xref-man-type 'Man-xref-man-page)) 1016 (or xref-man-type 'Man-xref-man-page))
1017 (Man-highlight-references0 Man-synopsis-regexp Man-header-regexp 0 2 1017 (Man-highlight-references0 Man-synopsis-regexp Man-header-regexp 0 2
@@ -1038,7 +1038,7 @@ default type, `Man-xref-man-page' is used for the buttons."
1038 (match-end button-pos) 1038 (match-end button-pos)
1039 'type type 1039 'type type
1040 'Man-target-string (cond 1040 'Man-target-string (cond
1041 ((numberp target) 1041 ((numberp target)
1042 (match-string target)) 1042 (match-string target))
1043 ((functionp target) 1043 ((functionp target)
1044 target) 1044 target)
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 28cea385a9f..45cc71753aa 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1590,7 +1590,7 @@ using `abort-recursive-edit'."
1590 (> count 1))) 1590 (> count 1)))
1591 1591
1592(defcustom yank-menu-length 20 1592(defcustom yank-menu-length 20
1593 "*Maximum length to display in the yank-menu." 1593 "Maximum length to display in the yank-menu."
1594 :type 'integer 1594 :type 'integer
1595 :group 'menu) 1595 :group 'menu)
1596 1596
@@ -1632,7 +1632,7 @@ The menu shows all the killed text sequences stored in `kill-ring'."
1632;;; Buffers Menu 1632;;; Buffers Menu
1633 1633
1634(defcustom buffers-menu-max-size 10 1634(defcustom buffers-menu-max-size 10
1635 "*Maximum number of entries which may appear on the Buffers menu. 1635 "Maximum number of entries which may appear on the Buffers menu.
1636If this is 10, then only the ten most-recently-selected buffers are shown. 1636If this is 10, then only the ten most-recently-selected buffers are shown.
1637If this is nil, then all buffers are shown. 1637If this is nil, then all buffers are shown.
1638A large number or nil slows down menu responsiveness." 1638A large number or nil slows down menu responsiveness."
@@ -1641,7 +1641,7 @@ A large number or nil slows down menu responsiveness."
1641 :group 'menu) 1641 :group 'menu)
1642 1642
1643(defcustom buffers-menu-buffer-name-length 30 1643(defcustom buffers-menu-buffer-name-length 30
1644 "*Maximum length of the buffer name on the Buffers menu. 1644 "Maximum length of the buffer name on the Buffers menu.
1645If this is a number, then buffer names are truncated to this length. 1645If this is a number, then buffer names are truncated to this length.
1646If this is nil, then buffer names are shown in full. 1646If this is nil, then buffer names are shown in full.
1647A large number or nil makes the menu too wide." 1647A large number or nil makes the menu too wide."
diff --git a/lisp/midnight.el b/lisp/midnight.el
index c6d17a76653..b4bd6c788ce 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -53,7 +53,7 @@ Use `cancel-timer' to stop it and `midnight-delay-set' to change
53the time when it is run.") 53the time when it is run.")
54 54
55(defcustom midnight-mode nil 55(defcustom midnight-mode nil
56 "*Non-nil means run `midnight-hook' at midnight. 56 "Non-nil means run `midnight-hook' at midnight.
57Setting this variable outside customize has no effect; 57Setting this variable outside customize has no effect;
58call `cancel-timer' or `timer-activate' on `midnight-timer' instead." 58call `cancel-timer' or `timer-activate' on `midnight-timer' instead."
59 :type 'boolean 59 :type 'boolean
@@ -81,7 +81,7 @@ call `cancel-timer' or `timer-activate' on `midnight-timer' instead."
81;;; clean-buffer-list stuff 81;;; clean-buffer-list stuff
82 82
83(defcustom clean-buffer-list-delay-general 3 83(defcustom clean-buffer-list-delay-general 3
84 "*The number of days before any buffer becomes eligible for autokilling. 84 "The number of days before any buffer becomes eligible for autokilling.
85The autokilling is done by `clean-buffer-list' when is it in `midnight-hook'. 85The autokilling is done by `clean-buffer-list' when is it in `midnight-hook'.
86Currently displayed and/or modified (unsaved) buffers, as well as buffers 86Currently displayed and/or modified (unsaved) buffers, as well as buffers
87matching `clean-buffer-list-kill-never-buffer-names' and 87matching `clean-buffer-list-kill-never-buffer-names' and
@@ -90,7 +90,7 @@ matching `clean-buffer-list-kill-never-buffer-names' and
90 :group 'midnight) 90 :group 'midnight)
91 91
92(defcustom clean-buffer-list-delay-special 3600 92(defcustom clean-buffer-list-delay-special 3600
93 "*The number of seconds before some buffers become eligible for autokilling. 93 "The number of seconds before some buffers become eligible for autokilling.
94Buffers matched by `clean-buffer-list-kill-regexps' and 94Buffers matched by `clean-buffer-list-kill-regexps' and
95`clean-buffer-list-kill-buffer-names' are killed if they were last 95`clean-buffer-list-kill-buffer-names' are killed if they were last
96displayed more than this many seconds ago." 96displayed more than this many seconds ago."
@@ -98,7 +98,7 @@ displayed more than this many seconds ago."
98 :group 'midnight) 98 :group 'midnight)
99 99
100(defcustom clean-buffer-list-kill-regexps nil 100(defcustom clean-buffer-list-kill-regexps nil
101 "*List of regexps saying which buffers will be killed at midnight. 101 "List of regexps saying which buffers will be killed at midnight.
102If buffer name matches a regexp in the list and the buffer was not displayed 102If buffer name matches a regexp in the list and the buffer was not displayed
103in the last `clean-buffer-list-delay-special' seconds, it is killed by 103in the last `clean-buffer-list-delay-special' seconds, it is killed by
104`clean-buffer-list' when is it in `midnight-hook'. 104`clean-buffer-list' when is it in `midnight-hook'.
@@ -113,7 +113,7 @@ See also `clean-buffer-list-kill-buffer-names',
113(defcustom clean-buffer-list-kill-buffer-names 113(defcustom clean-buffer-list-kill-buffer-names
114 '("*Help*" "*Apropos*" "*Man " "*Buffer List*" "*Compile-Log*" "*info*" 114 '("*Help*" "*Apropos*" "*Man " "*Buffer List*" "*Compile-Log*" "*info*"
115 "*vc*" "*vc-diff*" "*diff*") 115 "*vc*" "*vc-diff*" "*diff*")
116 "*List of strings saying which buffers will be killed at midnight. 116 "List of strings saying which buffers will be killed at midnight.
117Buffers with names in this list, which were not displayed in the last 117Buffers with names in this list, which were not displayed in the last
118`clean-buffer-list-delay-special' seconds, are killed by `clean-buffer-list' 118`clean-buffer-list-delay-special' seconds, are killed by `clean-buffer-list'
119when is it in `midnight-hook'. 119when is it in `midnight-hook'.
@@ -127,7 +127,7 @@ See also `clean-buffer-list-kill-regexps',
127 127
128(defcustom clean-buffer-list-kill-never-buffer-names 128(defcustom clean-buffer-list-kill-never-buffer-names
129 '("*scratch*" "*Messages*" "*server*") 129 '("*scratch*" "*Messages*" "*server*")
130 "*List of buffer names which will never be killed by `clean-buffer-list'. 130 "List of buffer names which will never be killed by `clean-buffer-list'.
131See also `clean-buffer-list-kill-never-regexps'. 131See also `clean-buffer-list-kill-never-regexps'.
132Note that this does override `clean-buffer-list-kill-regexps' and 132Note that this does override `clean-buffer-list-kill-regexps' and
133`clean-buffer-list-kill-buffer-names' so a buffer matching any of these 133`clean-buffer-list-kill-buffer-names' so a buffer matching any of these
@@ -136,7 +136,7 @@ two lists will NOT be killed if it is also present in this list."
136 :group 'midnight) 136 :group 'midnight)
137 137
138(defcustom clean-buffer-list-kill-never-regexps '("^ \\*Minibuf-.*\\*$") 138(defcustom clean-buffer-list-kill-never-regexps '("^ \\*Minibuf-.*\\*$")
139 "*List of regexp saying which buffers will never be killed at midnight. 139 "List of regexp saying which buffers will never be killed at midnight.
140See also `clean-buffer-list-kill-never-buffer-names'. 140See also `clean-buffer-list-kill-never-buffer-names'.
141Killing is done by `clean-buffer-list'. 141Killing is done by `clean-buffer-list'.
142Note that this does override `clean-buffer-list-kill-regexps' and 142Note that this does override `clean-buffer-list-kill-regexps' and
@@ -222,7 +222,7 @@ to its second argument TM."
222 midnight-period 'run-hooks 'midnight-hook))) 222 midnight-period 'run-hooks 'midnight-hook)))
223 223
224(defcustom midnight-delay 3600 224(defcustom midnight-delay 3600
225 "*The number of seconds after the midnight when the `midnight-timer' is run. 225 "The number of seconds after the midnight when the `midnight-timer' is run.
226You should set this variable before loading midnight.el, or 226You should set this variable before loading midnight.el, or
227set it by calling `midnight-delay-set', or use `custom'. 227set it by calling `midnight-delay-set', or use `custom'.
228If you wish, you can use a string instead, it will be passed as the 228If you wish, you can use a string instead, it will be passed as the
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 49915026874..4514fc3bf61 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -150,7 +150,7 @@
150 :group 'mouse) 150 :group 'mouse)
151 151
152(defcustom mouse-sel-leave-point-near-mouse t 152(defcustom mouse-sel-leave-point-near-mouse t
153 "*Leave point near last mouse position. 153 "Leave point near last mouse position.
154If non-nil, \\[mouse-select] and \\[mouse-extend] will leave point at the end 154If non-nil, \\[mouse-select] and \\[mouse-extend] will leave point at the end
155of the region nearest to where the mouse last was. 155of the region nearest to where the mouse last was.
156If nil, point will always be placed at the beginning of the region." 156If nil, point will always be placed at the beginning of the region."
@@ -158,12 +158,12 @@ If nil, point will always be placed at the beginning of the region."
158 :group 'mouse-sel) 158 :group 'mouse-sel)
159 159
160(defcustom mouse-sel-cycle-clicks t 160(defcustom mouse-sel-cycle-clicks t
161 "*If non-nil, \\[mouse-select] cycles the click-counts after 4 clicks." 161 "If non-nil, \\[mouse-select] cycles the click-counts after 4 clicks."
162 :type 'boolean 162 :type 'boolean
163 :group 'mouse-sel) 163 :group 'mouse-sel)
164 164
165(defcustom mouse-sel-default-bindings t 165(defcustom mouse-sel-default-bindings t
166 "*Control mouse bindings." 166 "Control mouse bindings."
167 :type '(choice (const :tag "none" nil) 167 :type '(choice (const :tag "none" nil)
168 (const :tag "cut and paste" interprogram-cut-paste) 168 (const :tag "cut and paste" interprogram-cut-paste)
169 (other :tag "default bindings" t)) 169 (other :tag "default bindings" t))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 37879bc1e1f..28fde430b15 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -37,12 +37,12 @@
37(put 'track-mouse 'lisp-indent-function 0) 37(put 'track-mouse 'lisp-indent-function 0)
38 38
39(defcustom mouse-yank-at-point nil 39(defcustom mouse-yank-at-point nil
40 "*If non-nil, mouse yank commands yank at point instead of at click." 40 "If non-nil, mouse yank commands yank at point instead of at click."
41 :type 'boolean 41 :type 'boolean
42 :group 'mouse) 42 :group 'mouse)
43 43
44(defcustom mouse-drag-copy-region t 44(defcustom mouse-drag-copy-region t
45 "*If non-nil, mouse drag copies region to kill-ring." 45 "If non-nil, mouse drag copies region to kill-ring."
46 :type 'boolean 46 :type 'boolean
47 :version "22.1" 47 :version "22.1"
48 :group 'mouse) 48 :group 'mouse)
@@ -81,7 +81,7 @@ packages. See `mouse-on-link-p' for details."
81 :group 'mouse) 81 :group 'mouse)
82 82
83(defcustom mouse-1-click-in-non-selected-windows t 83(defcustom mouse-1-click-in-non-selected-windows t
84 "*If non-nil, a Mouse-1 click also follows links in non-selected windows. 84 "If non-nil, a Mouse-1 click also follows links in non-selected windows.
85 85
86If nil, a Mouse-1 click on a link in a non-selected window performs 86If nil, a Mouse-1 click on a link in a non-selected window performs
87the normal mouse-1 binding, typically selects the window and sets 87the normal mouse-1 binding, typically selects the window and sets
@@ -699,7 +699,7 @@ This should be bound to a mouse drag event."
699 (setq mouse-last-region-tick (buffer-modified-tick))) 699 (setq mouse-last-region-tick (buffer-modified-tick)))
700 700
701(defcustom mouse-scroll-delay 0.25 701(defcustom mouse-scroll-delay 0.25
702 "*The pause between scroll steps caused by mouse drags, in seconds. 702 "The pause between scroll steps caused by mouse drags, in seconds.
703If you drag the mouse beyond the edge of a window, Emacs scrolls the 703If you drag the mouse beyond the edge of a window, Emacs scrolls the
704window to bring the text beyond that edge into view, with a delay of 704window to bring the text beyond that edge into view, with a delay of
705this many seconds between scroll steps. Scrolling stops when you move 705this many seconds between scroll steps. Scrolling stops when you move
@@ -710,7 +710,7 @@ Setting this to zero causes Emacs to scroll as fast as it can."
710 :group 'mouse) 710 :group 'mouse)
711 711
712(defcustom mouse-scroll-min-lines 1 712(defcustom mouse-scroll-min-lines 1
713 "*The minimum number of lines scrolled by dragging mouse out of window. 713 "The minimum number of lines scrolled by dragging mouse out of window.
714Moving the mouse out the top or bottom edge of the window begins 714Moving the mouse out the top or bottom edge of the window begins
715scrolling repeatedly. The number of lines scrolled per repetition 715scrolling repeatedly. The number of lines scrolled per repetition
716is normally equal to the number of lines beyond the window edge that 716is normally equal to the number of lines beyond the window edge that
@@ -1799,14 +1799,14 @@ again. If you do this twice in the same position, it kills the selection."
1799 (overlay-end mouse-secondary-overlay))))))) 1799 (overlay-end mouse-secondary-overlay)))))))
1800 1800
1801(defcustom mouse-buffer-menu-maxlen 20 1801(defcustom mouse-buffer-menu-maxlen 20
1802 "*Number of buffers in one pane (submenu) of the buffer menu. 1802 "Number of buffers in one pane (submenu) of the buffer menu.
1803If we have lots of buffers, divide them into groups of 1803If we have lots of buffers, divide them into groups of
1804`mouse-buffer-menu-maxlen' and make a pane (or submenu) for each one." 1804`mouse-buffer-menu-maxlen' and make a pane (or submenu) for each one."
1805 :type 'integer 1805 :type 'integer
1806 :group 'mouse) 1806 :group 'mouse)
1807 1807
1808(defcustom mouse-buffer-menu-mode-mult 4 1808(defcustom mouse-buffer-menu-mode-mult 4
1809 "*Group the buffers by the major mode groups on \\[mouse-buffer-menu]? 1809 "Group the buffers by the major mode groups on \\[mouse-buffer-menu]?
1810This number which determines (in a hairy way) whether \\[mouse-buffer-menu] 1810This number which determines (in a hairy way) whether \\[mouse-buffer-menu]
1811will split the buffer menu by the major modes (see 1811will split the buffer menu by the major modes (see
1812`mouse-buffer-menu-mode-groups') or just by menu length. 1812`mouse-buffer-menu-mode-groups') or just by menu length.
diff --git a/lisp/msb.el b/lisp/msb.el
index 910d39db177..9aacf577433 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -206,7 +206,7 @@
206 (msb-menu-bar-update-buffers t))) 206 (msb-menu-bar-update-buffers t)))
207 207
208(defcustom msb-menu-cond msb--very-many-menus 208(defcustom msb-menu-cond msb--very-many-menus
209 "*List of criteria for splitting the mouse buffer menu. 209 "List of criteria for splitting the mouse buffer menu.
210The elements in the list should be of this type: 210The elements in the list should be of this type:
211 (CONDITION MENU-SORT-KEY MENU-TITLE ITEM-HANDLING-FN ITEM-SORT-FN). 211 (CONDITION MENU-SORT-KEY MENU-TITLE ITEM-HANDLING-FN ITEM-SORT-FN).
212 212
@@ -264,7 +264,7 @@ error every time you do \\[msb]."
264 :version "20.3") 264 :version "20.3")
265 265
266(defcustom msb-separator-diff 100 266(defcustom msb-separator-diff 100
267 "*Non-nil means use separators. 267 "Non-nil means use separators.
268The separators will appear between all menus that have a sorting key 268The separators will appear between all menus that have a sorting key
269that differs by this value or more." 269that differs by this value or more."
270 :type '(choice integer (const nil)) 270 :type '(choice integer (const nil))
@@ -275,7 +275,7 @@ that differs by this value or more."
275 "*The sort key for files sorted by directory.") 275 "*The sort key for files sorted by directory.")
276 276
277(defcustom msb-max-menu-items 15 277(defcustom msb-max-menu-items 15
278 "*The maximum number of items in a menu. 278 "The maximum number of items in a menu.
279If this variable is set to 15 for instance, then the submenu will be 279If this variable is set to 15 for instance, then the submenu will be
280split up in minor parts, 15 items each. A value of nil means no limit." 280split up in minor parts, 15 items each. A value of nil means no limit."
281 :type '(choice integer (const nil)) 281 :type '(choice integer (const nil))
@@ -283,7 +283,7 @@ split up in minor parts, 15 items each. A value of nil means no limit."
283 :group 'msb) 283 :group 'msb)
284 284
285(defcustom msb-max-file-menu-items 10 285(defcustom msb-max-file-menu-items 10
286 "*The maximum number of items from different directories. 286 "The maximum number of items from different directories.
287 287
288When the menu is of type `file by directory', this is the maximum 288When the menu is of type `file by directory', this is the maximum
289number of buffers that are clumped together from different 289number of buffers that are clumped together from different
@@ -298,20 +298,20 @@ If the value is not a number, then the value 10 is used."
298 :group 'msb) 298 :group 'msb)
299 299
300(defcustom msb-most-recently-used-sort-key -1010 300(defcustom msb-most-recently-used-sort-key -1010
301 "*Where should the menu with the most recently used buffers be placed?" 301 "Where should the menu with the most recently used buffers be placed?"
302 :type 'integer 302 :type 'integer
303 :set 'msb-custom-set 303 :set 'msb-custom-set
304 :group 'msb) 304 :group 'msb)
305 305
306(defcustom msb-display-most-recently-used 15 306(defcustom msb-display-most-recently-used 15
307 "*How many buffers should be in the most-recently-used menu. 307 "How many buffers should be in the most-recently-used menu.
308No buffers at all if less than 1 or nil (or any non-number)." 308No buffers at all if less than 1 or nil (or any non-number)."
309 :type 'integer 309 :type 'integer
310 :set 'msb-custom-set 310 :set 'msb-custom-set
311 :group 'msb) 311 :group 'msb)
312 312
313(defcustom msb-most-recently-used-title "Most recently used (%d)" 313(defcustom msb-most-recently-used-title "Most recently used (%d)"
314 "*The title for the most-recently-used menu." 314 "The title for the most-recently-used menu."
315 :type 'string 315 :type 'string
316 :set 'msb-custom-set 316 :set 'msb-custom-set
317 :group 'msb) 317 :group 'msb)
@@ -320,7 +320,7 @@ No buffers at all if less than 1 or nil (or any non-number)."
320 "*Function that specifies how many pixels to shift the top menu leftwards.") 320 "*Function that specifies how many pixels to shift the top menu leftwards.")
321 321
322(defcustom msb-display-invisible-buffers-p nil 322(defcustom msb-display-invisible-buffers-p nil
323 "*Show invisible buffers or not. 323 "Show invisible buffers or not.
324Non-nil means that the buffer menu should include buffers that have 324Non-nil means that the buffer menu should include buffers that have
325names that starts with a space character." 325names that starts with a space character."
326 :type 'boolean 326 :type 'boolean
@@ -342,7 +342,7 @@ nil as ITEM-HANDLING-FUNCTION. See `msb-menu-cond' for more
342information.") 342information.")
343 343
344(defcustom msb-item-sort-function 'msb-sort-by-name 344(defcustom msb-item-sort-function 'msb-sort-by-name
345 "*The order of items in a buffer menu. 345 "The order of items in a buffer menu.
346 346
347The default function to call for handling the order of items in a menu 347The default function to call for handling the order of items in a menu
348item. This function is called like a sort function. The items look 348item. This function is called like a sort function. The items look
@@ -359,7 +359,7 @@ Set this to nil or t if you don't want any sorting (faster)."
359 :group 'msb) 359 :group 'msb)
360 360
361(defcustom msb-files-by-directory nil 361(defcustom msb-files-by-directory nil
362 "*Non-nil means that files should be sorted by directory. 362 "Non-nil means that files should be sorted by directory.
363This is instead of the groups in `msb-menu-cond'." 363This is instead of the groups in `msb-menu-cond'."
364 :type 'boolean 364 :type 'boolean
365 :set 'msb-custom-set 365 :set 'msb-custom-set
diff --git a/lisp/outline.el b/lisp/outline.el
index e350cbd55ae..37913d85953 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -347,7 +347,7 @@ Turning on outline mode calls the value of `text-mode-hook' and then of
347 (add-hook 'change-major-mode-hook 'show-all nil t)) 347 (add-hook 'change-major-mode-hook 'show-all nil t))
348 348
349(defcustom outline-minor-mode-prefix "\C-c@" 349(defcustom outline-minor-mode-prefix "\C-c@"
350 "*Prefix key to use for Outline commands in Outline minor mode. 350 "Prefix key to use for Outline commands in Outline minor mode.
351The value of this variable is checked as part of loading Outline mode. 351The value of this variable is checked as part of loading Outline mode.
352After that, changing the prefix key requires manipulating keymaps." 352After that, changing the prefix key requires manipulating keymaps."
353 :type 'string 353 :type 'string
diff --git a/lisp/paren.el b/lisp/paren.el
index c2f9775f7ce..8c9adbe12c8 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -44,7 +44,7 @@
44(defvar show-paren-overlay-1 nil) 44(defvar show-paren-overlay-1 nil)
45 45
46(defcustom show-paren-style 'parenthesis 46(defcustom show-paren-style 'parenthesis
47 "*Style used when showing a matching paren. 47 "Style used when showing a matching paren.
48Valid styles are `parenthesis' (meaning show the matching paren), 48Valid styles are `parenthesis' (meaning show the matching paren),
49`expression' (meaning show the entire expression enclosed by the paren) and 49`expression' (meaning show the entire expression enclosed by the paren) and
50`mixed' (meaning show the matching paren if it is visible, and the expression 50`mixed' (meaning show the matching paren if it is visible, and the expression
@@ -54,18 +54,18 @@ otherwise)."
54 54
55(defcustom show-paren-delay 55(defcustom show-paren-delay
56 (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1) 56 (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1)
57 "*Time in seconds to delay before showing a matching paren." 57 "Time in seconds to delay before showing a matching paren."
58 :type '(number :tag "seconds") 58 :type '(number :tag "seconds")
59 :group 'paren-showing) 59 :group 'paren-showing)
60 60
61(defcustom show-paren-priority 1000 61(defcustom show-paren-priority 1000
62 "*Priority of paren highlighting overlays." 62 "Priority of paren highlighting overlays."
63 :type 'integer 63 :type 'integer
64 :group 'paren-showing 64 :group 'paren-showing
65 :version "21.1") 65 :version "21.1")
66 66
67(defcustom show-paren-ring-bell-on-mismatch nil 67(defcustom show-paren-ring-bell-on-mismatch nil
68 "*If non-nil, beep if mismatched paren is detected." 68 "If non-nil, beep if mismatched paren is detected."
69 :type 'boolean 69 :type 'boolean
70 :group 'paren-showing 70 :group 'paren-showing
71 :version "20.3") 71 :version "20.3")
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 06866875cd1..561ef26fad2 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -38,7 +38,7 @@
38;; User Variables: 38;; User Variables:
39 39
40(defcustom pcmpl-cvs-binary (or (executable-find "cvs") "cvs") 40(defcustom pcmpl-cvs-binary (or (executable-find "cvs") "cvs")
41 "*The full path of the 'cvs' binary." 41 "The full path of the 'cvs' binary."
42 :type 'file 42 :type 'file
43 :group 'pcmpl-cvs) 43 :group 'pcmpl-cvs)
44 44
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index d49624804f9..6e9fda0aebd 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -35,7 +35,7 @@
35 35
36(defcustom pcmpl-gnu-makefile-regexps 36(defcustom pcmpl-gnu-makefile-regexps
37 '("\\`GNUmakefile" "\\`Makefile" "\\.mak\\'") 37 '("\\`GNUmakefile" "\\`Makefile" "\\.mak\\'")
38 "*A list of regexps that will match Makefile names." 38 "A list of regexps that will match Makefile names."
39 :type '(repeat regexp) 39 :type '(repeat regexp)
40 :group 'pcmpl-gnu) 40 :group 'pcmpl-gnu)
41 41
@@ -128,7 +128,7 @@
128 128
129(defcustom pcmpl-gnu-tarfile-regexp 129(defcustom pcmpl-gnu-tarfile-regexp
130 "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'" 130 "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
131 "*A regexp which matches any tar archive." 131 "A regexp which matches any tar archive."
132 :type 'regexp 132 :type 'regexp
133 :group 'pcmpl-gnu) 133 :group 'pcmpl-gnu)
134 134
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 3cda0fea436..808c029b44c 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -128,33 +128,33 @@
128;;; User Variables: 128;;; User Variables:
129 129
130(defcustom pcomplete-file-ignore nil 130(defcustom pcomplete-file-ignore nil
131 "*A regexp of filenames to be disregarded during file completion." 131 "A regexp of filenames to be disregarded during file completion."
132 :type '(choice regexp (const :tag "None" nil)) 132 :type '(choice regexp (const :tag "None" nil))
133 :group 'pcomplete) 133 :group 'pcomplete)
134 134
135(defcustom pcomplete-dir-ignore nil 135(defcustom pcomplete-dir-ignore nil
136 "*A regexp of names to be disregarded during directory completion." 136 "A regexp of names to be disregarded during directory completion."
137 :type '(choice regexp (const :tag "None" nil)) 137 :type '(choice regexp (const :tag "None" nil))
138 :group 'pcomplete) 138 :group 'pcomplete)
139 139
140(defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt cygwin)) 140(defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt cygwin))
141 "*If non-nil, ignore case when doing filename completion." 141 "If non-nil, ignore case when doing filename completion."
142 :type 'boolean 142 :type 'boolean
143 :group 'pcomplete) 143 :group 'pcomplete)
144 144
145(defcustom pcomplete-autolist nil 145(defcustom pcomplete-autolist nil
146 "*If non-nil, automatically list possibilities on partial completion. 146 "If non-nil, automatically list possibilities on partial completion.
147This mirrors the optional behavior of tcsh." 147This mirrors the optional behavior of tcsh."
148 :type 'boolean 148 :type 'boolean
149 :group 'pcomplete) 149 :group 'pcomplete)
150 150
151(defcustom pcomplete-suffix-list (list ?/ ?:) 151(defcustom pcomplete-suffix-list (list ?/ ?:)
152 "*A list of characters which constitute a proper suffix." 152 "A list of characters which constitute a proper suffix."
153 :type '(repeat character) 153 :type '(repeat character)
154 :group 'pcomplete) 154 :group 'pcomplete)
155 155
156(defcustom pcomplete-recexact nil 156(defcustom pcomplete-recexact nil
157 "*If non-nil, use shortest completion if characters cannot be added. 157 "If non-nil, use shortest completion if characters cannot be added.
158This mirrors the optional behavior of tcsh. 158This mirrors the optional behavior of tcsh.
159 159
160A non-nil value is useful if `pcomplete-autolist' is non-nil too." 160A non-nil value is useful if `pcomplete-autolist' is non-nil too."
@@ -162,13 +162,13 @@ A non-nil value is useful if `pcomplete-autolist' is non-nil too."
162 :group 'pcomplete) 162 :group 'pcomplete)
163 163
164(defcustom pcomplete-arg-quote-list nil 164(defcustom pcomplete-arg-quote-list nil
165 "*List of characters to quote when completing an argument." 165 "List of characters to quote when completing an argument."
166 :type '(choice (repeat character) 166 :type '(choice (repeat character)
167 (const :tag "Don't quote" nil)) 167 (const :tag "Don't quote" nil))
168 :group 'pcomplete) 168 :group 'pcomplete)
169 169
170(defcustom pcomplete-quote-arg-hook nil 170(defcustom pcomplete-quote-arg-hook nil
171 "*A hook which is run to quote a character within a filename. 171 "A hook which is run to quote a character within a filename.
172Each function is passed both the filename to be quoted, and the index 172Each function is passed both the filename to be quoted, and the index
173to be considered. If the function wishes to provide an alternate 173to be considered. If the function wishes to provide an alternate
174quoted form, it need only return the replacement string. If no 174quoted form, it need only return the replacement string. If no
@@ -179,13 +179,13 @@ using a backslash to quote any character which is a member of
179 :group 'pcomplete) 179 :group 'pcomplete)
180 180
181(defcustom pcomplete-man-function 'man 181(defcustom pcomplete-man-function 'man
182 "*A function to that will be called to display a manual page. 182 "A function to that will be called to display a manual page.
183It will be passed the name of the command to document." 183It will be passed the name of the command to document."
184 :type 'function 184 :type 'function
185 :group 'pcomplete) 185 :group 'pcomplete)
186 186
187(defcustom pcomplete-compare-entry-function 'string-lessp 187(defcustom pcomplete-compare-entry-function 'string-lessp
188 "*This function is used to order file entries for completion. 188 "This function is used to order file entries for completion.
189The behavior of most all shells is to sort alphabetically." 189The behavior of most all shells is to sort alphabetically."
190 :type '(radio (function-item string-lessp) 190 :type '(radio (function-item string-lessp)
191 (function-item file-newer-than-file-p) 191 (function-item file-newer-than-file-p)
@@ -193,7 +193,7 @@ The behavior of most all shells is to sort alphabetically."
193 :group 'pcomplete) 193 :group 'pcomplete)
194 194
195(defcustom pcomplete-help nil 195(defcustom pcomplete-help nil
196 "*A string or function (or nil) used for context-sensitive help. 196 "A string or function (or nil) used for context-sensitive help.
197If a string, it should name an Info node that will be jumped to. 197If a string, it should name an Info node that will be jumped to.
198If non-nil, it must a sexp that will be evaluated, and whose 198If non-nil, it must a sexp that will be evaluated, and whose
199result will be shown in the minibuffer. 199result will be shown in the minibuffer.
@@ -203,7 +203,7 @@ current command argument."
203 :group 'pcomplete) 203 :group 'pcomplete)
204 204
205(defcustom pcomplete-expand-before-complete nil 205(defcustom pcomplete-expand-before-complete nil
206 "*If non-nil, expand the current argument before completing it. 206 "If non-nil, expand the current argument before completing it.
207This means that typing something such as '$HOME/bi' followed by 207This means that typing something such as '$HOME/bi' followed by
208\\[pcomplete-argument] will cause the variable reference to be 208\\[pcomplete-argument] will cause the variable reference to be
209resolved first, and the resultant value that will be completed against 209resolved first, and the resultant value that will be completed against
@@ -215,7 +215,7 @@ and how is entirely up to the behavior of the
215 215
216(defcustom pcomplete-parse-arguments-function 216(defcustom pcomplete-parse-arguments-function
217 'pcomplete-parse-buffer-arguments 217 'pcomplete-parse-buffer-arguments
218 "*A function to call to parse the current line's arguments. 218 "A function to call to parse the current line's arguments.
219It should be called with no parameters, and with point at the position 219It should be called with no parameters, and with point at the position
220of the argument that is to be completed. 220of the argument that is to be completed.
221 221
@@ -233,7 +233,7 @@ the textual representation of the argument."
233 :group 'pcomplete) 233 :group 'pcomplete)
234 234
235(defcustom pcomplete-cycle-completions t 235(defcustom pcomplete-cycle-completions t
236 "*If non-nil, hitting the TAB key cycles through the completion list. 236 "If non-nil, hitting the TAB key cycles through the completion list.
237Typical Emacs behavior is to complete as much as possible, then pause 237Typical Emacs behavior is to complete as much as possible, then pause
238waiting for further input. Then if TAB is hit again, show a list of 238waiting for further input. Then if TAB is hit again, show a list of
239possible completions. When `pcomplete-cycle-completions' is non-nil, 239possible completions. When `pcomplete-cycle-completions' is non-nil,
@@ -245,7 +245,7 @@ the list of possible completions."
245 :group 'pcomplete) 245 :group 'pcomplete)
246 246
247(defcustom pcomplete-cycle-cutoff-length 5 247(defcustom pcomplete-cycle-cutoff-length 5
248 "*If the number of completions is greater than this, don't cycle. 248 "If the number of completions is greater than this, don't cycle.
249This variable is a compromise between the traditional Emacs style of 249This variable is a compromise between the traditional Emacs style of
250completion, and the \"cycling\" style. Basically, if there are more 250completion, and the \"cycling\" style. Basically, if there are more
251than this number of completions possible, don't automatically pick the 251than this number of completions possible, don't automatically pick the
@@ -261,7 +261,7 @@ cycling to always be enabled."
261 :group 'pcomplete) 261 :group 'pcomplete)
262 262
263(defcustom pcomplete-restore-window-delay 1 263(defcustom pcomplete-restore-window-delay 1
264 "*The number of seconds to wait before restoring completion windows. 264 "The number of seconds to wait before restoring completion windows.
265Once the completion window has been displayed, if the user then goes 265Once the completion window has been displayed, if the user then goes
266on to type something else, that completion window will be removed from 266on to type something else, that completion window will be removed from
267the display (actually, the original window configuration before it was 267the display (actually, the original window configuration before it was
@@ -273,7 +273,7 @@ after the user enters a key other than TAB."
273 :group 'pcomplete) 273 :group 'pcomplete)
274 274
275(defcustom pcomplete-try-first-hook nil 275(defcustom pcomplete-try-first-hook nil
276 "*A list of functions which are called before completing an argument. 276 "A list of functions which are called before completing an argument.
277This can be used, for example, for completing things which might apply 277This can be used, for example, for completing things which might apply
278to all arguments, such as variable names after a $." 278to all arguments, such as variable names after a $."
279 :type 'hook 279 :type 'hook
@@ -287,12 +287,12 @@ to all arguments, such as variable names after a $."
287 (function 287 (function
288 (lambda () 288 (lambda ()
289 (pcomplete-here (pcomplete-executables)))) 289 (pcomplete-here (pcomplete-executables))))
290 "*Function called for completing the initial command argument." 290 "Function called for completing the initial command argument."
291 :type 'function 291 :type 'function
292 :group 'pcomplete) 292 :group 'pcomplete)
293 293
294(defcustom pcomplete-command-name-function 'pcomplete-command-name 294(defcustom pcomplete-command-name-function 'pcomplete-command-name
295 "*Function called for determining the current command name." 295 "Function called for determining the current command name."
296 :type 'function 296 :type 'function
297 :group 'pcomplete) 297 :group 'pcomplete)
298 298
@@ -300,13 +300,13 @@ to all arguments, such as variable names after a $."
300 (function 300 (function
301 (lambda () 301 (lambda ()
302 (while (pcomplete-here (pcomplete-entries))))) 302 (while (pcomplete-here (pcomplete-entries)))))
303 "*Function called when no completion rule can be found. 303 "Function called when no completion rule can be found.
304This function is used to generate completions for every argument." 304This function is used to generate completions for every argument."
305 :type 'function 305 :type 'function
306 :group 'pcomplete) 306 :group 'pcomplete)
307 307
308(defcustom pcomplete-use-paring t 308(defcustom pcomplete-use-paring t
309 "*If t, pare alternatives that have already been used. 309 "If t, pare alternatives that have already been used.
310If nil, you will always see the completion set of possible options, no 310If nil, you will always see the completion set of possible options, no
311matter which of those options have already been used in previous 311matter which of those options have already been used in previous
312command arguments." 312command arguments."
@@ -314,7 +314,7 @@ command arguments."
314 :group 'pcomplete) 314 :group 'pcomplete)
315 315
316(defcustom pcomplete-termination-string " " 316(defcustom pcomplete-termination-string " "
317 "*A string that is inserted after any completion or expansion. 317 "A string that is inserted after any completion or expansion.
318This is usually a space character, useful when completing lists of 318This is usually a space character, useful when completing lists of
319words separated by spaces. However, if your list uses a different 319words separated by spaces. However, if your list uses a different
320separator character, or if the completion occurs in a word that is 320separator character, or if the completion occurs in a word that is
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 983e451a40c..63513971d09 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -44,14 +44,14 @@
44 'cvs-display-full-name "22.1") 44 'cvs-display-full-name "22.1")
45 45
46(defcustom cvs-display-full-name t 46(defcustom cvs-display-full-name t
47 "*Specifies how the filenames should be displayed in the listing. 47 "Specifies how the filenames should be displayed in the listing.
48If non-nil, their full filename name will be displayed, else only the 48If non-nil, their full filename name will be displayed, else only the
49non-directory part." 49non-directory part."
50 :group 'pcl-cvs 50 :group 'pcl-cvs
51 :type '(boolean)) 51 :type '(boolean))
52 52
53(defcustom cvs-allow-dir-commit nil 53(defcustom cvs-allow-dir-commit nil
54 "*Allow `cvs-mode-commit' on directories. 54 "Allow `cvs-mode-commit' on directories.
55If you commit without any marked file and with the cursor positioned 55If you commit without any marked file and with the cursor positioned
56on a directory entry, cvs would commit the whole directory. This seems 56on a directory entry, cvs would commit the whole directory. This seems
57to confuse some users sometimes." 57to confuse some users sometimes."
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index baec05faf2f..3242116b613 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -43,7 +43,7 @@
43;; parse vars 43;; parse vars
44 44
45(defcustom cvs-update-prog-output-skip-regexp "$" 45(defcustom cvs-update-prog-output-skip-regexp "$"
46 "*A regexp that matches the end of the output from all cvs update programs. 46 "A regexp that matches the end of the output from all cvs update programs.
47That is, output from any programs that are run by CVS (by the flag -u 47That is, output from any programs that are run by CVS (by the flag -u
48in the `modules' file - see cvs(5)) when `cvs update' is performed should 48in the `modules' file - see cvs(5)) when `cvs update' is performed should
49terminate with a line that this regexp matches. It is enough that 49terminate with a line that this regexp matches. It is enough that
@@ -56,7 +56,7 @@ The default (a single $) fits programs without output."
56(defcustom cvs-parse-ignored-messages 56(defcustom cvs-parse-ignored-messages
57 '("Executing ssh-askpass to query the password.*$" 57 '("Executing ssh-askpass to query the password.*$"
58 ".*Remote host denied X11 forwarding.*$") 58 ".*Remote host denied X11 forwarding.*$")
59 "*A list of regexps matching messages that should be ignored by the parser. 59 "A list of regexps matching messages that should be ignored by the parser.
60Each regexp should match a whole set of lines and should hence be terminated 60Each regexp should match a whole set of lines and should hence be terminated
61by `$'." 61by `$'."
62 :group 'pcl-cvs 62 :group 'pcl-cvs
diff --git a/lisp/printing.el b/lisp/printing.el
index 85e4b5ea4bb..887668901c7 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1683,7 +1683,7 @@ separator; otherwise, ensure unix-style directory separator."
1683 ps-windows-system) 1683 ps-windows-system)
1684 'windows 1684 'windows
1685 'unix) 1685 'unix)
1686 "*Specify which path style to use for external commands. 1686 "Specify which path style to use for external commands.
1687 1687
1688Valid values are: 1688Valid values are:
1689 1689
@@ -1700,7 +1700,7 @@ Valid values are:
1700 '((unix PATH) 1700 '((unix PATH)
1701 (cygwin PATH) 1701 (cygwin PATH)
1702 (windows PATH)) 1702 (windows PATH))
1703 "*Specify an alist for command paths. 1703 "Specify an alist for command paths.
1704 1704
1705It's used to find commands used for printing package, like gv, gs, gsview.exe, 1705It's used to find commands used for printing package, like gv, gs, gsview.exe,
1706mpage, print.exe, etc. See also `pr-command' function. 1706mpage, print.exe, etc. See also `pr-command' function.
@@ -1775,7 +1775,7 @@ Examples:
1775 1775
1776 1776
1777(defcustom pr-txt-name 'default 1777(defcustom pr-txt-name 'default
1778 "*Specify a printer for printing a text file. 1778 "Specify a printer for printing a text file.
1779 1779
1780The printer name symbol should be defined on `pr-txt-printer-alist' (see it for 1780The printer name symbol should be defined on `pr-txt-printer-alist' (see it for
1781documentation). 1781documentation).
@@ -1805,7 +1805,7 @@ function (see it for documentation) to update text printer menu."
1805 ;; (PRN "" nil "PRN") 1805 ;; (PRN "" nil "PRN")
1806 ;; (standard "redpr.exe" nil "") 1806 ;; (standard "redpr.exe" nil "")
1807 ;; ) 1807 ;; )
1808 "*Specify an alist of all text printers (text printer database). 1808 "Specify an alist of all text printers (text printer database).
1809 1809
1810The alist element has the form: 1810The alist element has the form:
1811 1811
@@ -1921,7 +1921,7 @@ Useful links:
1921 1921
1922 1922
1923(defcustom pr-ps-name 'default 1923(defcustom pr-ps-name 'default
1924 "*Specify a printer for printing a PostScript file. 1924 "Specify a printer for printing a PostScript file.
1925 1925
1926This printer name symbol should be defined on `pr-ps-printer-alist' (see it for 1926This printer name symbol should be defined on `pr-ps-printer-alist' (see it for
1927documentation). 1927documentation).
@@ -1956,7 +1956,7 @@ function (see it for documentation) to update PostScript printer menu."
1956 ;; (PRN "" nil "" "PRN") 1956 ;; (PRN "" nil "" "PRN")
1957 ;; (standard "redpr.exe" nil "" "") 1957 ;; (standard "redpr.exe" nil "" "")
1958 ;; ) 1958 ;; )
1959 "*Specify an alist for all PostScript printers (PostScript printer database). 1959 "Specify an alist for all PostScript printers (PostScript printer database).
1960 1960
1961The alist element has the form: 1961The alist element has the form:
1962 1962
@@ -2216,7 +2216,7 @@ Useful links:
2216 (cond (ps-windows-system "c:/temp") 2216 (cond (ps-windows-system "c:/temp")
2217 (t "/tmp") 2217 (t "/tmp")
2218 ))))) 2218 )))))
2219 "*Specify a directory for temporary files during printing. 2219 "Specify a directory for temporary files during printing.
2220 2220
2221See also `pr-ps-temp-file' and `pr-file-modes'." 2221See also `pr-ps-temp-file' and `pr-file-modes'."
2222 :type '(directory :tag "Temporary Directory") 2222 :type '(directory :tag "Temporary Directory")
@@ -2224,7 +2224,7 @@ See also `pr-ps-temp-file' and `pr-file-modes'."
2224 2224
2225 2225
2226(defcustom pr-ps-temp-file "prspool-" 2226(defcustom pr-ps-temp-file "prspool-"
2227 "*Specify PostScript temporary file name prefix. 2227 "Specify PostScript temporary file name prefix.
2228 2228
2229See also `pr-temp-dir' and `pr-file-modes'." 2229See also `pr-temp-dir' and `pr-file-modes'."
2230 :type '(file :tag "PostScript Temporary File Name") 2230 :type '(file :tag "PostScript Temporary File Name")
@@ -2235,7 +2235,7 @@ See also `pr-temp-dir' and `pr-file-modes'."
2235;; So, by default, only the session owner have permission to deal with files 2235;; So, by default, only the session owner have permission to deal with files
2236;; generated by `printing'. 2236;; generated by `printing'.
2237(defcustom pr-file-modes ?\600 2237(defcustom pr-file-modes ?\600
2238 "*Specify the file permission bits for newly created files. 2238 "Specify the file permission bits for newly created files.
2239 2239
2240It should be an integer; only the low 9 bits are used. 2240It should be an integer; only the low 9 bits are used.
2241 2241
@@ -2248,7 +2248,7 @@ See also `pr-temp-dir' and `pr-ps-temp-file'."
2248 (if ps-windows-system 2248 (if ps-windows-system
2249 "gsview32.exe" 2249 "gsview32.exe"
2250 "gv") 2250 "gv")
2251 "*Specify path and name of the gsview/gv utility. 2251 "Specify path and name of the gsview/gv utility.
2252 2252
2253See also `pr-path-alist'. 2253See also `pr-path-alist'.
2254 2254
@@ -2289,7 +2289,7 @@ Useful links:
2289 (if ps-windows-system 2289 (if ps-windows-system
2290 "gswin32.exe" 2290 "gswin32.exe"
2291 "gs") 2291 "gs")
2292 "*Specify path and name of the ghostscript utility. 2292 "Specify path and name of the ghostscript utility.
2293 2293
2294See also `pr-path-alist'. 2294See also `pr-path-alist'.
2295 2295
@@ -2315,7 +2315,7 @@ Useful links:
2315 (if ps-windows-system 2315 (if ps-windows-system
2316 '("-q -dNOPAUSE -Ic:/gs/gs5.50;c:/gs/gs5.50/fonts") 2316 '("-q -dNOPAUSE -Ic:/gs/gs5.50;c:/gs/gs5.50/fonts")
2317 '("-q -dNOPAUSE -I/usr/share/ghostscript/5.10")) 2317 '("-q -dNOPAUSE -I/usr/share/ghostscript/5.10"))
2318 "*Specify ghostscript switches. See the documentation on GS for more info. 2318 "Specify ghostscript switches. See the documentation on GS for more info.
2319 2319
2320It's a list of strings, where each string is one or more ghostscript switches. 2320It's a list of strings, where each string is one or more ghostscript switches.
2321 2321
@@ -2357,7 +2357,7 @@ Useful links:
2357 (if ps-windows-system 2357 (if ps-windows-system
2358 "mswinpr2" 2358 "mswinpr2"
2359 "uniprint") 2359 "uniprint")
2360 "*Specify the ghostscript device switch value (-sDEVICE=). 2360 "Specify the ghostscript device switch value (-sDEVICE=).
2361 2361
2362A note on the gs switches: 2362A note on the gs switches:
2363 2363
@@ -2370,7 +2370,7 @@ See also `pr-ps-printer-alist'."
2370 2370
2371 2371
2372(defcustom pr-gs-resolution 300 2372(defcustom pr-gs-resolution 300
2373 "*Specify ghostscript resolution switch value (-r). 2373 "Specify ghostscript resolution switch value (-r).
2374 2374
2375A note on the gs switches: 2375A note on the gs switches:
2376 2376
@@ -2383,7 +2383,7 @@ See also `pr-ps-printer-alist'."
2383 2383
2384 2384
2385(defcustom pr-print-using-ghostscript nil 2385(defcustom pr-print-using-ghostscript nil
2386 "*Non-nil means print using ghostscript. 2386 "Non-nil means print using ghostscript.
2387 2387
2388This is useful if you don't have a PostScript printer, so you could use the 2388This is useful if you don't have a PostScript printer, so you could use the
2389ghostscript to print a PostScript file. 2389ghostscript to print a PostScript file.
@@ -2395,31 +2395,31 @@ variable should be nil."
2395 2395
2396 2396
2397(defcustom pr-faces-p nil 2397(defcustom pr-faces-p nil
2398 "*Non-nil means print with face attributes." 2398 "Non-nil means print with face attributes."
2399 :type 'boolean 2399 :type 'boolean
2400 :group 'printing) 2400 :group 'printing)
2401 2401
2402 2402
2403(defcustom pr-spool-p nil 2403(defcustom pr-spool-p nil
2404 "*Non-nil means spool printing in a buffer." 2404 "Non-nil means spool printing in a buffer."
2405 :type 'boolean 2405 :type 'boolean
2406 :group 'printing) 2406 :group 'printing)
2407 2407
2408 2408
2409(defcustom pr-file-landscape nil 2409(defcustom pr-file-landscape nil
2410 "*Non-nil means print PostScript file in landscape orientation." 2410 "Non-nil means print PostScript file in landscape orientation."
2411 :type 'boolean 2411 :type 'boolean
2412 :group 'printing) 2412 :group 'printing)
2413 2413
2414 2414
2415(defcustom pr-file-duplex nil 2415(defcustom pr-file-duplex nil
2416 "*Non-nil means print PostScript file in duplex mode." 2416 "Non-nil means print PostScript file in duplex mode."
2417 :type 'boolean 2417 :type 'boolean
2418 :group 'printing) 2418 :group 'printing)
2419 2419
2420 2420
2421(defcustom pr-file-tumble nil 2421(defcustom pr-file-tumble nil
2422 "*Non-nil means print PostScript file in tumble mode. 2422 "Non-nil means print PostScript file in tumble mode.
2423 2423
2424If tumble is off, produces a printing suitable for binding on the left or 2424If tumble is off, produces a printing suitable for binding on the left or
2425right. 2425right.
@@ -2430,7 +2430,7 @@ bottom."
2430 2430
2431 2431
2432(defcustom pr-auto-region t 2432(defcustom pr-auto-region t
2433 "*Non-nil means region is automagically detected. 2433 "Non-nil means region is automagically detected.
2434 2434
2435Note that this will only work if you're using transient mark mode. 2435Note that this will only work if you're using transient mark mode.
2436 2436
@@ -2442,7 +2442,7 @@ marked instead of all buffer."
2442 2442
2443 2443
2444(defcustom pr-auto-mode t 2444(defcustom pr-auto-mode t
2445 "*Non-nil means major-mode specific printing is prefered over normal printing. 2445 "Non-nil means major-mode specific printing is prefered over normal printing.
2446 2446
2447That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*' 2447That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*'
2448and `*-region*' commands will behave like `*-mode*' commands; otherwise, 2448and `*-region*' commands will behave like `*-mode*' commands; otherwise,
@@ -2510,7 +2510,7 @@ will print the current region."
2510 nil 2510 nil
2511 ) 2511 )
2512 ) 2512 )
2513 "*Specify an alist for a major-mode and printing functions. 2513 "Specify an alist for a major-mode and printing functions.
2514 2514
2515To customize a major mode printing, just declare the customization in 2515To customize a major mode printing, just declare the customization in
2516`pr-mode-alist' and invoke some of `*-mode*' commands. An example for major 2516`pr-mode-alist' and invoke some of `*-mode*' commands. An example for major
@@ -2653,7 +2653,7 @@ DEFAULT It's a way to set default values when this entry is selected.
2653 2653
2654 2654
2655(defcustom pr-ps-utility 'mpage 2655(defcustom pr-ps-utility 'mpage
2656 "*Specify PostScript utility symbol. 2656 "Specify PostScript utility symbol.
2657 2657
2658This utility symbol should be defined on `pr-ps-utility-alist' (see it for 2658This utility symbol should be defined on `pr-ps-utility-alist' (see it for
2659documentation). 2659documentation).
@@ -2684,7 +2684,7 @@ NOTE: Don't forget to download and install the utilities declared on
2684 ;; '((psnup "c:/psutils/psnup" ("-q") "-P%s" "-%d" "-l" nil nil " " nil 2684 ;; '((psnup "c:/psutils/psnup" ("-q") "-P%s" "-%d" "-l" nil nil " " nil
2685 ;; (pr-file-duplex . nil) (pr-file-tumble . nil)) 2685 ;; (pr-file-duplex . nil) (pr-file-tumble . nil))
2686 ;; ) 2686 ;; )
2687 "*Specify an alist for PostScript utility processing (PS utility database). 2687 "Specify an alist for PostScript utility processing (PS utility database).
2688 2688
2689The alist element has the form: 2689The alist element has the form:
2690 2690
@@ -2882,7 +2882,7 @@ Useful links:
2882 2882
2883 2883
2884(defcustom pr-menu-lock t 2884(defcustom pr-menu-lock t
2885 "*Non-nil means menu is locked while selecting toggle options. 2885 "Non-nil means menu is locked while selecting toggle options.
2886 2886
2887See also `pr-menu-char-height' and `pr-menu-char-width'." 2887See also `pr-menu-char-height' and `pr-menu-char-width'."
2888 :type 'boolean 2888 :type 'boolean
@@ -2890,7 +2890,7 @@ See also `pr-menu-char-height' and `pr-menu-char-width'."
2890 2890
2891 2891
2892(defcustom pr-menu-char-height (pr-menu-char-height) 2892(defcustom pr-menu-char-height (pr-menu-char-height)
2893 "*Specify menu char height in pixels. 2893 "Specify menu char height in pixels.
2894 2894
2895This variable is used to guess which vertical position should be locked the 2895This variable is used to guess which vertical position should be locked the
2896menu, so don't forget to adjust it if menu position is not ok. 2896menu, so don't forget to adjust it if menu position is not ok.
@@ -2901,7 +2901,7 @@ See also `pr-menu-lock' and `pr-menu-char-width'."
2901 2901
2902 2902
2903(defcustom pr-menu-char-width (pr-menu-char-width) 2903(defcustom pr-menu-char-width (pr-menu-char-width)
2904 "*Specify menu char width in pixels. 2904 "Specify menu char width in pixels.
2905 2905
2906This variable is used to guess which horizontal position should be locked the 2906This variable is used to guess which horizontal position should be locked the
2907menu, so don't forget to adjust it if menu position is not ok. 2907menu, so don't forget to adjust it if menu position is not ok.
@@ -2917,7 +2917,7 @@ See also `pr-menu-lock' and `pr-menu-char-height'."
2917 (pr-file-duplex . nil) ; settings 2917 (pr-file-duplex . nil) ; settings
2918 (pr-file-tumble . nil)) 2918 (pr-file-tumble . nil))
2919 ) 2919 )
2920 "*Specify an alist for settings in general. 2920 "Specify an alist for settings in general.
2921 2921
2922The elements have the following form: 2922The elements have the following form:
2923 2923
@@ -3029,7 +3029,7 @@ SETTING It's a cons like:
3029 3029
3030(defcustom pr-visible-entry-list 3030(defcustom pr-visible-entry-list
3031 '(postscript text postscript-options postscript-process printing help) 3031 '(postscript text postscript-options postscript-process printing help)
3032 "*Specify a list of Printing menu visible entries. 3032 "Specify a list of Printing menu visible entries.
3033 3033
3034Valid values with the corresponding menu parts are: 3034Valid values with the corresponding menu parts are:
3035 3035
@@ -3081,7 +3081,7 @@ Any other value is ignored."
3081 3081
3082 3082
3083(defcustom pr-delete-temp-file t 3083(defcustom pr-delete-temp-file t
3084 "*Non-nil means delete temporary files. 3084 "Non-nil means delete temporary files.
3085 3085
3086Set `pr-delete-temp-file' to nil, if the following message (or a similar) 3086Set `pr-delete-temp-file' to nil, if the following message (or a similar)
3087happens when printing: 3087happens when printing:
@@ -3092,7 +3092,7 @@ happens when printing:
3092 3092
3093 3093
3094(defcustom pr-list-directory nil 3094(defcustom pr-list-directory nil
3095 "*Non-nil means list directory when processing a directory. 3095 "Non-nil means list directory when processing a directory.
3096 3096
3097That is, any subdirectories (and the superdirectory) of the directory (given as 3097That is, any subdirectories (and the superdirectory) of the directory (given as
3098argument of functions below) are also printed (as dired-mode listings). 3098argument of functions below) are also printed (as dired-mode listings).
@@ -3105,7 +3105,7 @@ and `pr-txt-directory'."
3105 3105
3106 3106
3107(defcustom pr-buffer-name "*Printing Interface*" 3107(defcustom pr-buffer-name "*Printing Interface*"
3108 "*Specify the name of the buffer interface for printing package. 3108 "Specify the name of the buffer interface for printing package.
3109 3109
3110It's used by `pr-interface'." 3110It's used by `pr-interface'."
3111 :type 'string 3111 :type 'string
@@ -3115,7 +3115,7 @@ It's used by `pr-interface'."
3115(defcustom pr-buffer-name-ignore 3115(defcustom pr-buffer-name-ignore
3116 (list (regexp-quote pr-buffer-name) ; ignore printing interface buffer 3116 (list (regexp-quote pr-buffer-name) ; ignore printing interface buffer
3117 "^ .*$") ; ignore invisible buffers 3117 "^ .*$") ; ignore invisible buffers
3118 "*Specify a regexp list for buffer names to be ignored in interface buffer. 3118 "Specify a regexp list for buffer names to be ignored in interface buffer.
3119 3119
3120NOTE: Case is important for matching, that is, `case-fold-search' is always 3120NOTE: Case is important for matching, that is, `case-fold-search' is always
3121 nil. 3121 nil.
@@ -3126,7 +3126,7 @@ It's used by `pr-interface'."
3126 3126
3127 3127
3128(defcustom pr-buffer-verbose t 3128(defcustom pr-buffer-verbose t
3129 "*Non-nil means to be verbose when editing a field in interface buffer. 3129 "Non-nil means to be verbose when editing a field in interface buffer.
3130 3130
3131It's used by `pr-interface'." 3131It's used by `pr-interface'."
3132 :type 'boolean 3132 :type 'boolean
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 1a97f2dd7b8..eec295cf99c 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -94,7 +94,7 @@
94 94
95;;;###autoload 95;;;###autoload
96(defcustom ps-multibyte-buffer nil 96(defcustom ps-multibyte-buffer nil
97 "*Specifies the multi-byte buffer handling. 97 "Specifies the multi-byte buffer handling.
98 98
99Valid values are: 99Valid values are:
100 100
@@ -188,7 +188,7 @@ See also the variable `ps-font-info-database'.")
188 188
189(defcustom ps-mule-font-info-database-default 189(defcustom ps-mule-font-info-database-default
190 ps-mule-font-info-database-latin 190 ps-mule-font-info-database-latin
191 "*The default setting to use when `ps-multibyte-buffer' is nil." 191 "The default setting to use when `ps-multibyte-buffer' is nil."
192 :type '(symbol :tag "Multi-Byte Buffer Database Font Default") 192 :type '(symbol :tag "Multi-Byte Buffer Database Font Default")
193 :group 'ps-print-font) 193 :group 'ps-print-font)
194 194
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 4fb601b0f2b..d6e784a0e7c 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1095,7 +1095,7 @@ Please send all bug fixes and enhancements to
1095;; foreground colors to be used when text foreground and background colors are 1095;; foreground colors to be used when text foreground and background colors are
1096;; equals. It'll be used the first foreground color in `ps-fg-list' which is 1096;; equals. It'll be used the first foreground color in `ps-fg-list' which is
1097;; different from the background color. If `ps-fg-list' is nil, the default 1097;; different from the background color. If `ps-fg-list' is nil, the default
1098;; foreground color is used. 1098;; foreground color is used.
1099;; 1099;;
1100;; 1100;;
1101;; How Ps-Print Maps Faces 1101;; How Ps-Print Maps Faces
@@ -1591,7 +1591,7 @@ Please send all bug fixes and enhancements to
1591 1591
1592 1592
1593(defcustom ps-error-handler-message 'paper 1593(defcustom ps-error-handler-message 'paper
1594 "*Specify where the error handler message should be sent. 1594 "Specify where the error handler message should be sent.
1595 1595
1596Valid values are: 1596Valid values are:
1597 1597
@@ -1617,7 +1617,7 @@ Any other value is treated as `paper'."
1617 :group 'ps-print-miscellany) 1617 :group 'ps-print-miscellany)
1618 1618
1619(defcustom ps-user-defined-prologue nil 1619(defcustom ps-user-defined-prologue nil
1620 "*User defined PostScript prologue code inserted before all prologue code. 1620 "User defined PostScript prologue code inserted before all prologue code.
1621 1621
1622`ps-user-defined-prologue' may be a string or a symbol function which returns a 1622`ps-user-defined-prologue' may be a string or a symbol function which returns a
1623string. Note that this string is inserted after `ps-adobe-tag' and PostScript 1623string. Note that this string is inserted after `ps-adobe-tag' and PostScript
@@ -1649,7 +1649,7 @@ As an example for `ps-user-defined-prologue' setting:
1649 :group 'ps-print-miscellany) 1649 :group 'ps-print-miscellany)
1650 1650
1651(defcustom ps-print-prologue-header nil 1651(defcustom ps-print-prologue-header nil
1652 "*PostScript prologue header comments besides that ps-print generates. 1652 "PostScript prologue header comments besides that ps-print generates.
1653 1653
1654`ps-print-prologue-header' may be a string or a symbol function which returns a 1654`ps-print-prologue-header' may be a string or a symbol function which returns a
1655string. Note that this string is inserted on PostScript prologue header 1655string. Note that this string is inserted on PostScript prologue header
@@ -1680,7 +1680,7 @@ For more information about PostScript document comments, see:
1680 1680
1681(defcustom ps-printer-name (and (boundp 'printer-name) 1681(defcustom ps-printer-name (and (boundp 'printer-name)
1682 (symbol-value 'printer-name)) 1682 (symbol-value 'printer-name))
1683 "*The name of a local printer for printing PostScript files. 1683 "The name of a local printer for printing PostScript files.
1684 1684
1685On Unix-like systems, a string value should be a name understood by lpr's -P 1685On Unix-like systems, a string value should be a name understood by lpr's -P
1686option; a value of nil means use the value of `printer-name' instead. 1686option; a value of nil means use the value of `printer-name' instead.
@@ -1717,7 +1717,7 @@ See also `ps-printer-name-option' for documentation."
1717 "-d") 1717 "-d")
1718 (t 1718 (t
1719 "-P" )) 1719 "-P" ))
1720 "*Option for `ps-printer-name' variable (see it). 1720 "Option for `ps-printer-name' variable (see it).
1721 1721
1722On Unix-like systems, if `lpr' is in use, this should be the string 1722On Unix-like systems, if `lpr' is in use, this should be the string
1723\"-P\"; if `lp' is in use, this should be the string \"-d\". 1723\"-P\"; if `lp' is in use, this should be the string \"-d\".
@@ -1742,7 +1742,7 @@ This variable is used only when `ps-printer-name' is a non-empty string."
1742 :group 'ps-print-printer) 1742 :group 'ps-print-printer)
1743 1743
1744(defcustom ps-lpr-command lpr-command 1744(defcustom ps-lpr-command lpr-command
1745 "*Name of program for printing a PostScript file. 1745 "Name of program for printing a PostScript file.
1746 1746
1747On MS-DOS and MS-Windows systems, if the value is an empty string then Emacs 1747On MS-DOS and MS-Windows systems, if the value is an empty string then Emacs
1748will write directly to the printer port named by `ps-printer-name'. The 1748will write directly to the printer port named by `ps-printer-name'. The
@@ -1755,7 +1755,7 @@ an explicit filename is given as the last argument."
1755 :group 'ps-print-printer) 1755 :group 'ps-print-printer)
1756 1756
1757(defcustom ps-lpr-switches lpr-switches 1757(defcustom ps-lpr-switches lpr-switches
1758 "*List of extra switches to pass to `ps-lpr-command'. 1758 "List of extra switches to pass to `ps-lpr-command'.
1759 1759
1760The list element can be: 1760The list element can be:
1761 1761
@@ -1785,7 +1785,7 @@ See `ps-lpr-command'."
1785 :group 'ps-print-printer) 1785 :group 'ps-print-printer)
1786 1786
1787(defcustom ps-print-region-function nil 1787(defcustom ps-print-region-function nil
1788 "*Specify a function to print the region on a PostScript printer. 1788 "Specify a function to print the region on a PostScript printer.
1789See definition of `call-process-region' for calling conventions. The fourth 1789See definition of `call-process-region' for calling conventions. The fourth
1790and the sixth arguments are both nil." 1790and the sixth arguments are both nil."
1791 :type '(choice (const nil) function) 1791 :type '(choice (const nil) function)
@@ -1793,7 +1793,7 @@ and the sixth arguments are both nil."
1793 :group 'ps-print-printer) 1793 :group 'ps-print-printer)
1794 1794
1795(defcustom ps-manual-feed nil 1795(defcustom ps-manual-feed nil
1796 "*Non-nil means the printer will manually feed paper. 1796 "Non-nil means the printer will manually feed paper.
1797 1797
1798If it's nil, automatic feeding takes place." 1798If it's nil, automatic feeding takes place."
1799 :type 'boolean 1799 :type 'boolean
@@ -1801,7 +1801,7 @@ If it's nil, automatic feeding takes place."
1801 :group 'ps-print-printer) 1801 :group 'ps-print-printer)
1802 1802
1803(defcustom ps-end-with-control-d (and ps-windows-system t) 1803(defcustom ps-end-with-control-d (and ps-windows-system t)
1804 "*Non-nil means insert C-d at end of PostScript file generated." 1804 "Non-nil means insert C-d at end of PostScript file generated."
1805 :version "21.1" 1805 :version "21.1"
1806 :type 'boolean 1806 :type 'boolean
1807 :version "20" 1807 :version "20"
@@ -1866,7 +1866,7 @@ If it's nil, automatic feeding takes place."
1866 '(vhsface 205.0 127.0 "VHSFace") 1866 '(vhsface 205.0 127.0 "VHSFace")
1867 '(vhsspine 400.0 50.0 "VHSSpine") 1867 '(vhsspine 400.0 50.0 "VHSSpine")
1868 '(zipdisk 156.0 136.0 "ZipDisk")) 1868 '(zipdisk 156.0 136.0 "ZipDisk"))
1869 "*List associating a symbolic paper type to its width, height and doc media. 1869 "List associating a symbolic paper type to its width, height and doc media.
1870See `ps-paper-type'." 1870See `ps-paper-type'."
1871 :type '(repeat (list :tag "Paper Type" 1871 :type '(repeat (list :tag "Paper Type"
1872 (symbol :tag "Symbol Name") 1872 (symbol :tag "Symbol Name")
@@ -1878,7 +1878,7 @@ See `ps-paper-type'."
1878 1878
1879;;;###autoload 1879;;;###autoload
1880(defcustom ps-paper-type 'letter 1880(defcustom ps-paper-type 'letter
1881 "*Specify the size of paper to format for. 1881 "Specify the size of paper to format for.
1882Should be one of the paper types defined in `ps-page-dimensions-database', for 1882Should be one of the paper types defined in `ps-page-dimensions-database', for
1883example `letter', `legal' or `a4'." 1883example `letter', `legal' or `a4'."
1884 :type '(symbol :validate (lambda (wid) 1884 :type '(symbol :validate (lambda (wid)
@@ -1891,7 +1891,7 @@ example `letter', `legal' or `a4'."
1891 :group 'ps-print-page) 1891 :group 'ps-print-page)
1892 1892
1893(defcustom ps-warn-paper-type t 1893(defcustom ps-warn-paper-type t
1894 "*Non-nil means give an error if paper size is not equal to `ps-paper-type'. 1894 "Non-nil means give an error if paper size is not equal to `ps-paper-type'.
1895 1895
1896It's used when `ps-spool-config' is set to `setpagedevice'." 1896It's used when `ps-spool-config' is set to `setpagedevice'."
1897 :type 'boolean 1897 :type 'boolean
@@ -1899,19 +1899,19 @@ It's used when `ps-spool-config' is set to `setpagedevice'."
1899 :group 'ps-print-page) 1899 :group 'ps-print-page)
1900 1900
1901(defcustom ps-landscape-mode nil 1901(defcustom ps-landscape-mode nil
1902 "*Non-nil means print in landscape mode." 1902 "Non-nil means print in landscape mode."
1903 :type 'boolean 1903 :type 'boolean
1904 :version "20" 1904 :version "20"
1905 :group 'ps-print-page) 1905 :group 'ps-print-page)
1906 1906
1907(defcustom ps-print-upside-down nil 1907(defcustom ps-print-upside-down nil
1908 "*Non-nil means print upside-down (that is, rotated by 180 degrees)." 1908 "Non-nil means print upside-down (that is, rotated by 180 degrees)."
1909 :type 'boolean 1909 :type 'boolean
1910 :version "21.1" 1910 :version "21.1"
1911 :group 'ps-print-page) 1911 :group 'ps-print-page)
1912 1912
1913(defcustom ps-selected-pages nil 1913(defcustom ps-selected-pages nil
1914 "*Specify which pages to print. 1914 "Specify which pages to print.
1915 1915
1916If nil, print all pages. 1916If nil, print all pages.
1917 1917
@@ -1938,7 +1938,7 @@ See also `ps-even-or-odd-pages'."
1938 :group 'ps-print-page) 1938 :group 'ps-print-page)
1939 1939
1940(defcustom ps-even-or-odd-pages nil 1940(defcustom ps-even-or-odd-pages nil
1941 "*Specify if it prints even/odd pages. 1941 "Specify if it prints even/odd pages.
1942 1942
1943Valid values are: 1943Valid values are:
1944 1944
@@ -1997,7 +1997,7 @@ sheet parity."
1997 :group 'ps-print-page) 1997 :group 'ps-print-page)
1998 1998
1999(defcustom ps-print-control-characters 'control-8-bit 1999(defcustom ps-print-control-characters 'control-8-bit
2000 "*Specify the printable form for control and 8-bit characters. 2000 "Specify the printable form for control and 8-bit characters.
2001That is, instead of sending, for example, a ^D (\\004) to printer, 2001That is, instead of sending, for example, a ^D (\\004) to printer,
2002it is sent the string \"^D\". 2002it is sent the string \"^D\".
2003 2003
@@ -2029,7 +2029,7 @@ Any other value is treated as nil."
2029 :group 'ps-print-miscellany) 2029 :group 'ps-print-miscellany)
2030 2030
2031(defcustom ps-n-up-printing 1 2031(defcustom ps-n-up-printing 1
2032 "*Specify the number of pages per sheet paper." 2032 "Specify the number of pages per sheet paper."
2033 :type '(integer 2033 :type '(integer
2034 :tag "N Up Printing" 2034 :tag "N Up Printing"
2035 :validate 2035 :validate
@@ -2045,19 +2045,19 @@ Any other value is treated as nil."
2045 :group 'ps-print-n-up) 2045 :group 'ps-print-n-up)
2046 2046
2047(defcustom ps-n-up-margin (/ (* 72 1.0) 2.54) ; 1 cm 2047(defcustom ps-n-up-margin (/ (* 72 1.0) 2.54) ; 1 cm
2048 "*Specify the margin in points between the sheet border and n-up printing." 2048 "Specify the margin in points between the sheet border and n-up printing."
2049 :type 'number 2049 :type 'number
2050 :version "20" 2050 :version "20"
2051 :group 'ps-print-n-up) 2051 :group 'ps-print-n-up)
2052 2052
2053(defcustom ps-n-up-border-p t 2053(defcustom ps-n-up-border-p t
2054 "*Non-nil means a border is drawn around each page." 2054 "Non-nil means a border is drawn around each page."
2055 :type 'boolean 2055 :type 'boolean
2056 :version "20" 2056 :version "20"
2057 :group 'ps-print-n-up) 2057 :group 'ps-print-n-up)
2058 2058
2059(defcustom ps-n-up-filling 'left-top 2059(defcustom ps-n-up-filling 'left-top
2060 "*Specify how page matrix is filled on each sheet of paper. 2060 "Specify how page matrix is filled on each sheet of paper.
2061 2061
2062Following are the valid values for `ps-n-up-filling' with a filling example 2062Following are the valid values for `ps-n-up-filling' with a filling example
2063using a 3x4 page matrix: 2063using a 3x4 page matrix:
@@ -2089,27 +2089,27 @@ Any other value is treated as `left-top'."
2089 :group 'ps-print-n-up) 2089 :group 'ps-print-n-up)
2090 2090
2091(defcustom ps-number-of-columns (if ps-landscape-mode 2 1) 2091(defcustom ps-number-of-columns (if ps-landscape-mode 2 1)
2092 "*Specify the number of columns." 2092 "Specify the number of columns."
2093 :type 'number 2093 :type 'number
2094 :version "20" 2094 :version "20"
2095 :group 'ps-print-miscellany) 2095 :group 'ps-print-miscellany)
2096 2096
2097(defcustom ps-zebra-stripes nil 2097(defcustom ps-zebra-stripes nil
2098 "*Non-nil means print zebra stripes. 2098 "Non-nil means print zebra stripes.
2099See also documentation for `ps-zebra-stripe-height' and `ps-zebra-color'." 2099See also documentation for `ps-zebra-stripe-height' and `ps-zebra-color'."
2100 :type 'boolean 2100 :type 'boolean
2101 :version "20" 2101 :version "20"
2102 :group 'ps-print-zebra) 2102 :group 'ps-print-zebra)
2103 2103
2104(defcustom ps-zebra-stripe-height 3 2104(defcustom ps-zebra-stripe-height 3
2105 "*Number of zebra stripe lines. 2105 "Number of zebra stripe lines.
2106See also documentation for `ps-zebra-stripes' and `ps-zebra-color'." 2106See also documentation for `ps-zebra-stripes' and `ps-zebra-color'."
2107 :type 'number 2107 :type 'number
2108 :version "20" 2108 :version "20"
2109 :group 'ps-print-zebra) 2109 :group 'ps-print-zebra)
2110 2110
2111(defcustom ps-zebra-color 0.95 2111(defcustom ps-zebra-color 0.95
2112 "*Zebra stripe gray scale or RGB color. 2112 "Zebra stripe gray scale or RGB color.
2113See also documentation for `ps-zebra-stripes' and `ps-zebra-stripe-height'." 2113See also documentation for `ps-zebra-stripes' and `ps-zebra-stripe-height'."
2114 :type '(choice :menu-tag "Zebra Gray/Color" 2114 :type '(choice :menu-tag "Zebra Gray/Color"
2115 :tag "Zebra Gray/Color" 2115 :tag "Zebra Gray/Color"
@@ -2123,7 +2123,7 @@ See also documentation for `ps-zebra-stripes' and `ps-zebra-stripe-height'."
2123 :group 'ps-print-zebra) 2123 :group 'ps-print-zebra)
2124 2124
2125(defcustom ps-zebra-stripe-follow nil 2125(defcustom ps-zebra-stripe-follow nil
2126 "*Specify how zebra stripes continue on next page. 2126 "Specify how zebra stripes continue on next page.
2127 2127
2128Visually, valid values are (the character `+' at right of each column indicates 2128Visually, valid values are (the character `+' at right of each column indicates
2129that a line is printed): 2129that a line is printed):
@@ -2167,13 +2167,13 @@ Any other value is treated as nil."
2167 :group 'ps-print-zebra) 2167 :group 'ps-print-zebra)
2168 2168
2169(defcustom ps-line-number nil 2169(defcustom ps-line-number nil
2170 "*Non-nil means print line number." 2170 "Non-nil means print line number."
2171 :type 'boolean 2171 :type 'boolean
2172 :version "20" 2172 :version "20"
2173 :group 'ps-print-miscellany) 2173 :group 'ps-print-miscellany)
2174 2174
2175(defcustom ps-line-number-step 1 2175(defcustom ps-line-number-step 1
2176 "*Specify the interval that line number is printed. 2176 "Specify the interval that line number is printed.
2177 2177
2178For example, `ps-line-number-step' is set to 2, the printing will look like: 2178For example, `ps-line-number-step' is set to 2, the printing will look like:
2179 2179
@@ -2203,7 +2203,7 @@ Any other value is treated as `zebra'."
2203 :group 'ps-print-miscellany) 2203 :group 'ps-print-miscellany)
2204 2204
2205(defcustom ps-line-number-start 1 2205(defcustom ps-line-number-start 1
2206 "*Specify the starting point in the interval given by `ps-line-number-step'. 2206 "Specify the starting point in the interval given by `ps-line-number-step'.
2207 2207
2208For example, if `ps-line-number-step' is set to 3 and `ps-line-number-start' is 2208For example, if `ps-line-number-step' is set to 3 and `ps-line-number-start' is
2209set to 3, the printing will look like: 2209set to 3, the printing will look like:
@@ -2233,7 +2233,7 @@ The values for `ps-line-number-start':
2233 :group 'ps-print-miscellany) 2233 :group 'ps-print-miscellany)
2234 2234
2235(defcustom ps-print-background-image nil 2235(defcustom ps-print-background-image nil
2236 "*EPS image list to be printed on background. 2236 "EPS image list to be printed on background.
2237 2237
2238The elements are: 2238The elements are:
2239 2239
@@ -2280,7 +2280,7 @@ For example, if you wish to print an EPS image on all pages do:
2280 :group 'ps-print-background) 2280 :group 'ps-print-background)
2281 2281
2282(defcustom ps-print-background-text nil 2282(defcustom ps-print-background-text nil
2283 "*Text list to be printed on background. 2283 "Text list to be printed on background.
2284 2284
2285The elements are: 2285The elements are:
2286 2286
@@ -2340,19 +2340,19 @@ For example, if you wish to print text \"Preliminary\" on all pages do:
2340;; ------------------------------------------ 2340;; ------------------------------------------
2341 2341
2342(defcustom ps-left-margin (/ (* 72 2.0) 2.54) ; 2 cm 2342(defcustom ps-left-margin (/ (* 72 2.0) 2.54) ; 2 cm
2343 "*Left margin in points (1/72 inch)." 2343 "Left margin in points (1/72 inch)."
2344 :type 'number 2344 :type 'number
2345 :version "20" 2345 :version "20"
2346 :group 'ps-print-horizontal) 2346 :group 'ps-print-horizontal)
2347 2347
2348(defcustom ps-right-margin (/ (* 72 2.0) 2.54) ; 2 cm 2348(defcustom ps-right-margin (/ (* 72 2.0) 2.54) ; 2 cm
2349 "*Right margin in points (1/72 inch)." 2349 "Right margin in points (1/72 inch)."
2350 :type 'number 2350 :type 'number
2351 :version "20" 2351 :version "20"
2352 :group 'ps-print-horizontal) 2352 :group 'ps-print-horizontal)
2353 2353
2354(defcustom ps-inter-column (/ (* 72 2.0) 2.54) ; 2 cm 2354(defcustom ps-inter-column (/ (* 72 2.0) 2.54) ; 2 cm
2355 "*Horizontal space between columns in points (1/72 inch)." 2355 "Horizontal space between columns in points (1/72 inch)."
2356 :type 'number 2356 :type 'number
2357 :version "20" 2357 :version "20"
2358 :group 'ps-print-horizontal) 2358 :group 'ps-print-horizontal)
@@ -2372,25 +2372,25 @@ For example, if you wish to print text \"Preliminary\" on all pages do:
2372;; |--------| 2372;; |--------|
2373 2373
2374(defcustom ps-bottom-margin (/ (* 72 1.5) 2.54) ; 1.5 cm 2374(defcustom ps-bottom-margin (/ (* 72 1.5) 2.54) ; 1.5 cm
2375 "*Bottom margin in points (1/72 inch)." 2375 "Bottom margin in points (1/72 inch)."
2376 :type 'number 2376 :type 'number
2377 :version "20" 2377 :version "20"
2378 :group 'ps-print-vertical) 2378 :group 'ps-print-vertical)
2379 2379
2380(defcustom ps-top-margin (/ (* 72 1.5) 2.54) ; 1.5 cm 2380(defcustom ps-top-margin (/ (* 72 1.5) 2.54) ; 1.5 cm
2381 "*Top margin in points (1/72 inch)." 2381 "Top margin in points (1/72 inch)."
2382 :type 'number 2382 :type 'number
2383 :version "20" 2383 :version "20"
2384 :group 'ps-print-vertical) 2384 :group 'ps-print-vertical)
2385 2385
2386(defcustom ps-header-offset (/ (* 72 1.0) 2.54) ; 1.0 cm 2386(defcustom ps-header-offset (/ (* 72 1.0) 2.54) ; 1.0 cm
2387 "*Vertical space in points (1/72 inch) between the main text and the header." 2387 "Vertical space in points (1/72 inch) between the main text and the header."
2388 :type 'number 2388 :type 'number
2389 :version "20" 2389 :version "20"
2390 :group 'ps-print-vertical) 2390 :group 'ps-print-vertical)
2391 2391
2392(defcustom ps-header-line-pad 0.15 2392(defcustom ps-header-line-pad 0.15
2393 "*Portion of a header title line height to insert. 2393 "Portion of a header title line height to insert.
2394The insertion is done between the header frame and the text it contains, 2394The insertion is done between the header frame and the text it contains,
2395both in the vertical and horizontal directions." 2395both in the vertical and horizontal directions."
2396 :type 'number 2396 :type 'number
@@ -2398,13 +2398,13 @@ both in the vertical and horizontal directions."
2398 :group 'ps-print-vertical) 2398 :group 'ps-print-vertical)
2399 2399
2400(defcustom ps-footer-offset (/ (* 72 1.0) 2.54) ; 1.0 cm 2400(defcustom ps-footer-offset (/ (* 72 1.0) 2.54) ; 1.0 cm
2401 "*Vertical space in points (1/72 inch) between the main text and the footer." 2401 "Vertical space in points (1/72 inch) between the main text and the footer."
2402 :type 'number 2402 :type 'number
2403 :version "20" 2403 :version "20"
2404 :group 'ps-print-vertical) 2404 :group 'ps-print-vertical)
2405 2405
2406(defcustom ps-footer-line-pad 0.15 2406(defcustom ps-footer-line-pad 0.15
2407 "*Portion of a footer title line height to insert. 2407 "Portion of a footer title line height to insert.
2408The insertion is done between the footer frame and the text it contains, 2408The insertion is done between the footer frame and the text it contains,
2409both in the vertical and horizontal directions." 2409both in the vertical and horizontal directions."
2410 :type 'number 2410 :type 'number
@@ -2414,7 +2414,7 @@ both in the vertical and horizontal directions."
2414;;; Header/Footer setup 2414;;; Header/Footer setup
2415 2415
2416(defcustom ps-print-header t 2416(defcustom ps-print-header t
2417 "*Non-nil means print a header at the top of each page. 2417 "Non-nil means print a header at the top of each page.
2418By default, the header displays the buffer name, page number, and, if the 2418By default, the header displays the buffer name, page number, and, if the
2419buffer is visiting a file, the file's directory. Headers are customizable by 2419buffer is visiting a file, the file's directory. Headers are customizable by
2420changing variables `ps-left-header' and `ps-right-header'." 2420changing variables `ps-left-header' and `ps-right-header'."
@@ -2423,7 +2423,7 @@ changing variables `ps-left-header' and `ps-right-header'."
2423 :group 'ps-print-headers) 2423 :group 'ps-print-headers)
2424 2424
2425(defcustom ps-print-header-frame t 2425(defcustom ps-print-header-frame t
2426 "*Non-nil means draw a gaudy frame around the header." 2426 "Non-nil means draw a gaudy frame around the header."
2427 :type 'boolean 2427 :type 'boolean
2428 :version "20" 2428 :version "20"
2429 :group 'ps-print-headers) 2429 :group 'ps-print-headers)
@@ -2434,7 +2434,7 @@ changing variables `ps-left-header' and `ps-right-header'."
2434 (border-width . 0.4) 2434 (border-width . 0.4)
2435 (border-color . 0.0) 2435 (border-color . 0.0)
2436 (shadow-color . 0.0)) 2436 (shadow-color . 0.0))
2437 "*Specify header frame properties alist. 2437 "Specify header frame properties alist.
2438 2438
2439Valid frame properties are: 2439Valid frame properties are:
2440 2440
@@ -2509,13 +2509,13 @@ Don't change this alist directly, instead use customization, or `ps-value',
2509 :group 'ps-print-headers) 2509 :group 'ps-print-headers)
2510 2510
2511(defcustom ps-header-lines 2 2511(defcustom ps-header-lines 2
2512 "*Number of lines to display in page header, when generating PostScript." 2512 "Number of lines to display in page header, when generating PostScript."
2513 :type 'integer 2513 :type 'integer
2514 :version "20" 2514 :version "20"
2515 :group 'ps-print-headers) 2515 :group 'ps-print-headers)
2516 2516
2517(defcustom ps-print-footer nil 2517(defcustom ps-print-footer nil
2518 "*Non-nil means print a footer at the bottom of each page. 2518 "Non-nil means print a footer at the bottom of each page.
2519By default, the footer displays page number. 2519By default, the footer displays page number.
2520Footers are customizable by changing variables `ps-left-footer' and 2520Footers are customizable by changing variables `ps-left-footer' and
2521`ps-right-footer'." 2521`ps-right-footer'."
@@ -2524,7 +2524,7 @@ Footers are customizable by changing variables `ps-left-footer' and
2524 :group 'ps-print-headers) 2524 :group 'ps-print-headers)
2525 2525
2526(defcustom ps-print-footer-frame t 2526(defcustom ps-print-footer-frame t
2527 "*Non-nil means draw a gaudy frame around the footer." 2527 "Non-nil means draw a gaudy frame around the footer."
2528 :type 'boolean 2528 :type 'boolean
2529 :version "21.1" 2529 :version "21.1"
2530 :group 'ps-print-headers) 2530 :group 'ps-print-headers)
@@ -2535,7 +2535,7 @@ Footers are customizable by changing variables `ps-left-footer' and
2535 (border-width . 0.4) 2535 (border-width . 0.4)
2536 (border-color . 0.0) 2536 (border-color . 0.0)
2537 (shadow-color . 0.0)) 2537 (shadow-color . 0.0))
2538 "*Specify footer frame properties alist. 2538 "Specify footer frame properties alist.
2539 2539
2540Don't change this alist directly, instead use customization, or `ps-value', 2540Don't change this alist directly, instead use customization, or `ps-value',
2541`ps-get', `ps-put' and `ps-del' functions (see them for documentation). 2541`ps-get', `ps-put' and `ps-del' functions (see them for documentation).
@@ -2591,13 +2591,13 @@ See also `ps-header-frame-alist' for documentation."
2591 :group 'ps-print-headers) 2591 :group 'ps-print-headers)
2592 2592
2593(defcustom ps-footer-lines 2 2593(defcustom ps-footer-lines 2
2594 "*Number of lines to display in page footer, when generating PostScript." 2594 "Number of lines to display in page footer, when generating PostScript."
2595 :type 'integer 2595 :type 'integer
2596 :version "21.1" 2596 :version "21.1"
2597 :group 'ps-print-headers) 2597 :group 'ps-print-headers)
2598 2598
2599(defcustom ps-print-only-one-header nil 2599(defcustom ps-print-only-one-header nil
2600 "*Non-nil means print only one header/footer at the top/bottom of each page. 2600 "Non-nil means print only one header/footer at the top/bottom of each page.
2601This is useful when printing more than one column, so it is possible to have 2601This is useful when printing more than one column, so it is possible to have
2602only one header/footer over all columns or one header/footer per column. 2602only one header/footer over all columns or one header/footer per column.
2603See also `ps-print-header' and `ps-print-footer'." 2603See also `ps-print-header' and `ps-print-footer'."
@@ -2606,7 +2606,7 @@ See also `ps-print-header' and `ps-print-footer'."
2606 :group 'ps-print-headers) 2606 :group 'ps-print-headers)
2607 2607
2608(defcustom ps-switch-header 'duplex 2608(defcustom ps-switch-header 'duplex
2609 "*Specify if headers/footers are switched or not. 2609 "Specify if headers/footers are switched or not.
2610 2610
2611Valid values are: 2611Valid values are:
2612 2612
@@ -2629,7 +2629,7 @@ See also `ps-print-header' and `ps-print-footer'."
2629 :group 'ps-print-headers) 2629 :group 'ps-print-headers)
2630 2630
2631(defcustom ps-show-n-of-n t 2631(defcustom ps-show-n-of-n t
2632 "*Non-nil means show page numbers as N/M, meaning page N of M. 2632 "Non-nil means show page numbers as N/M, meaning page N of M.
2633NOTE: page numbers are displayed as part of headers, 2633NOTE: page numbers are displayed as part of headers,
2634 see variable `ps-print-header'." 2634 see variable `ps-print-header'."
2635 :type 'boolean 2635 :type 'boolean
@@ -2640,7 +2640,7 @@ NOTE: page numbers are displayed as part of headers,
2640 (if ps-windows-system 2640 (if ps-windows-system
2641 nil 2641 nil
2642 'lpr-switches) 2642 'lpr-switches)
2643 "*Specify who is responsible for setting duplex and page size. 2643 "Specify who is responsible for setting duplex and page size.
2644 2644
2645Valid values are: 2645Valid values are:
2646 2646
@@ -2674,7 +2674,7 @@ WARNING: The setpagedevice PostScript operator affects ghostview utility when
2674 2674
2675(defcustom ps-spool-duplex nil ; Not many people have duplex printers, 2675(defcustom ps-spool-duplex nil ; Not many people have duplex printers,
2676 ; so default to nil. 2676 ; so default to nil.
2677 "*Non-nil generates PostScript for a two-sided printer. 2677 "Non-nil generates PostScript for a two-sided printer.
2678For a duplex printer, the `ps-spool-*' and `ps-print-*' commands will insert 2678For a duplex printer, the `ps-spool-*' and `ps-print-*' commands will insert
2679blank pages as needed between print jobs so that the next buffer printed will 2679blank pages as needed between print jobs so that the next buffer printed will
2680start on the right page. Also, if headers are turned on, the headers will be 2680start on the right page. Also, if headers are turned on, the headers will be
@@ -2687,7 +2687,7 @@ See also `ps-spool-tumble'."
2687 :group 'ps-print-headers) 2687 :group 'ps-print-headers)
2688 2688
2689(defcustom ps-spool-tumble nil 2689(defcustom ps-spool-tumble nil
2690 "*Specify how the page images on opposite sides of a sheet are oriented. 2690 "Specify how the page images on opposite sides of a sheet are oriented.
2691If `ps-spool-tumble' is nil, produces output suitable for binding on the left 2691If `ps-spool-tumble' is nil, produces output suitable for binding on the left
2692or right. If `ps-spool-tumble' is non-nil, produces output suitable for 2692or right. If `ps-spool-tumble' is non-nil, produces output suitable for
2693binding at the top or bottom. 2693binding at the top or bottom.
@@ -2811,7 +2811,7 @@ It has effect only when `ps-spool-duplex' is non-nil."
2811 (space-width . 2.2) 2811 (space-width . 2.2)
2812 (avg-char-width . 4.10811)) 2812 (avg-char-width . 4.10811))
2813 ) 2813 )
2814 "*Font info database. 2814 "Font info database.
2815Each element comprises: font family (the key), name, bold, italic, bold-italic, 2815Each element comprises: font family (the key), name, bold, italic, bold-italic,
2816reference size, line height, space width, average character width. 2816reference size, line height, space width, average character width.
2817To get the info for another specific font (say Helvetica), do the following: 2817To get the info for another specific font (say Helvetica), do the following:
@@ -2857,13 +2857,13 @@ uses the fonts resident in your printer."
2857 :group 'ps-print-font) 2857 :group 'ps-print-font)
2858 2858
2859(defcustom ps-font-family 'Courier 2859(defcustom ps-font-family 'Courier
2860 "*Font family name for ordinary text, when generating PostScript." 2860 "Font family name for ordinary text, when generating PostScript."
2861 :type 'symbol 2861 :type 'symbol
2862 :version "20" 2862 :version "20"
2863 :group 'ps-print-font) 2863 :group 'ps-print-font)
2864 2864
2865(defcustom ps-font-size '(7 . 8.5) 2865(defcustom ps-font-size '(7 . 8.5)
2866 "*Font size, in points, for ordinary text, when generating PostScript. 2866 "Font size, in points, for ordinary text, when generating PostScript.
2867Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)." 2867Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2868 :type '(choice :menu-tag "Ordinary Text Font Size" 2868 :type '(choice :menu-tag "Ordinary Text Font Size"
2869 :tag "Ordinary Text Font Size" 2869 :tag "Ordinary Text Font Size"
@@ -2875,13 +2875,13 @@ Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2875 :group 'ps-print-font) 2875 :group 'ps-print-font)
2876 2876
2877(defcustom ps-header-font-family 'Helvetica 2877(defcustom ps-header-font-family 'Helvetica
2878 "*Font family name for text in the header, when generating PostScript." 2878 "Font family name for text in the header, when generating PostScript."
2879 :type 'symbol 2879 :type 'symbol
2880 :version "20" 2880 :version "20"
2881 :group 'ps-print-font) 2881 :group 'ps-print-font)
2882 2882
2883(defcustom ps-header-font-size '(10 . 12) 2883(defcustom ps-header-font-size '(10 . 12)
2884 "*Font size, in points, for text in the header, when generating PostScript. 2884 "Font size, in points, for text in the header, when generating PostScript.
2885Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)." 2885Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2886 :type '(choice :menu-tag "Header Font Size" 2886 :type '(choice :menu-tag "Header Font Size"
2887 :tag "Header Font Size" 2887 :tag "Header Font Size"
@@ -2893,7 +2893,7 @@ Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2893 :group 'ps-print-font) 2893 :group 'ps-print-font)
2894 2894
2895(defcustom ps-header-title-font-size '(12 . 14) 2895(defcustom ps-header-title-font-size '(12 . 14)
2896 "*Font size, in points, for the top line of text in header, in PostScript. 2896 "Font size, in points, for the top line of text in header, in PostScript.
2897Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)." 2897Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2898 :type '(choice :menu-tag "Header Title Font Size" 2898 :type '(choice :menu-tag "Header Title Font Size"
2899 :tag "Header Title Font Size" 2899 :tag "Header Title Font Size"
@@ -2905,13 +2905,13 @@ Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2905 :group 'ps-print-font) 2905 :group 'ps-print-font)
2906 2906
2907(defcustom ps-footer-font-family 'Helvetica 2907(defcustom ps-footer-font-family 'Helvetica
2908 "*Font family name for text in the footer, when generating PostScript." 2908 "Font family name for text in the footer, when generating PostScript."
2909 :type 'symbol 2909 :type 'symbol
2910 :version "21.1" 2910 :version "21.1"
2911 :group 'ps-print-font) 2911 :group 'ps-print-font)
2912 2912
2913(defcustom ps-footer-font-size '(10 . 12) 2913(defcustom ps-footer-font-size '(10 . 12)
2914 "*Font size, in points, for text in the footer, when generating PostScript. 2914 "Font size, in points, for text in the footer, when generating PostScript.
2915Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)." 2915Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2916 :type '(choice :menu-tag "Footer Font Size" 2916 :type '(choice :menu-tag "Footer Font Size"
2917 :tag "Footer Font Size" 2917 :tag "Footer Font Size"
@@ -2923,7 +2923,7 @@ Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2923 :group 'ps-print-font) 2923 :group 'ps-print-font)
2924 2924
2925(defcustom ps-line-number-color "black" 2925(defcustom ps-line-number-color "black"
2926 "*Specify color for line-number, when generating PostScript." 2926 "Specify color for line-number, when generating PostScript."
2927 :type '(choice :menu-tag "Line Number Color" 2927 :type '(choice :menu-tag "Line Number Color"
2928 :tag "Line Number Color" 2928 :tag "Line Number Color"
2929 (number :tag "Gray Scale" :value 0) 2929 (number :tag "Gray Scale" :value 0)
@@ -2937,14 +2937,14 @@ Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2937 :group 'ps-print-miscellany) 2937 :group 'ps-print-miscellany)
2938 2938
2939(defcustom ps-line-number-font "Times-Italic" 2939(defcustom ps-line-number-font "Times-Italic"
2940 "*Font for line-number, when generating PostScript." 2940 "Font for line-number, when generating PostScript."
2941 :type 'string 2941 :type 'string
2942 :version "20" 2942 :version "20"
2943 :group 'ps-print-font 2943 :group 'ps-print-font
2944 :group 'ps-print-miscellany) 2944 :group 'ps-print-miscellany)
2945 2945
2946(defcustom ps-line-number-font-size 6 2946(defcustom ps-line-number-font-size 6
2947 "*Font size, in points, for line number, when generating PostScript. 2947 "Font size, in points, for line number, when generating PostScript.
2948Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)." 2948Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2949 :type '(choice :menu-tag "Line Number Font Size" 2949 :type '(choice :menu-tag "Line Number Font Size"
2950 :tag "Line Number Font Size" 2950 :tag "Line Number Font Size"
@@ -2966,7 +2966,7 @@ Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE)."
2966 (or (fboundp 'x-color-values) ; Emacs 2966 (or (fboundp 'x-color-values) ; Emacs
2967 (fboundp 'color-instance-rgb-components)) 2967 (fboundp 'color-instance-rgb-components))
2968 ; XEmacs 2968 ; XEmacs
2969 "*Specify how buffer's text color is printed. 2969 "Specify how buffer's text color is printed.
2970 2970
2971Valid values are: 2971Valid values are:
2972 2972
@@ -2987,7 +2987,7 @@ Any other value is treated as t."
2987 :group 'ps-print-color) 2987 :group 'ps-print-color)
2988 2988
2989(defcustom ps-default-fg nil 2989(defcustom ps-default-fg nil
2990 "*RGB values of the default foreground color. 2990 "RGB values of the default foreground color.
2991 2991
2992The `ps-default-fg' variable contains the default foreground color used by 2992The `ps-default-fg' variable contains the default foreground color used by
2993ps-print, that is, if there is a face in a text that doesn't have a foreground 2993ps-print, that is, if there is a face in a text that doesn't have a foreground
@@ -3031,7 +3031,7 @@ nor black-white."
3031 :group 'ps-print-color) 3031 :group 'ps-print-color)
3032 3032
3033(defcustom ps-default-bg nil 3033(defcustom ps-default-bg nil
3034 "*RGB values of the default background color. 3034 "RGB values of the default background color.
3035 3035
3036The `ps-default-bg' variable contains the default background color used by 3036The `ps-default-bg' variable contains the default background color used by
3037ps-print, that is, if there is a face in a text that doesn't have a background 3037ps-print, that is, if there is a face in a text that doesn't have a background
@@ -3077,7 +3077,7 @@ See also `ps-use-face-background'."
3077 :group 'ps-print-color) 3077 :group 'ps-print-color)
3078 3078
3079(defcustom ps-fg-list nil 3079(defcustom ps-fg-list nil
3080 "*Specify foreground color list. 3080 "Specify foreground color list.
3081 3081
3082This list is used to chose a text foreground color which is different than the 3082This list is used to chose a text foreground color which is different than the
3083background color. It'll be used the first foreground color in `ps-fg-list' 3083background color. It'll be used the first foreground color in `ps-fg-list'
@@ -3119,7 +3119,7 @@ when `ps-print-color-p' (which see) is neither nil nor black-white."
3119 :group 'ps-print-color) 3119 :group 'ps-print-color)
3120 3120
3121(defcustom ps-fg-validate-p t 3121(defcustom ps-fg-validate-p t
3122 "*Non-nil means validate if foreground color is different than background. 3122 "Non-nil means validate if foreground color is different than background.
3123 3123
3124If text foreground and background colors are equals, no text will appear. 3124If text foreground and background colors are equals, no text will appear.
3125 3125
@@ -3129,7 +3129,7 @@ See also `ps-fg-list'."
3129 :group 'ps-print-color) 3129 :group 'ps-print-color)
3130 3130
3131(defcustom ps-auto-font-detect t 3131(defcustom ps-auto-font-detect t
3132 "*Non-nil means automatically detect bold/italic/underline face attributes. 3132 "Non-nil means automatically detect bold/italic/underline face attributes.
3133If nil, we rely solely on the lists `ps-bold-faces', `ps-italic-faces', and 3133If nil, we rely solely on the lists `ps-bold-faces', `ps-italic-faces', and
3134`ps-underlined-faces'." 3134`ps-underlined-faces'."
3135 :type 'boolean 3135 :type 'boolean
@@ -3146,7 +3146,7 @@ If nil, we rely solely on the lists `ps-bold-faces', `ps-italic-faces', and
3146 (font-lock-type-face "black" nil italic) 3146 (font-lock-type-face "black" nil italic)
3147 (font-lock-variable-name-face "black" nil bold italic) 3147 (font-lock-variable-name-face "black" nil bold italic)
3148 (font-lock-warning-face "black" nil bold italic)) 3148 (font-lock-warning-face "black" nil bold italic))
3149 "*Specify list of face attributes to print colors on black/white printers. 3149 "Specify list of face attributes to print colors on black/white printers.
3150 3150
3151The list elements are the same as defined on `ps-extend-face' (which see). 3151The list elements are the same as defined on `ps-extend-face' (which see).
3152 3152
@@ -3183,7 +3183,7 @@ This variable is used only when `ps-print-color-p' is set to `black-white'."
3183 font-lock-variable-name-face 3183 font-lock-variable-name-face
3184 font-lock-keyword-face 3184 font-lock-keyword-face
3185 font-lock-warning-face)) 3185 font-lock-warning-face))
3186 "*A list of the \(non-bold\) faces that should be printed in bold font. 3186 "A list of the \(non-bold\) faces that should be printed in bold font.
3187This applies to generating PostScript." 3187This applies to generating PostScript."
3188 :type '(repeat face) 3188 :type '(repeat face)
3189 :version "20" 3189 :version "20"
@@ -3196,7 +3196,7 @@ This applies to generating PostScript."
3196 font-lock-string-face 3196 font-lock-string-face
3197 font-lock-comment-face 3197 font-lock-comment-face
3198 font-lock-warning-face)) 3198 font-lock-warning-face))
3199 "*A list of the \(non-italic\) faces that should be printed in italic font. 3199 "A list of the \(non-italic\) faces that should be printed in italic font.
3200This applies to generating PostScript." 3200This applies to generating PostScript."
3201 :type '(repeat face) 3201 :type '(repeat face)
3202 :version "20" 3202 :version "20"
@@ -3207,14 +3207,14 @@ This applies to generating PostScript."
3207 '(font-lock-function-name-face 3207 '(font-lock-function-name-face
3208 font-lock-constant-face 3208 font-lock-constant-face
3209 font-lock-warning-face)) 3209 font-lock-warning-face))
3210 "*A list of the \(non-underlined\) faces that should be printed underlined. 3210 "A list of the \(non-underlined\) faces that should be printed underlined.
3211This applies to generating PostScript." 3211This applies to generating PostScript."
3212 :type '(repeat face) 3212 :type '(repeat face)
3213 :version "20" 3213 :version "20"
3214 :group 'ps-print-face) 3214 :group 'ps-print-face)
3215 3215
3216(defcustom ps-use-face-background nil 3216(defcustom ps-use-face-background nil
3217 "*Specify if face background should be used. 3217 "Specify if face background should be used.
3218 3218
3219Valid values are: 3219Valid values are:
3220 3220
@@ -3235,7 +3235,7 @@ Any other value will be treated as t."
3235 3235
3236(defcustom ps-left-header 3236(defcustom ps-left-header
3237 (list 'ps-get-buffer-name 'ps-header-dirpart) 3237 (list 'ps-get-buffer-name 'ps-header-dirpart)
3238 "*The items to display (each on a line) on the left part of the page header. 3238 "The items to display (each on a line) on the left part of the page header.
3239This applies to generating PostScript. 3239This applies to generating PostScript.
3240 3240
3241The value should be a list of strings and symbols, each representing an entry 3241The value should be a list of strings and symbols, each representing an entry
@@ -3260,7 +3260,7 @@ If symbols are unbounded, they are silently ignored."
3260(defcustom ps-right-header 3260(defcustom ps-right-header
3261 (list "/pagenumberstring load" 3261 (list "/pagenumberstring load"
3262 'ps-time-stamp-locale-default 'ps-time-stamp-hh:mm:ss) 3262 'ps-time-stamp-locale-default 'ps-time-stamp-hh:mm:ss)
3263 "*The items to display (each on a line) on the right part of the page header. 3263 "The items to display (each on a line) on the right part of the page header.
3264This applies to generating PostScript. 3264This applies to generating PostScript.
3265 3265
3266See the variable `ps-left-header' for a description of the format of this 3266See the variable `ps-left-header' for a description of the format of this
@@ -3290,7 +3290,7 @@ You can also create your own time stamp function by using `format-time-string'
3290 3290
3291(defcustom ps-left-footer 3291(defcustom ps-left-footer
3292 (list 'ps-get-buffer-name 'ps-header-dirpart) 3292 (list 'ps-get-buffer-name 'ps-header-dirpart)
3293 "*The items to display (each on a line) on the left part of the page footer. 3293 "The items to display (each on a line) on the left part of the page footer.
3294This applies to generating PostScript. 3294This applies to generating PostScript.
3295 3295
3296The value should be a list of strings and symbols, each representing an entry 3296The value should be a list of strings and symbols, each representing an entry
@@ -3315,7 +3315,7 @@ If symbols are unbounded, they are silently ignored."
3315(defcustom ps-right-footer 3315(defcustom ps-right-footer
3316 (list "/pagenumberstring load" 3316 (list "/pagenumberstring load"
3317 'ps-time-stamp-locale-default 'ps-time-stamp-hh:mm:ss) 3317 'ps-time-stamp-locale-default 'ps-time-stamp-hh:mm:ss)
3318 "*The items to display (each on a line) on the right part of the page footer. 3318 "The items to display (each on a line) on the right part of the page footer.
3319This applies to generating PostScript. 3319This applies to generating PostScript.
3320 3320
3321See the variable `ps-left-footer' for a description of the format of this 3321See the variable `ps-left-footer' for a description of the format of this
@@ -3344,13 +3344,13 @@ You can also create your own time stamp function by using `format-time-string'
3344 :group 'ps-print-headers) 3344 :group 'ps-print-headers)
3345 3345
3346(defcustom ps-razzle-dazzle t 3346(defcustom ps-razzle-dazzle t
3347 "*Non-nil means report progress while formatting buffer." 3347 "Non-nil means report progress while formatting buffer."
3348 :type 'boolean 3348 :type 'boolean
3349 :version "20" 3349 :version "20"
3350 :group 'ps-print-miscellany) 3350 :group 'ps-print-miscellany)
3351 3351
3352(defcustom ps-adobe-tag "%!PS-Adobe-3.0\n" 3352(defcustom ps-adobe-tag "%!PS-Adobe-3.0\n"
3353 "*Contains the header line identifying the output as PostScript. 3353 "Contains the header line identifying the output as PostScript.
3354By default, `ps-adobe-tag' contains the standard identifier. Some printers 3354By default, `ps-adobe-tag' contains the standard identifier. Some printers
3355require slightly different versions of this line." 3355require slightly different versions of this line."
3356 :type 'string 3356 :type 'string
@@ -3358,7 +3358,7 @@ require slightly different versions of this line."
3358 :group 'ps-print-miscellany) 3358 :group 'ps-print-miscellany)
3359 3359
3360(defcustom ps-build-face-reference t 3360(defcustom ps-build-face-reference t
3361 "*Non-nil means build the reference face lists. 3361 "Non-nil means build the reference face lists.
3362 3362
3363ps-print sets this value to nil after it builds its internal reference lists of 3363ps-print sets this value to nil after it builds its internal reference lists of
3364bold and italic faces. By setting its value back to t, you can force ps-print 3364bold and italic faces. By setting its value back to t, you can force ps-print
@@ -3373,7 +3373,7 @@ setting, though."
3373 :group 'ps-print-face) 3373 :group 'ps-print-face)
3374 3374
3375(defcustom ps-always-build-face-reference nil 3375(defcustom ps-always-build-face-reference nil
3376 "*Non-nil means always rebuild the reference face lists. 3376 "Non-nil means always rebuild the reference face lists.
3377 3377
3378If this variable is non-nil, ps-print will rebuild its internal reference lists 3378If this variable is non-nil, ps-print will rebuild its internal reference lists
3379of bold and italic faces *every* time one of the ...-with-faces commands is 3379of bold and italic faces *every* time one of the ...-with-faces commands is
@@ -3383,7 +3383,7 @@ called. Most users shouldn't need to set this variable."
3383 :group 'ps-print-face) 3383 :group 'ps-print-face)
3384 3384
3385(defcustom ps-banner-page-when-duplexing nil 3385(defcustom ps-banner-page-when-duplexing nil
3386 "*Non-nil means the very first page is skipped. 3386 "Non-nil means the very first page is skipped.
3387It's like the very first character of buffer (or region) is ^L (\\014)." 3387It's like the very first character of buffer (or region) is ^L (\\014)."
3388 :type 'boolean 3388 :type 'boolean
3389 :version "20" 3389 :version "20"
@@ -3399,14 +3399,14 @@ It's like the very first character of buffer (or region) is ^L (\\014)."
3399 nil)) 3399 nil))
3400 data-directory) ; Emacs 3400 data-directory) ; Emacs
3401 (error "`ps-postscript-code-directory' isn't set properly")) 3401 (error "`ps-postscript-code-directory' isn't set properly"))
3402 "*Directory where it's located the PostScript prologue file used by ps-print. 3402 "Directory where it's located the PostScript prologue file used by ps-print.
3403By default, this directory is the same as in the variable `data-directory'." 3403By default, this directory is the same as in the variable `data-directory'."
3404 :type 'directory 3404 :type 'directory
3405 :version "20" 3405 :version "20"
3406 :group 'ps-print-miscellany) 3406 :group 'ps-print-miscellany)
3407 3407
3408(defcustom ps-line-spacing 0 3408(defcustom ps-line-spacing 0
3409 "*Specify line spacing, in points, for ordinary text. 3409 "Specify line spacing, in points, for ordinary text.
3410 3410
3411Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE). 3411Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE).
3412 3412
@@ -3424,7 +3424,7 @@ To get all lines with some spacing set both `ps-line-spacing' and
3424 :group 'ps-print-miscellany) 3424 :group 'ps-print-miscellany)
3425 3425
3426(defcustom ps-paragraph-spacing 0 3426(defcustom ps-paragraph-spacing 0
3427 "*Specify paragraph spacing, in points, for ordinary text. 3427 "Specify paragraph spacing, in points, for ordinary text.
3428 3428
3429Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE). 3429Either a float or a cons of floats (LANDSCAPE-SIZE . PORTRAIT-SIZE).
3430 3430
@@ -3442,7 +3442,7 @@ To get all lines with some spacing set both `ps-line-spacing' and
3442 :group 'ps-print-miscellany) 3442 :group 'ps-print-miscellany)
3443 3443
3444(defcustom ps-paragraph-regexp "[ \t]*$" 3444(defcustom ps-paragraph-regexp "[ \t]*$"
3445 "*Specify paragraph delimiter. 3445 "Specify paragraph delimiter.
3446 3446
3447It should be a regexp or nil. 3447It should be a regexp or nil.
3448 3448
@@ -3454,7 +3454,7 @@ See also `ps-paragraph-spacing'."
3454 :group 'ps-print-miscellany) 3454 :group 'ps-print-miscellany)
3455 3455
3456(defcustom ps-begin-cut-regexp nil 3456(defcustom ps-begin-cut-regexp nil
3457 "*Specify regexp which is start of a region to cut out when printing. 3457 "Specify regexp which is start of a region to cut out when printing.
3458 3458
3459As an example, variables `ps-begin-cut-regexp' and `ps-end-cut-regexp' may be 3459As an example, variables `ps-begin-cut-regexp' and `ps-end-cut-regexp' may be
3460set to \"^Local Variables:\" and \"^End:\", respectively, in order to leave out 3460set to \"^Local Variables:\" and \"^End:\", respectively, in order to leave out
@@ -3472,7 +3472,7 @@ cutting occurs."
3472 :group 'ps-print-miscellany) 3472 :group 'ps-print-miscellany)
3473 3473
3474(defcustom ps-end-cut-regexp nil 3474(defcustom ps-end-cut-regexp nil
3475 "*Specify regexp which is end of the region to cut out when printing. 3475 "Specify regexp which is end of the region to cut out when printing.
3476 3476
3477See `ps-begin-cut-regexp' for more information." 3477See `ps-begin-cut-regexp' for more information."
3478 :type '(choice (const :tag "No Delimiter" nil) 3478 :type '(choice (const :tag "No Delimiter" nil)
@@ -6652,11 +6652,11 @@ If FACE is not a valid face name, use default face."
6652;; But autoload them here to make the separation invisible. 6652;; But autoload them here to make the separation invisible.
6653 6653
6654;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize 6654;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
6655;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "a17af1e83e9b0292c042c259cdccdde3") 6655;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "8611812e601bd374ad6c457dcedc9675")
6656;;; Generated autoloads from ps-mule.el 6656;;; Generated autoloads from ps-mule.el
6657 6657
6658(defvar ps-multibyte-buffer nil "\ 6658(defvar ps-multibyte-buffer nil "\
6659*Specifies the multi-byte buffer handling. 6659Specifies the multi-byte buffer handling.
6660 6660
6661Valid values are: 6661Valid values are:
6662 6662
diff --git a/lisp/replace.el b/lisp/replace.el
index 0b57ea35fc1..cd95f8cfb7b 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -28,7 +28,7 @@
28;;; Code: 28;;; Code:
29 29
30(defcustom case-replace t 30(defcustom case-replace t
31 "*Non-nil means `query-replace' should preserve case in replacements." 31 "Non-nil means `query-replace' should preserve case in replacements."
32 :type 'boolean 32 :type 'boolean
33 :group 'matching) 33 :group 'matching)
34 34
@@ -62,24 +62,24 @@ strings or patterns."
62 :version "20.3") 62 :version "20.3")
63 63
64(defcustom query-replace-skip-read-only nil 64(defcustom query-replace-skip-read-only nil
65 "*Non-nil means `query-replace' and friends ignore read-only matches." 65 "Non-nil means `query-replace' and friends ignore read-only matches."
66 :type 'boolean 66 :type 'boolean
67 :group 'matching 67 :group 'matching
68 :version "22.1") 68 :version "22.1")
69 69
70(defcustom query-replace-show-replacement t 70(defcustom query-replace-show-replacement t
71 "*Non-nil means to show what actual replacement text will be." 71 "Non-nil means to show what actual replacement text will be."
72 :type 'boolean 72 :type 'boolean
73 :group 'matching 73 :group 'matching
74 :version "23.1") 74 :version "23.1")
75 75
76(defcustom query-replace-highlight t 76(defcustom query-replace-highlight t
77 "*Non-nil means to highlight matches during query replacement." 77 "Non-nil means to highlight matches during query replacement."
78 :type 'boolean 78 :type 'boolean
79 :group 'matching) 79 :group 'matching)
80 80
81(defcustom query-replace-lazy-highlight t 81(defcustom query-replace-lazy-highlight t
82 "*Controls the lazy-highlighting during query replacements. 82 "Controls the lazy-highlighting during query replacements.
83When non-nil, all text in the buffer matching the current match 83When non-nil, all text in the buffer matching the current match
84is highlighted lazily using isearch lazy highlighting (see 84is highlighted lazily using isearch lazy highlighting (see
85`lazy-highlight-initial-delay' and `lazy-highlight-interval')." 85`lazy-highlight-initial-delay' and `lazy-highlight-interval')."
@@ -773,19 +773,19 @@ a previously found match."
773 "Auto Occurrence Display" 773 "Auto Occurrence Display"
774 "Display another occurrence when moving the cursor")) 774 "Display another occurrence when moving the cursor"))
775 (define-key map [separator-1] '("--")) 775 (define-key map [separator-1] '("--"))
776 (define-key map [kill-this-buffer] 776 (define-key map [kill-this-buffer]
777 '(menu-item "Kill occur buffer" kill-this-buffer 777 '(menu-item "Kill occur buffer" kill-this-buffer
778 :help "Kill the current *Occur* buffer")) 778 :help "Kill the current *Occur* buffer"))
779 (define-key map [quit-window] 779 (define-key map [quit-window]
780 '(menu-item "Quit occur window" quit-window 780 '(menu-item "Quit occur window" quit-window
781 :help "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame")) 781 :help "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame"))
782 (define-key map [revert-buffer] 782 (define-key map [revert-buffer]
783 '(menu-item "Revert occur buffer" revert-buffer 783 '(menu-item "Revert occur buffer" revert-buffer
784 :help "Replace the text in the *Occur* buffer with the results of rerunning occur")) 784 :help "Replace the text in the *Occur* buffer with the results of rerunning occur"))
785 (define-key map [clone-buffer] 785 (define-key map [clone-buffer]
786 '(menu-item "Clone occur buffer" clone-buffer 786 '(menu-item "Clone occur buffer" clone-buffer
787 :help "Create and return a twin copy of the current *Occur* buffer")) 787 :help "Create and return a twin copy of the current *Occur* buffer"))
788 (define-key map [occur-rename-buffer] 788 (define-key map [occur-rename-buffer]
789 '(menu-item "Rename occur buffer" occur-rename-buffer 789 '(menu-item "Rename occur buffer" occur-rename-buffer
790 :help "Rename the current *Occur* buffer to *Occur: original-buffer-name*.")) 790 :help "Rename the current *Occur* buffer to *Occur: original-buffer-name*."))
791 (define-key map [separator-2] '("--")) 791 (define-key map [separator-2] '("--"))
@@ -798,10 +798,10 @@ a previously found match."
798 (define-key map [occur-mode-display-occurrence] 798 (define-key map [occur-mode-display-occurrence]
799 '(menu-item "Display Occurrence" occur-mode-display-occurrence 799 '(menu-item "Display Occurrence" occur-mode-display-occurrence
800 :help "Display in another window the occurrence the current line describes")) 800 :help "Display in another window the occurrence the current line describes"))
801 (define-key map [occur-next] 801 (define-key map [occur-next]
802 '(menu-item "Move to next match" occur-next 802 '(menu-item "Move to next match" occur-next
803 :help "Move to the Nth (default 1) next match in an Occur mode buffer")) 803 :help "Move to the Nth (default 1) next match in an Occur mode buffer"))
804 (define-key map [occur-prev] 804 (define-key map [occur-prev]
805 '(menu-item "Move to previous match" occur-prev 805 '(menu-item "Move to previous match" occur-prev
806 :help "Move to the Nth (default 1) previous match in an Occur mode buffer")) 806 :help "Move to the Nth (default 1) previous match in an Occur mode buffer"))
807 map) 807 map)
@@ -970,7 +970,7 @@ Compatibility function for \\[next-error] invocations."
970 :version "22.1") 970 :version "22.1")
971 971
972(defcustom list-matching-lines-default-context-lines 0 972(defcustom list-matching-lines-default-context-lines 0
973 "*Default number of context lines included around `list-matching-lines' matches. 973 "Default number of context lines included around `list-matching-lines' matches.
974A negative number means to include that many lines before the match. 974A negative number means to include that many lines before the match.
975A positive number means to include that many lines both before and after." 975A positive number means to include that many lines both before and after."
976 :type 'integer 976 :type 'integer
@@ -979,13 +979,13 @@ A positive number means to include that many lines both before and after."
979(defalias 'list-matching-lines 'occur) 979(defalias 'list-matching-lines 'occur)
980 980
981(defcustom list-matching-lines-face 'match 981(defcustom list-matching-lines-face 'match
982 "*Face used by \\[list-matching-lines] to show the text that matches. 982 "Face used by \\[list-matching-lines] to show the text that matches.
983If the value is nil, don't highlight the matching portions specially." 983If the value is nil, don't highlight the matching portions specially."
984 :type 'face 984 :type 'face
985 :group 'matching) 985 :group 'matching)
986 986
987(defcustom list-matching-lines-buffer-name-face 'underline 987(defcustom list-matching-lines-buffer-name-face 'underline
988 "*Face used by \\[list-matching-lines] to show the names of buffers. 988 "Face used by \\[list-matching-lines] to show the names of buffers.
989If the value is nil, don't highlight the buffer names specially." 989If the value is nil, don't highlight the buffer names specially."
990 :type 'face 990 :type 'face
991 :group 'matching) 991 :group 'matching)
@@ -993,7 +993,7 @@ If the value is nil, don't highlight the buffer names specially."
993(defcustom occur-excluded-properties 993(defcustom occur-excluded-properties
994 '(read-only invisible intangible field mouse-face help-echo local-map keymap 994 '(read-only invisible intangible field mouse-face help-echo local-map keymap
995 yank-handler follow-link) 995 yank-handler follow-link)
996 "*Text properties to discard when copying lines to the *Occur* buffer. 996 "Text properties to discard when copying lines to the *Occur* buffer.
997The value should be a list of text properties to discard or t, 997The value should be a list of text properties to discard or t,
998which means to discard all text properties." 998which means to discard all text properties."
999 :type '(choice (const :tag "All" t) (repeat symbol)) 999 :type '(choice (const :tag "All" t) (repeat symbol))
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 7c6d50aba5b..289bc69bc55 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -119,7 +119,7 @@
119 :group 'convenience) 119 :group 'convenience)
120 120
121(defcustom ruler-mode-show-tab-stops nil 121(defcustom ruler-mode-show-tab-stops nil
122 "*If non-nil the ruler shows tab stop positions. 122 "If non-nil the ruler shows tab stop positions.
123Also allowing to visually change `tab-stop-list' setting using 123Also allowing to visually change `tab-stop-list' setting using
124<C-down-mouse-1> and <C-down-mouse-3> on the ruler to respectively add 124<C-down-mouse-1> and <C-down-mouse-3> on the ruler to respectively add
125or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or 125or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
@@ -141,7 +141,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
141(defcustom ruler-mode-fill-column-char (if (char-displayable-p ?¶) 141(defcustom ruler-mode-fill-column-char (if (char-displayable-p ?¶)
142 ?\¶ 142 ?\¶
143 ?\|) 143 ?\|)
144 "*Character used at the `fill-column' location." 144 "Character used at the `fill-column' location."
145 :group 'ruler-mode 145 :group 'ruler-mode
146 :type '(choice 146 :type '(choice
147 (character :tag "Character") 147 (character :tag "Character")
@@ -149,7 +149,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
149 :validate ruler-mode-character-validate))) 149 :validate ruler-mode-character-validate)))
150 150
151(defcustom ruler-mode-comment-column-char ?\# 151(defcustom ruler-mode-comment-column-char ?\#
152 "*Character used at the `comment-column' location." 152 "Character used at the `comment-column' location."
153 :group 'ruler-mode 153 :group 'ruler-mode
154 :type '(choice 154 :type '(choice
155 (character :tag "Character") 155 (character :tag "Character")
@@ -157,7 +157,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
157 :validate ruler-mode-character-validate))) 157 :validate ruler-mode-character-validate)))
158 158
159(defcustom ruler-mode-goal-column-char ?G 159(defcustom ruler-mode-goal-column-char ?G
160 "*Character used at the `goal-column' location." 160 "Character used at the `goal-column' location."
161 :group 'ruler-mode 161 :group 'ruler-mode
162 :type '(choice 162 :type '(choice
163 (character :tag "Character") 163 (character :tag "Character")
@@ -167,7 +167,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
167(defcustom ruler-mode-current-column-char (if (char-displayable-p ?¦) 167(defcustom ruler-mode-current-column-char (if (char-displayable-p ?¦)
168 ?\¦ 168 ?\¦
169 ?\@) 169 ?\@)
170 "*Character used at the `current-column' location." 170 "Character used at the `current-column' location."
171 :group 'ruler-mode 171 :group 'ruler-mode
172 :type '(choice 172 :type '(choice
173 (character :tag "Character") 173 (character :tag "Character")
@@ -175,7 +175,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
175 :validate ruler-mode-character-validate))) 175 :validate ruler-mode-character-validate)))
176 176
177(defcustom ruler-mode-tab-stop-char ?\T 177(defcustom ruler-mode-tab-stop-char ?\T
178 "*Character used at `tab-stop-list' locations." 178 "Character used at `tab-stop-list' locations."
179 :group 'ruler-mode 179 :group 'ruler-mode
180 :type '(choice 180 :type '(choice
181 (character :tag "Character") 181 (character :tag "Character")
@@ -183,7 +183,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
183 :validate ruler-mode-character-validate))) 183 :validate ruler-mode-character-validate)))
184 184
185(defcustom ruler-mode-basic-graduation-char ?\. 185(defcustom ruler-mode-basic-graduation-char ?\.
186 "*Character used for basic graduations." 186 "Character used for basic graduations."
187 :group 'ruler-mode 187 :group 'ruler-mode
188 :type '(choice 188 :type '(choice
189 (character :tag "Character") 189 (character :tag "Character")
@@ -191,7 +191,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
191 :validate ruler-mode-character-validate))) 191 :validate ruler-mode-character-validate)))
192 192
193(defcustom ruler-mode-inter-graduation-char ?\! 193(defcustom ruler-mode-inter-graduation-char ?\!
194 "*Character used for intermediate graduations." 194 "Character used for intermediate graduations."
195 :group 'ruler-mode 195 :group 'ruler-mode
196 :type '(choice 196 :type '(choice
197 (character :tag "Character") 197 (character :tag "Character")
@@ -199,7 +199,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
199 :validate ruler-mode-character-validate))) 199 :validate ruler-mode-character-validate)))
200 200
201(defcustom ruler-mode-set-goal-column-ding-flag t 201(defcustom ruler-mode-set-goal-column-ding-flag t
202 "*Non-nil means do `ding' when `goal-column' is set." 202 "Non-nil means do `ding' when `goal-column' is set."
203 :group 'ruler-mode 203 :group 'ruler-mode
204 :type 'boolean) 204 :type 'boolean)
205 205
@@ -664,7 +664,7 @@ Optional argument PROPS specifies other text properties to apply."
664 ;; Create an "clean" ruler. 664 ;; Create an "clean" ruler.
665 (ruler 665 (ruler
666 (propertize 666 (propertize
667 (string-to-multibyte 667 (string-to-multibyte
668 (make-string w ruler-mode-basic-graduation-char)) 668 (make-string w ruler-mode-basic-graduation-char))
669 'face 'ruler-mode-default 669 'face 'ruler-mode-default
670 'local-map ruler-mode-map 670 'local-map ruler-mode-map
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index fb1012f3f97..abca365e050 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -52,7 +52,7 @@ rather than the beginning of the buffer.
52This alist is saved between Emacs sessions.") 52This alist is saved between Emacs sessions.")
53 53
54(defcustom save-place nil 54(defcustom save-place nil
55 "*Non-nil means automatically save place in each file. 55 "Non-nil means automatically save place in each file.
56This means when you visit a file, point goes to the last place 56This means when you visit a file, point goes to the last place
57where it was when you previously visited the same file. 57where it was when you previously visited the same file.
58This variable is automatically buffer-local. 58This variable is automatically buffer-local.
@@ -71,12 +71,12 @@ or else use the Custom facility to set this option."
71(make-variable-buffer-local 'save-place) 71(make-variable-buffer-local 'save-place)
72 72
73(defcustom save-place-file (convert-standard-filename "~/.emacs-places") 73(defcustom save-place-file (convert-standard-filename "~/.emacs-places")
74 "*Name of the file that records `save-place-alist' value." 74 "Name of the file that records `save-place-alist' value."
75 :type 'file 75 :type 'file
76 :group 'save-place) 76 :group 'save-place)
77 77
78(defcustom save-place-version-control nil 78(defcustom save-place-version-control nil
79 "*Controls whether to make numbered backups of master save-place file. 79 "Controls whether to make numbered backups of master save-place file.
80It can have four values: t, nil, `never', and `nospecial'. The first 80It can have four values: t, nil, `never', and `nospecial'. The first
81three have the same meaning that they do for the variable 81three have the same meaning that they do for the variable
82`version-control', and the final value `nospecial' means just use the 82`version-control', and the final value `nospecial' means just use the
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index 5a2b42f4a47..9474b99f5c9 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -37,7 +37,7 @@
37 37
38;;; Code: 38;;; Code:
39(defcustom speedbar-use-images ezimage-use-images 39(defcustom speedbar-use-images ezimage-use-images
40 "*Non-nil if speedbar should display icons." 40 "Non-nil if speedbar should display icons."
41 :group 'speedbar 41 :group 'speedbar
42 :version "21.1" 42 :version "21.1"
43 :type 'boolean) 43 :type 'boolean)
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index f12e0b42b94..78352b6f3cd 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -94,7 +94,7 @@ This is nil while loading `scroll-bar.el', and t afterward.")
94 scroll-bar-mode))))) 94 scroll-bar-mode)))))
95 95
96(defcustom scroll-bar-mode default-frame-scroll-bars 96(defcustom scroll-bar-mode default-frame-scroll-bars
97 "*Specify whether to have vertical scroll bars, and on which side. 97 "Specify whether to have vertical scroll bars, and on which side.
98Possible values are nil (no scroll bars), `left' (scroll bars on left) 98Possible values are nil (no scroll bars), `left' (scroll bars on left)
99and `right' (scroll bars on right). 99and `right' (scroll bars on right).
100To set this variable in a Lisp program, use `set-scroll-bar-mode' 100To set this variable in a Lisp program, use `set-scroll-bar-mode'
@@ -122,7 +122,7 @@ turn off scroll bars; otherwise, turn on scroll bars."
122 (interactive "P") 122 (interactive "P")
123 123
124 ;; Tweedle the variable according to the argument. 124 ;; Tweedle the variable according to the argument.
125 (set-scroll-bar-mode (if (if (null flag) 125 (set-scroll-bar-mode (if (if (null flag)
126 (not scroll-bar-mode) 126 (not scroll-bar-mode)
127 (setq flag (prefix-numeric-value flag)) 127 (setq flag (prefix-numeric-value flag))
128 (or (not (numberp flag)) (>= flag 0))) 128 (or (not (numberp flag)) (>= flag 0)))
diff --git a/lisp/sha1.el b/lisp/sha1.el
index 2b082c1ccd3..db867bcd471 100644
--- a/lisp/sha1.el
+++ b/lisp/sha1.el
@@ -63,7 +63,7 @@
63 :group 'extensions) 63 :group 'extensions)
64 64
65(defcustom sha1-maximum-internal-length 500 65(defcustom sha1-maximum-internal-length 500
66 "*Maximum length of message to use Lisp version of SHA1 function. 66 "Maximum length of message to use Lisp version of SHA1 function.
67If message is longer than this, `sha1-program' is used instead. 67If message is longer than this, `sha1-program' is used instead.
68 68
69If this variable is set to 0, use external program only. 69If this variable is set to 0, use external program only.
@@ -72,7 +72,7 @@ If this variable is set to nil, use internal function only."
72 :group 'sha1) 72 :group 'sha1)
73 73
74(defcustom sha1-program '("sha1sum") 74(defcustom sha1-program '("sha1sum")
75 "*Name of program to compute SHA1. 75 "Name of program to compute SHA1.
76It must be a string \(program name\) or list of strings \(name and its args\)." 76It must be a string \(program name\) or list of strings \(name and its args\)."
77 :type '(repeat string) 77 :type '(repeat string)
78 :group 'sha1) 78 :group 'sha1)
@@ -80,7 +80,7 @@ It must be a string \(program name\) or list of strings \(name and its args\)."
80(defcustom sha1-use-external (condition-case () 80(defcustom sha1-use-external (condition-case ()
81 (executable-find (car sha1-program)) 81 (executable-find (car sha1-program))
82 (error)) 82 (error))
83 "*Use external SHA1 program. 83 "Use external SHA1 program.
84If this variable is set to nil, use internal function only." 84If this variable is set to nil, use internal function only."
85 :type 'boolean 85 :type 'boolean
86 :group 'sha1) 86 :group 'sha1)
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index f4f8f856896..751a33d260d 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -88,14 +88,14 @@
88 :group 'files) 88 :group 'files)
89 89
90(defcustom shadow-noquery nil 90(defcustom shadow-noquery nil
91 "*If t, always copy shadow files without asking. 91 "If t, always copy shadow files without asking.
92If nil \(the default), always ask. If not nil and not t, ask only if there 92If nil \(the default), always ask. If not nil and not t, ask only if there
93is no buffer currently visiting the file." 93is no buffer currently visiting the file."
94 :type '(choice (const t) (const nil) (other :tag "Ask if no buffer" maybe)) 94 :type '(choice (const t) (const nil) (other :tag "Ask if no buffer" maybe))
95 :group 'shadow) 95 :group 'shadow)
96 96
97(defcustom shadow-inhibit-message nil 97(defcustom shadow-inhibit-message nil
98 "*If non-nil, do not display a message when a file needs copying." 98 "If non-nil, do not display a message when a file needs copying."
99 :type 'boolean 99 :type 'boolean
100 :group 'shadow) 100 :group 'shadow)
101 101
diff --git a/lisp/shell.el b/lisp/shell.el
index 5c52788b858..5199b68cab6 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -355,7 +355,7 @@ Thus, this does not include the shell's current directory.")
355 'complete-expand))) 355 'complete-expand)))
356 356
357(defcustom shell-mode-hook '() 357(defcustom shell-mode-hook '()
358 "*Hook for customising Shell mode." 358 "Hook for customising Shell mode."
359 :type 'hook 359 :type 'hook
360 :group 'shell) 360 :group 'shell)
361 361
diff --git a/lisp/sort.el b/lisp/sort.el
index 02e45158df1..b1b64d89773 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -34,7 +34,7 @@
34 :group 'data) 34 :group 'data)
35 35
36(defcustom sort-fold-case nil 36(defcustom sort-fold-case nil
37 "*Non-nil if the buffer sort functions should ignore case." 37 "Non-nil if the buffer sort functions should ignore case."
38 :group 'sort 38 :group 'sort
39 :type 'boolean) 39 :type 'boolean)
40;;;###autoload(put 'sort-fold-case 'safe-local-variable 'booleanp) 40;;;###autoload(put 'sort-fold-case 'safe-local-variable 'booleanp)
@@ -256,7 +256,7 @@ the sort order."
256 (setq sort-fields-syntax-table table))) 256 (setq sort-fields-syntax-table table)))
257 257
258(defcustom sort-numeric-base 10 258(defcustom sort-numeric-base 10
259 "*The default base used by `sort-numeric-fields'." 259 "The default base used by `sort-numeric-fields'."
260 :group 'sort 260 :group 'sort
261 :type 'integer) 261 :type 'integer)
262;;;###autoload(put 'sort-numeric-base 'safe-local-variable 'integerp) 262;;;###autoload(put 'sort-numeric-base 'safe-local-variable 'integerp)
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index b3157b22025..24f13cb38c8 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -244,14 +244,14 @@ replaced this way. Replaceable functions must provide that
244functionality individually.") 244functionality individually.")
245 245
246(defcustom speedbar-mode-specific-contents-flag t 246(defcustom speedbar-mode-specific-contents-flag t
247 "*Non-nil means speedbar will show special mode contents. 247 "Non-nil means speedbar will show special mode contents.
248This permits some modes to create customized contents for the speedbar 248This permits some modes to create customized contents for the speedbar
249frame." 249frame."
250 :group 'speedbar 250 :group 'speedbar
251 :type 'boolean) 251 :type 'boolean)
252 252
253(defcustom speedbar-query-confirmation-method 'all 253(defcustom speedbar-query-confirmation-method 'all
254 "*Query control for file operations. 254 "Query control for file operations.
255The 'always flag means to always query before file operations. 255The 'always flag means to always query before file operations.
256The 'none-but-delete flag means to not query before any file 256The 'none-but-delete flag means to not query before any file
257operations, except before a file deletion." 257operations, except before a file deletion."
@@ -277,24 +277,24 @@ This keymap is local to each buffer that wants to define special keybindings
277effective when its display is shown.") 277effective when its display is shown.")
278 278
279(defcustom speedbar-before-visiting-file-hook '(push-mark) 279(defcustom speedbar-before-visiting-file-hook '(push-mark)
280 "*Hooks run before speedbar visits a file in the selected frame. 280 "Hooks run before speedbar visits a file in the selected frame.
281The default buffer is the buffer in the selected window in the attached frame." 281The default buffer is the buffer in the selected window in the attached frame."
282 :group 'speedbar 282 :group 'speedbar
283 :type 'hook) 283 :type 'hook)
284 284
285(defcustom speedbar-visiting-file-hook nil 285(defcustom speedbar-visiting-file-hook nil
286 "*Hooks run when speedbar visits a file in the selected frame." 286 "Hooks run when speedbar visits a file in the selected frame."
287 :group 'speedbar 287 :group 'speedbar
288 :type 'hook) 288 :type 'hook)
289 289
290(defcustom speedbar-before-visiting-tag-hook '(push-mark) 290(defcustom speedbar-before-visiting-tag-hook '(push-mark)
291 "*Hooks run before speedbar visits a tag in the selected frame. 291 "Hooks run before speedbar visits a tag in the selected frame.
292The default buffer is the buffer in the selected window in the attached frame." 292The default buffer is the buffer in the selected window in the attached frame."
293 :group 'speedbar 293 :group 'speedbar
294 :type 'hook) 294 :type 'hook)
295 295
296(defcustom speedbar-visiting-tag-hook '(speedbar-highlight-one-tag-line) 296(defcustom speedbar-visiting-tag-hook '(speedbar-highlight-one-tag-line)
297 "*Hooks run when speedbar visits a tag in the selected frame." 297 "Hooks run when speedbar visits a tag in the selected frame."
298 :group 'speedbar 298 :group 'speedbar
299 :type 'hook 299 :type 'hook
300 :options '(speedbar-highlight-one-tag-line 300 :options '(speedbar-highlight-one-tag-line
@@ -303,17 +303,17 @@ The default buffer is the buffer in the selected window in the attached frame."
303 )) 303 ))
304 304
305(defcustom speedbar-load-hook nil 305(defcustom speedbar-load-hook nil
306 "*Hooks run when speedbar is loaded." 306 "Hooks run when speedbar is loaded."
307 :group 'speedbar 307 :group 'speedbar
308 :type 'hook) 308 :type 'hook)
309 309
310(defcustom speedbar-reconfigure-keymaps-hook nil 310(defcustom speedbar-reconfigure-keymaps-hook nil
311 "*Hooks run when the keymaps are regenerated." 311 "Hooks run when the keymaps are regenerated."
312 :group 'speedbar 312 :group 'speedbar
313 :type 'hook) 313 :type 'hook)
314 314
315(defcustom speedbar-show-unknown-files nil 315(defcustom speedbar-show-unknown-files nil
316 "*Non-nil show files we can't expand with a ? in the expand button. 316 "Non-nil show files we can't expand with a ? in the expand button.
317A nil value means don't show the file in the list." 317A nil value means don't show the file in the list."
318 :group 'speedbar 318 :group 'speedbar
319 :type 'boolean) 319 :type 'boolean)
@@ -342,7 +342,7 @@ A nil value means don't show the file in the list."
342 (unsplittable . t) 342 (unsplittable . t)
343 (left-fringe . 0) 343 (left-fringe . 0)
344 ) 344 )
345 "*Parameters to use when creating the speedbar frame in Emacs. 345 "Parameters to use when creating the speedbar frame in Emacs.
346Any parameter supported by a frame may be added. The parameter `height' 346Any parameter supported by a frame may be added. The parameter `height'
347will be initialized to the height of the frame speedbar is 347will be initialized to the height of the frame speedbar is
348attached to and added to this list before the new frame is initialized." 348attached to and added to this list before the new frame is initialized."
@@ -359,7 +359,7 @@ attached to and added to this list before the new frame is initialized."
359 menubar-visible-p nil 359 menubar-visible-p nil
360 default-gutter-visible-p nil 360 default-gutter-visible-p nil
361 ) 361 )
362 "*Parameters to use when creating the speedbar frame in XEmacs. 362 "Parameters to use when creating the speedbar frame in XEmacs.
363Parameters not listed here which will be added automatically are 363Parameters not listed here which will be added automatically are
364`height' which will be initialized to the height of the frame speedbar 364`height' which will be initialized to the height of the frame speedbar
365is attached to." 365is attached to."
@@ -369,7 +369,7 @@ is attached to."
369 (sexp :tag "Value")))) 369 (sexp :tag "Value"))))
370 370
371(defcustom speedbar-use-imenu-flag (fboundp 'imenu) 371(defcustom speedbar-use-imenu-flag (fboundp 'imenu)
372 "*Non-nil means use imenu for file parsing, nil to use etags. 372 "Non-nil means use imenu for file parsing, nil to use etags.
373XEmacs prior to 20.4 doesn't support imenu, therefore the default is to 373XEmacs prior to 20.4 doesn't support imenu, therefore the default is to
374use etags instead. Etags support is not as robust as imenu support." 374use etags instead. Etags support is not as robust as imenu support."
375 :tag "Use Imenu for tags" 375 :tag "Use Imenu for tags"
@@ -396,12 +396,12 @@ display is used instead."
396 :type 'boolean) 396 :type 'boolean)
397 397
398(defcustom speedbar-track-mouse-flag (not speedbar-use-tool-tips-flag) 398(defcustom speedbar-track-mouse-flag (not speedbar-use-tool-tips-flag)
399 "*Non-nil means to display info about the line under the mouse." 399 "Non-nil means to display info about the line under the mouse."
400 :group 'speedbar 400 :group 'speedbar
401 :type 'boolean) 401 :type 'boolean)
402 402
403(defcustom speedbar-default-position 'left-right 403(defcustom speedbar-default-position 'left-right
404 "*Default position of the speedbar frame. 404 "Default position of the speedbar frame.
405Possible values are 'left, 'right or 'left-right. 405Possible values are 'left, 'right or 'left-right.
406If value is 'left-right, the most suitable location is 406If value is 'left-right, the most suitable location is
407determined automatically." 407determined automatically."
@@ -411,7 +411,7 @@ determined automatically."
411 (const :tag "Right" right))) 411 (const :tag "Right" right)))
412 412
413(defcustom speedbar-sort-tags nil 413(defcustom speedbar-sort-tags nil
414 "*If non-nil, sort tags in the speedbar display. *Obsolete*. 414 "If non-nil, sort tags in the speedbar display. *Obsolete*.
415Use `semantic-tag-hierarchy-method' instead." 415Use `semantic-tag-hierarchy-method' instead."
416 :group 'speedbar 416 :group 'speedbar
417 :type 'boolean) 417 :type 'boolean)
@@ -419,7 +419,7 @@ Use `semantic-tag-hierarchy-method' instead."
419(defcustom speedbar-tag-hierarchy-method 419(defcustom speedbar-tag-hierarchy-method
420 '(speedbar-prefix-group-tag-hierarchy 420 '(speedbar-prefix-group-tag-hierarchy
421 speedbar-trim-words-tag-hierarchy) 421 speedbar-trim-words-tag-hierarchy)
422 "*List of hooks which speedbar will use to organize tags into groups. 422 "List of hooks which speedbar will use to organize tags into groups.
423Groups are defined as expandable meta-tags. Imenu supports 423Groups are defined as expandable meta-tags. Imenu supports
424such things in some languages, such as separating variables from 424such things in some languages, such as separating variables from
425functions. Each hook takes one argument LST, and may destructively 425functions. Each hook takes one argument LST, and may destructively
@@ -439,7 +439,7 @@ or
439 ) 439 )
440 440
441(defcustom speedbar-tag-group-name-minimum-length 4 441(defcustom speedbar-tag-group-name-minimum-length 4
442 "*The minimum length of a prefix group name before expanding. 442 "The minimum length of a prefix group name before expanding.
443Thus, if the `speedbar-tag-hierarchy-method' includes `prefix-group' 443Thus, if the `speedbar-tag-hierarchy-method' includes `prefix-group'
444and one such groups common characters is less than this number of 444and one such groups common characters is less than this number of
445characters, then the group name will be changed to the form of: 445characters, then the group name will be changed to the form of:
@@ -451,14 +451,14 @@ This way we won't get silly looking listings."
451 :type 'integer) 451 :type 'integer)
452 452
453(defcustom speedbar-tag-split-minimum-length 20 453(defcustom speedbar-tag-split-minimum-length 20
454 "*Minimum length before we stop trying to create sub-lists in tags. 454 "Minimum length before we stop trying to create sub-lists in tags.
455This is used by all tag-hierarchy methods that break large lists into 455This is used by all tag-hierarchy methods that break large lists into
456sub-lists." 456sub-lists."
457 :group 'speedbar 457 :group 'speedbar
458 :type 'integer) 458 :type 'integer)
459 459
460(defcustom speedbar-tag-regroup-maximum-length 10 460(defcustom speedbar-tag-regroup-maximum-length 10
461 "*Maximum length of submenus that are regrouped. 461 "Maximum length of submenus that are regrouped.
462If the regrouping option is used, then if two or more short subgroups 462If the regrouping option is used, then if two or more short subgroups
463are next to each other, then they are combined until this number of 463are next to each other, then they are combined until this number of
464items is reached." 464items is reached."
@@ -466,7 +466,7 @@ items is reached."
466 :type 'integer) 466 :type 'integer)
467 467
468(defcustom speedbar-directory-button-trim-method 'span 468(defcustom speedbar-directory-button-trim-method 'span
469 "*Indicates how the directory button will be displayed. 469 "Indicates how the directory button will be displayed.
470Possible values are: 470Possible values are:
471 'span - span large directories over multiple lines. 471 'span - span large directories over multiple lines.
472 'trim - trim large directories to only show the last few. 472 'trim - trim large directories to only show the last few.
@@ -479,7 +479,7 @@ Possible values are:
479 (const :tag "No trimming." nil))) 479 (const :tag "No trimming." nil)))
480 480
481(defcustom speedbar-smart-directory-expand-flag t 481(defcustom speedbar-smart-directory-expand-flag t
482 "*Non-nil means speedbar should use smart expansion. 482 "Non-nil means speedbar should use smart expansion.
483Smart expansion only affects when speedbar wants to display a 483Smart expansion only affects when speedbar wants to display a
484directory for a file in the attached frame. When smart expansion is 484directory for a file in the attached frame. When smart expansion is
485enabled, new directories which are children of a displayed directory 485enabled, new directories which are children of a displayed directory
@@ -489,42 +489,42 @@ hierarchy would be replaced with the new directory."
489 :type 'boolean) 489 :type 'boolean)
490 490
491(defcustom speedbar-indentation-width 1 491(defcustom speedbar-indentation-width 1
492 "*When sub-nodes are expanded, the number of spaces used for indentation." 492 "When sub-nodes are expanded, the number of spaces used for indentation."
493 :group 'speedbar 493 :group 'speedbar
494 :type 'integer) 494 :type 'integer)
495 495
496(defcustom speedbar-hide-button-brackets-flag nil 496(defcustom speedbar-hide-button-brackets-flag nil
497 "*Non-nil means speedbar will hide the brackets around the + or -." 497 "Non-nil means speedbar will hide the brackets around the + or -."
498 :group 'speedbar 498 :group 'speedbar
499 :type 'boolean) 499 :type 'boolean)
500 500
501(defcustom speedbar-before-popup-hook nil 501(defcustom speedbar-before-popup-hook nil
502 "*Hooks called before popping up the speedbar frame." 502 "Hooks called before popping up the speedbar frame."
503 :group 'speedbar 503 :group 'speedbar
504 :type 'hook) 504 :type 'hook)
505 505
506(defcustom speedbar-after-create-hook '(speedbar-frame-reposition-smartly) 506(defcustom speedbar-after-create-hook '(speedbar-frame-reposition-smartly)
507 "*Hooks called after popping up the speedbar frame." 507 "Hooks called after popping up the speedbar frame."
508 :group 'speedbar 508 :group 'speedbar
509 :type 'hook) 509 :type 'hook)
510 510
511(defcustom speedbar-before-delete-hook nil 511(defcustom speedbar-before-delete-hook nil
512 "*Hooks called before deleting the speedbar frame." 512 "Hooks called before deleting the speedbar frame."
513 :group 'speedbar 513 :group 'speedbar
514 :type 'hook) 514 :type 'hook)
515 515
516(defcustom speedbar-mode-hook nil 516(defcustom speedbar-mode-hook nil
517 "*Hooks called after creating a speedbar buffer." 517 "Hooks called after creating a speedbar buffer."
518 :group 'speedbar 518 :group 'speedbar
519 :type 'hook) 519 :type 'hook)
520 520
521(defcustom speedbar-timer-hook nil 521(defcustom speedbar-timer-hook nil
522 "*Hooks called after running the speedbar timer function." 522 "Hooks called after running the speedbar timer function."
523 :group 'speedbar 523 :group 'speedbar
524 :type 'hook) 524 :type 'hook)
525 525
526(defcustom speedbar-verbosity-level 1 526(defcustom speedbar-verbosity-level 1
527 "*Verbosity level of the speedbar. 527 "Verbosity level of the speedbar.
5280 means say nothing. 5280 means say nothing.
5291 means medium level verbosity. 5291 means medium level verbosity.
5302 and higher are higher levels of verbosity." 5302 and higher are higher levels of verbosity."
@@ -535,7 +535,7 @@ hierarchy would be replaced with the new directory."
535 "String separating file text from indicator characters.") 535 "String separating file text from indicator characters.")
536 536
537(defcustom speedbar-vc-do-check t 537(defcustom speedbar-vc-do-check t
538 "*Non-nil check all files in speedbar to see if they have been checked out. 538 "Non-nil check all files in speedbar to see if they have been checked out.
539Any file checked out is marked with `speedbar-vc-indicator'." 539Any file checked out is marked with `speedbar-vc-indicator'."
540 :group 'speedbar-vc 540 :group 'speedbar-vc
541 :type 'boolean) 541 :type 'boolean)
@@ -546,14 +546,14 @@ Other version control systems can be added by examining the function
546`speedbar-vc-directory-enable-hook' and `speedbar-vc-in-control-hook'.") 546`speedbar-vc-directory-enable-hook' and `speedbar-vc-in-control-hook'.")
547 547
548(defcustom speedbar-vc-directory-enable-hook nil 548(defcustom speedbar-vc-directory-enable-hook nil
549 "*Return non-nil if the current directory should be checked for Version Control. 549 "Return non-nil if the current directory should be checked for Version Control.
550Functions in this hook must accept one parameter which is the directory 550Functions in this hook must accept one parameter which is the directory
551being checked." 551being checked."
552 :group 'speedbar-vc 552 :group 'speedbar-vc
553 :type 'hook) 553 :type 'hook)
554 554
555(defcustom speedbar-vc-in-control-hook nil 555(defcustom speedbar-vc-in-control-hook nil
556 "*Return non-nil if the specified file is under Version Control. 556 "Return non-nil if the specified file is under Version Control.
557Functions in this hook must accept two parameters. The DIRECTORY of the 557Functions in this hook must accept two parameters. The DIRECTORY of the
558current file, and the FILENAME of the file being checked." 558current file, and the FILENAME of the file being checked."
559 :group 'speedbar-vc 559 :group 'speedbar-vc
@@ -563,7 +563,7 @@ current file, and the FILENAME of the file being checked."
563 "Local variable maintaining the current version control check position.") 563 "Local variable maintaining the current version control check position.")
564 564
565(defcustom speedbar-obj-do-check t 565(defcustom speedbar-obj-do-check t
566 "*Non-nil check all files in speedbar to see if they have an object file. 566 "Non-nil check all files in speedbar to see if they have an object file.
567Any file checked out is marked with `speedbar-obj-indicator', and the 567Any file checked out is marked with `speedbar-obj-indicator', and the
568marking is based on `speedbar-obj-alist'" 568marking is based on `speedbar-obj-alist'"
569 :group 'speedbar-vc 569 :group 'speedbar-vc
@@ -609,7 +609,7 @@ The expression `speedbar-obj-alist' defines who gets tagged.")
609Permits stripping of indicator characters from a line.") 609Permits stripping of indicator characters from a line.")
610 610
611(defcustom speedbar-scanner-reset-hook nil 611(defcustom speedbar-scanner-reset-hook nil
612 "*Hook called whenever generic scanners are reset. 612 "Hook called whenever generic scanners are reset.
613Set this to implement your own scanning / rescan safe functions with 613Set this to implement your own scanning / rescan safe functions with
614state data." 614state data."
615 :group 'speedbar 615 :group 'speedbar
@@ -649,7 +649,7 @@ variable `speedbar-ignored-directory-expressions' to modify this variable.")
649 649
650(defcustom speedbar-ignored-directory-expressions 650(defcustom speedbar-ignored-directory-expressions
651 '("[/\\]logs?[/\\]\\'") 651 '("[/\\]logs?[/\\]\\'")
652 "*List of regular expressions matching directories speedbar will ignore. 652 "List of regular expressions matching directories speedbar will ignore.
653They should included directories which are notoriously very large 653They should included directories which are notoriously very large
654and take a long time to load in. Use the function 654and take a long time to load in. Use the function
655`speedbar-add-ignored-directory-regexp' to add new items to this list after 655`speedbar-add-ignored-directory-regexp' to add new items to this list after
@@ -663,7 +663,7 @@ before speedbar has been loaded."
663 (speedbar-extension-list-to-regex val)))) 663 (speedbar-extension-list-to-regex val))))
664 664
665(defcustom speedbar-directory-unshown-regexp "^\\(\\..*\\)\\'" 665(defcustom speedbar-directory-unshown-regexp "^\\(\\..*\\)\\'"
666 "*Regular expression matching directories not to show in speedbar. 666 "Regular expression matching directories not to show in speedbar.
667They should include commonly existing directories which are not 667They should include commonly existing directories which are not
668useful. It is no longer necessary to include version-control 668useful. It is no longer necessary to include version-control
669directories here; see `vc-directory-exclusion-list'." 669directories here; see `vc-directory-exclusion-list'."
@@ -697,7 +697,7 @@ function `speedbar-extension-list-to-regex'.")
697 ;; is available. Also, html files are nice to be able to see. 697 ;; is available. Also, html files are nice to be able to see.
698 ".s?html" 698 ".s?html"
699 ".ma?k" "[Mm]akefile\\(\\.in\\)?"))) 699 ".ma?k" "[Mm]akefile\\(\\.in\\)?")))
700 "*List of regular expressions which will match files supported by tagging. 700 "List of regular expressions which will match files supported by tagging.
701Do not prefix the `.' char with a double \\ to quote it, as the period 701Do not prefix the `.' char with a double \\ to quote it, as the period
702will be stripped by a simplified optimizer when compiled into a 702will be stripped by a simplified optimizer when compiled into a
703singular expression. This variable will be turned into 703singular expression. This variable will be turned into
@@ -3501,7 +3501,7 @@ TOKEN will be the list, and INDENT is the current indentation level."
3501;;; Loading files into the attached frame. 3501;;; Loading files into the attached frame.
3502;; 3502;;
3503(defcustom speedbar-select-frame-method 'attached 3503(defcustom speedbar-select-frame-method 'attached
3504 "*Specify how to select a frame for displaying a file. 3504 "Specify how to select a frame for displaying a file.
3505A value of 'attached means to use the attached frame (the frame 3505A value of 'attached means to use the attached frame (the frame
3506that speedbar was started from.) A number such as 1 or -1 means to 3506that speedbar was started from.) A number such as 1 or -1 means to
3507pass that number to `other-frame' while selecting a frame from speedbar." 3507pass that number to `other-frame' while selecting a frame from speedbar."
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 7d20298218c..3e50a694f56 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -214,18 +214,18 @@ static char * stroke_xpm[] = {
214 :group 'mouse) 214 :group 'mouse)
215 215
216(defcustom strokes-modeline-string " Strokes" 216(defcustom strokes-modeline-string " Strokes"
217 "*Modeline identification when Strokes mode is on \(default is \" Strokes\"\)." 217 "Modeline identification when Strokes mode is on \(default is \" Strokes\"\)."
218 :type 'string 218 :type 'string
219 :group 'strokes) 219 :group 'strokes)
220 220
221(defcustom strokes-character ?@ 221(defcustom strokes-character ?@
222 "*Character used when drawing strokes in the strokes buffer. 222 "Character used when drawing strokes in the strokes buffer.
223\(The default is `@', which works well.\)" 223\(The default is `@', which works well.\)"
224 :type 'character 224 :type 'character
225 :group 'strokes) 225 :group 'strokes)
226 226
227(defcustom strokes-minimum-match-score 1000 227(defcustom strokes-minimum-match-score 1000
228 "*Minimum score for a stroke to be considered a possible match. 228 "Minimum score for a stroke to be considered a possible match.
229Setting this variable to 0 would require a perfectly precise match. 229Setting this variable to 0 would require a perfectly precise match.
230The default value is 1000, but it's mostly dependent on how precisely 230The default value is 1000, but it's mostly dependent on how precisely
231you manage to replicate your user-defined strokes. It also depends on 231you manage to replicate your user-defined strokes. It also depends on
@@ -242,7 +242,7 @@ ones, then strokes should NOT pick the one that came closest."
242 :group 'strokes) 242 :group 'strokes)
243 243
244(defcustom strokes-grid-resolution 9 244(defcustom strokes-grid-resolution 9
245 "*Integer defining dimensions of the stroke grid. 245 "Integer defining dimensions of the stroke grid.
246The grid is a square grid, where `strokes-grid-resolution' defaults to 246The grid is a square grid, where `strokes-grid-resolution' defaults to
247`9', making a 9x9 grid whose coordinates go from (0 . 0) on the top 247`9', making a 9x9 grid whose coordinates go from (0 . 0) on the top
248left to ((strokes-grid-resolution - 1) . (strokes-grid-resolution - 1)) 248left to ((strokes-grid-resolution - 1) . (strokes-grid-resolution - 1))
@@ -259,7 +259,7 @@ WARNING: Changing the value of this variable will gravely affect the
259 :group 'strokes) 259 :group 'strokes)
260 260
261(defcustom strokes-file (convert-standard-filename "~/.strokes") 261(defcustom strokes-file (convert-standard-filename "~/.strokes")
262 "*File containing saved strokes for Strokes mode (default is ~/.strokes)." 262 "File containing saved strokes for Strokes mode (default is ~/.strokes)."
263 :type 'file 263 :type 'file
264 :group 'strokes) 264 :group 'strokes)
265 265
@@ -267,7 +267,7 @@ WARNING: Changing the value of this variable will gravely affect the
267 "The name of the buffer that the strokes take place in.") 267 "The name of the buffer that the strokes take place in.")
268 268
269(defcustom strokes-use-strokes-buffer t 269(defcustom strokes-use-strokes-buffer t
270 "*If non-nil, the strokes buffer is used and strokes are displayed. 270 "If non-nil, the strokes buffer is used and strokes are displayed.
271If nil, strokes will be read the same, however the user will not be 271If nil, strokes will be read the same, however the user will not be
272able to see the strokes. This be helpful for people who don't like 272able to see the strokes. This be helpful for people who don't like
273the delay in switching to the strokes buffer." 273the delay in switching to the strokes buffer."
diff --git a/lisp/tempo.el b/lisp/tempo.el
index dc47193d50e..1e894841719 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -114,14 +114,14 @@
114 :group 'tools) 114 :group 'tools)
115 115
116(defcustom tempo-interactive nil 116(defcustom tempo-interactive nil
117 "*Prompt user for strings in templates. 117 "Prompt user for strings in templates.
118If this variable is non-nil, `tempo-insert' prompts the 118If this variable is non-nil, `tempo-insert' prompts the
119user for text to insert in the templates." 119user for text to insert in the templates."
120 :type 'boolean 120 :type 'boolean
121 :group 'tempo) 121 :group 'tempo)
122 122
123(defcustom tempo-insert-region nil 123(defcustom tempo-insert-region nil
124 "*Automatically insert current region when there is a `r' in the template 124 "Automatically insert current region when there is a `r' in the template
125If this variable is nil, `r' elements will be treated just like `p' 125If this variable is nil, `r' elements will be treated just like `p'
126elements, unless the template function is given a prefix (or a non-nil 126elements, unless the template function is given a prefix (or a non-nil
127argument). If this variable is non-nil, the behavior is reversed. 127argument). If this variable is non-nil, the behavior is reversed.
@@ -131,13 +131,13 @@ In Transient Mark mode, this option is unused."
131 :group 'tempo) 131 :group 'tempo)
132 132
133(defcustom tempo-show-completion-buffer t 133(defcustom tempo-show-completion-buffer t
134 "*If non-nil, show a buffer with possible completions, when only 134 "If non-nil, show a buffer with possible completions, when only
135a partial completion can be found." 135a partial completion can be found."
136 :type 'boolean 136 :type 'boolean
137 :group 'tempo) 137 :group 'tempo)
138 138
139(defcustom tempo-leave-completion-buffer nil 139(defcustom tempo-leave-completion-buffer nil
140 "*If nil, a completion buffer generated by \\[tempo-complete-tag] 140 "If nil, a completion buffer generated by \\[tempo-complete-tag]
141disappears at the next keypress; otherwise, it remains forever." 141disappears at the next keypress; otherwise, it remains forever."
142 :type 'boolean 142 :type 'boolean
143 :group 'tempo) 143 :group 'tempo)
diff --git a/lisp/term.el b/lisp/term.el
index 3ab8069b408..c459e65faf4 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -478,7 +478,7 @@
478(defvar term-pager-old-filter) ;; Saved process-filter while paging. 478(defvar term-pager-old-filter) ;; Saved process-filter while paging.
479 479
480(defcustom explicit-shell-file-name nil 480(defcustom explicit-shell-file-name nil
481 "*If non-nil, is file name to use for explicitly requested inferior shell." 481 "If non-nil, is file name to use for explicitly requested inferior shell."
482 :type '(choice (const nil) file) 482 :type '(choice (const nil) file)
483 :group 'term) 483 :group 'term)
484 484
@@ -508,7 +508,7 @@ For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?\\;).
508This is a good thing to set in mode hooks.") 508This is a good thing to set in mode hooks.")
509 509
510(defcustom term-input-autoexpand nil 510(defcustom term-input-autoexpand nil
511 "*If non-nil, expand input command history references on completion. 511 "If non-nil, expand input command history references on completion.
512This mirrors the optional behavior of tcsh (its autoexpand and histlit). 512This mirrors the optional behavior of tcsh (its autoexpand and histlit).
513 513
514If the value is `input', then the expansion is seen on input. 514If the value is `input', then the expansion is seen on input.
@@ -521,7 +521,7 @@ This variable is buffer-local."
521 :group 'term) 521 :group 'term)
522 522
523(defcustom term-input-ignoredups nil 523(defcustom term-input-ignoredups nil
524 "*If non-nil, don't add input matching the last on the input ring. 524 "If non-nil, don't add input matching the last on the input ring.
525This mirrors the optional behavior of bash. 525This mirrors the optional behavior of bash.
526 526
527This variable is buffer-local." 527This variable is buffer-local."
@@ -529,7 +529,7 @@ This variable is buffer-local."
529 :group 'term) 529 :group 'term)
530 530
531(defcustom term-input-ring-file-name nil 531(defcustom term-input-ring-file-name nil
532 "*If non-nil, name of the file to read/write input history. 532 "If non-nil, name of the file to read/write input history.
533See also `term-read-input-ring' and `term-write-input-ring'. 533See also `term-read-input-ring' and `term-write-input-ring'.
534 534
535This variable is buffer-local, and is a good thing to set in mode hooks." 535This variable is buffer-local, and is a good thing to set in mode hooks."
@@ -537,7 +537,7 @@ This variable is buffer-local, and is a good thing to set in mode hooks."
537 :group 'term) 537 :group 'term)
538 538
539(defcustom term-scroll-to-bottom-on-output nil 539(defcustom term-scroll-to-bottom-on-output nil
540 "*Controls whether interpreter output causes window to scroll. 540 "Controls whether interpreter output causes window to scroll.
541If nil, then do not scroll. If t or `all', scroll all windows showing buffer. 541If nil, then do not scroll. If t or `all', scroll all windows showing buffer.
542If `this', scroll only the selected window. 542If `this', scroll only the selected window.
543If `others', scroll only those that are not the selected window. 543If `others', scroll only those that are not the selected window.
@@ -550,7 +550,7 @@ This variable is buffer-local."
550 :group 'term) 550 :group 'term)
551 551
552(defcustom term-scroll-show-maximum-output nil 552(defcustom term-scroll-show-maximum-output nil
553 "*Controls how interpreter output causes window to scroll. 553 "Controls how interpreter output causes window to scroll.
554If non-nil, then show the maximum output when the window is scrolled. 554If non-nil, then show the maximum output when the window is scrolled.
555 555
556See variable `term-scroll-to-bottom-on-output'. 556See variable `term-scroll-to-bottom-on-output'.
@@ -599,7 +599,7 @@ the user command `term-send-input'. `term-simple-send' just sends
599the string plus a newline.") 599the string plus a newline.")
600 600
601(defcustom term-eol-on-send t 601(defcustom term-eol-on-send t
602 "*Non-nil means go to the end of the line before sending input. 602 "Non-nil means go to the end of the line before sending input.
603See `term-send-input'." 603See `term-send-input'."
604 :type 'boolean 604 :type 'boolean
605 :group 'term) 605 :group 'term)
@@ -619,7 +619,7 @@ executed once when the buffer is created."
619 :type 'hook 619 :type 'hook
620 :group 'term) 620 :group 'term)
621 621
622(defvar term-mode-map 622(defvar term-mode-map
623 (let ((map (make-sparse-keymap))) 623 (let ((map (make-sparse-keymap)))
624 (define-key map "\ep" 'term-previous-input) 624 (define-key map "\ep" 'term-previous-input)
625 (define-key map "\en" 'term-next-input) 625 (define-key map "\en" 'term-next-input)
diff --git a/lisp/terminal.el b/lisp/terminal.el
index e584cc4a243..b1a79327c10 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -50,7 +50,7 @@
50 50
51 51
52(defcustom terminal-escape-char ?\C-^ 52(defcustom terminal-escape-char ?\C-^
53 "*All characters except for this are passed verbatim through the 53 "All characters except for this are passed verbatim through the
54terminal-emulator. This character acts as a prefix for commands 54terminal-emulator. This character acts as a prefix for commands
55to the emulator program itself. Type this character twice to send 55to the emulator program itself. Type this character twice to send
56it through the emulator. Type ? after typing it for a list of 56it through the emulator. Type ? after typing it for a list of
@@ -60,7 +60,7 @@ This variable is local to each terminal-emulator buffer."
60 :group 'terminal) 60 :group 'terminal)
61 61
62(defcustom terminal-scrolling t ;;>> Setting this to t sort-of defeats my whole aim in writing this package... 62(defcustom terminal-scrolling t ;;>> Setting this to t sort-of defeats my whole aim in writing this package...
63 "*If non-nil, the terminal-emulator will losingly `scroll' when output occurs 63 "If non-nil, the terminal-emulator will losingly `scroll' when output occurs
64past the bottom of the screen. If nil, output will win and `wrap' to the top 64past the bottom of the screen. If nil, output will win and `wrap' to the top
65of the screen. 65of the screen.
66This variable is local to each terminal-emulator buffer." 66This variable is local to each terminal-emulator buffer."
@@ -68,7 +68,7 @@ This variable is local to each terminal-emulator buffer."
68 :group 'terminal) 68 :group 'terminal)
69 69
70(defcustom terminal-more-processing t 70(defcustom terminal-more-processing t
71 "*If non-nil, do more-processing. 71 "If non-nil, do more-processing.
72This variable is local to each terminal-emulator buffer." 72This variable is local to each terminal-emulator buffer."
73 :type 'boolean 73 :type 'boolean
74 :group 'terminal) 74 :group 'terminal)
@@ -77,7 +77,7 @@ This variable is local to each terminal-emulator buffer."
77;; and expects to actually see anything, you should probably set this to 77;; and expects to actually see anything, you should probably set this to
78;; around 400 78;; around 400
79(defcustom terminal-redisplay-interval 5000 79(defcustom terminal-redisplay-interval 5000
80 "*Maximum number of characters which will be processed by the 80 "Maximum number of characters which will be processed by the
81terminal-emulator before a screen redisplay is forced. 81terminal-emulator before a screen redisplay is forced.
82Set this to a large value for greater throughput, 82Set this to a large value for greater throughput,
83set it smaller for more frequent updates but overall slower 83set it smaller for more frequent updates but overall slower
@@ -1062,7 +1062,7 @@ move to start of new line, clear to end of line."
1062;; and it's apparently not needed in BSD. 1062;; and it's apparently not needed in BSD.
1063 1063
1064(defcustom explicit-shell-file-name nil 1064(defcustom explicit-shell-file-name nil
1065 "*If non-nil, is file name to use for explicitly requested inferior shell." 1065 "If non-nil, is file name to use for explicitly requested inferior shell."
1066 :type '(choice (const :tag "None" nil) 1066 :type '(choice (const :tag "None" nil)
1067 file) 1067 file)
1068 :group 'terminal) 1068 :group 'terminal)
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index f3b778392a9..893e04c8004 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -44,7 +44,7 @@
44 :group 'extensions) 44 :group 'extensions)
45 45
46(defcustom time-stamp-format "%:y-%02m-%02d %02H:%02M:%02S %u" 46(defcustom time-stamp-format "%:y-%02m-%02d %02H:%02M:%02S %u"
47 "*Format of the string inserted by \\[time-stamp]. 47 "Format of the string inserted by \\[time-stamp].
48The value may be a string or a list. Lists are supported only for 48The value may be a string or a list. Lists are supported only for
49backward compatibility; see variable `time-stamp-old-format-warn'. 49backward compatibility; see variable `time-stamp-old-format-warn'.
50 50
@@ -94,7 +94,7 @@ historical default."
94;;;###autoload(put 'time-stamp-format 'safe-local-variable 'stringp) 94;;;###autoload(put 'time-stamp-format 'safe-local-variable 'stringp)
95 95
96(defcustom time-stamp-active t 96(defcustom time-stamp-active t
97 "*Non-nil to enable time-stamping of buffers by \\[time-stamp]. 97 "Non-nil to enable time-stamping of buffers by \\[time-stamp].
98Can be toggled by \\[time-stamp-toggle-active]. 98Can be toggled by \\[time-stamp-toggle-active].
99See also the variable `time-stamp-warn-inactive'." 99See also the variable `time-stamp-warn-inactive'."
100 :type 'boolean 100 :type 'boolean
@@ -267,7 +267,7 @@ The time stamp is updated only if the variable `time-stamp-active' is non-nil.
267The format of the time stamp is set by the variable `time-stamp-pattern' or 267The format of the time stamp is set by the variable `time-stamp-pattern' or
268`time-stamp-format'. The variables `time-stamp-pattern', 268`time-stamp-format'. The variables `time-stamp-pattern',
269`time-stamp-line-limit', `time-stamp-start', `time-stamp-end', 269`time-stamp-line-limit', `time-stamp-start', `time-stamp-end',
270`time-stamp-count', and `time-stamp-inserts-lines' control finding 270`time-stamp-count', and `time-stamp-inserts-lines' control finding
271the template." 271the template."
272 (interactive) 272 (interactive)
273 (let ((line-limit time-stamp-line-limit) 273 (let ((line-limit time-stamp-line-limit)
diff --git a/lisp/time.el b/lisp/time.el
index 8372419da84..3b1d2483dbf 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -37,7 +37,7 @@
37 37
38 38
39(defcustom display-time-mail-file nil 39(defcustom display-time-mail-file nil
40 "*File name of mail inbox file, for indicating existence of new mail. 40 "File name of mail inbox file, for indicating existence of new mail.
41Non-nil and not a string means don't check for mail; nil means use 41Non-nil and not a string means don't check for mail; nil means use
42default, which is system-dependent, and is the same as used by Rmail." 42default, which is system-dependent, and is the same as used by Rmail."
43 :type '(choice (const :tag "None" none) 43 :type '(choice (const :tag "None" none)
@@ -46,7 +46,7 @@ default, which is system-dependent, and is the same as used by Rmail."
46 :group 'display-time) 46 :group 'display-time)
47 47
48(defcustom display-time-mail-directory nil 48(defcustom display-time-mail-directory nil
49 "*Name of mail inbox directory, for indicating existence of new mail. 49 "Name of mail inbox directory, for indicating existence of new mail.
50Any nonempty regular file in the directory is regarded as newly arrived mail. 50Any nonempty regular file in the directory is regarded as newly arrived mail.
51If nil, do not check a directory for arriving mail." 51If nil, do not check a directory for arriving mail."
52 :type '(choice (const :tag "None" nil) 52 :type '(choice (const :tag "None" nil)
@@ -54,7 +54,7 @@ If nil, do not check a directory for arriving mail."
54 :group 'display-time) 54 :group 'display-time)
55 55
56(defcustom display-time-mail-function nil 56(defcustom display-time-mail-function nil
57 "*Function to call, for indicating existence of new mail. 57 "Function to call, for indicating existence of new mail.
58If nil, that means use the default method: check that the file 58If nil, that means use the default method: check that the file
59specified by `display-time-mail-file' is nonempty or that the 59specified by `display-time-mail-file' is nonempty or that the
60directory `display-time-mail-directory' contains nonempty files." 60directory `display-time-mail-directory' contains nonempty files."
@@ -63,7 +63,7 @@ directory `display-time-mail-directory' contains nonempty files."
63 :group 'display-time) 63 :group 'display-time)
64 64
65(defcustom display-time-default-load-average 0 65(defcustom display-time-default-load-average 0
66 "*Which load average value will be shown in the mode line. 66 "Which load average value will be shown in the mode line.
67Almost every system can provide values of load for past 1 minute, past 5 or 67Almost every system can provide values of load for past 1 minute, past 5 or
68past 15 minutes. The default is to display 1 minute load average." 68past 15 minutes. The default is to display 1 minute load average."
69 :type '(choice (const :tag "1 minute load" 0) 69 :type '(choice (const :tag "1 minute load" 0)
@@ -76,7 +76,7 @@ past 15 minutes. The default is to display 1 minute load average."
76 "Load average currently being shown in mode line.") 76 "Load average currently being shown in mode line.")
77 77
78(defcustom display-time-load-average-threshold 0.1 78(defcustom display-time-load-average-threshold 0.1
79 "*Load-average values below this value won't be shown in the mode line." 79 "Load-average values below this value won't be shown in the mode line."
80 :type 'number 80 :type 'number
81 :group 'display-time) 81 :group 'display-time)
82 82
@@ -89,12 +89,12 @@ past 15 minutes. The default is to display 1 minute load average."
89(defvar display-time-timer nil) 89(defvar display-time-timer nil)
90 90
91(defcustom display-time-interval 60 91(defcustom display-time-interval 60
92 "*Seconds between updates of time in the mode line." 92 "Seconds between updates of time in the mode line."
93 :type 'integer 93 :type 'integer
94 :group 'display-time) 94 :group 'display-time)
95 95
96(defcustom display-time-24hr-format nil 96(defcustom display-time-24hr-format nil
97 "*Non-nil indicates time should be displayed as hh:mm, 0 <= hh <= 23. 97 "Non-nil indicates time should be displayed as hh:mm, 0 <= hh <= 23.
98A value of nil means 1 <= hh <= 12, and an AM/PM suffix is used." 98A value of nil means 1 <= hh <= 12, and an AM/PM suffix is used."
99 :type 'boolean 99 :type 'boolean
100 :group 'display-time) 100 :group 'display-time)
@@ -102,7 +102,7 @@ A value of nil means 1 <= hh <= 12, and an AM/PM suffix is used."
102(defvar display-time-string nil) 102(defvar display-time-string nil)
103 103
104(defcustom display-time-hook nil 104(defcustom display-time-hook nil
105 "*List of functions to be called when the time is updated on the mode line." 105 "List of functions to be called when the time is updated on the mode line."
106 :type 'hook 106 :type 'hook
107 :group 'display-time) 107 :group 'display-time)
108 108
@@ -251,7 +251,7 @@ This can use the Unicode letter character if you can display it."
251 string)) 251 string))
252 252
253(defcustom display-time-format nil 253(defcustom display-time-format nil
254 "*String specifying format for displaying the time in the mode line. 254 "String specifying format for displaying the time in the mode line.
255See the function `format-time-string' for an explanation of 255See the function `format-time-string' for an explanation of
256how to write this string. If this is nil, the defaults 256how to write this string. If this is nil, the defaults
257depend on `display-time-day-and-date' and `display-time-24hr-format'." 257depend on `display-time-day-and-date' and `display-time-24hr-format'."
@@ -294,7 +294,7 @@ depend on `display-time-day-and-date' and `display-time-24hr-format'."
294 'local-map (make-mode-line-mouse-map 'mouse-2 294 'local-map (make-mode-line-mouse-map 'mouse-2
295 read-mail-command))) 295 read-mail-command)))
296 "")) 296 ""))
297 "*List of expressions governing display of the time in the mode line. 297 "List of expressions governing display of the time in the mode line.
298For most purposes, you can control the time format using `display-time-format' 298For most purposes, you can control the time format using `display-time-format'
299which is a more standard interface. 299which is a more standard interface.
300 300
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 3879b3c266e..1e772449de6 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -149,7 +149,7 @@ Emacs, and what `(locate-data-directory \"tree-widget\")' returns on
149XEmacs.") 149XEmacs.")
150 150
151(defcustom tree-widget-themes-directory "tree-widget" 151(defcustom tree-widget-themes-directory "tree-widget"
152 "*Name of the directory in which to look for an image theme. 152 "Name of the directory in which to look for an image theme.
153When nil use the directory where the tree-widget library is located. 153When nil use the directory where the tree-widget library is located.
154When it is a relative name, search in all occurrences of that sub 154When it is a relative name, search in all occurrences of that sub
155directory in the path specified by `tree-widget-themes-load-path'. 155directory in the path specified by `tree-widget-themes-load-path'.
@@ -160,7 +160,7 @@ The default is to use the \"tree-widget\" relative name."
160 :group 'tree-widget) 160 :group 'tree-widget)
161 161
162(defcustom tree-widget-theme nil 162(defcustom tree-widget-theme nil
163 "*Name of the theme in which to look for images. 163 "Name of the theme in which to look for images.
164This is a sub directory of the themes directory specified by the 164This is a sub directory of the themes directory specified by the
165`tree-widget-themes-directory' option. 165`tree-widget-themes-directory' option.
166The default theme is \"default\". When an image is not found in a 166The default theme is \"default\". When an image is not found in a
@@ -197,13 +197,13 @@ icon widgets used to draw the tree. By default these images are used:
197 197
198(defcustom tree-widget-image-properties-emacs 198(defcustom tree-widget-image-properties-emacs
199 '(:ascent center :mask (heuristic t)) 199 '(:ascent center :mask (heuristic t))
200 "*Default properties of Emacs images." 200 "Default properties of Emacs images."
201 :type 'plist 201 :type 'plist
202 :group 'tree-widget) 202 :group 'tree-widget)
203 203
204(defcustom tree-widget-image-properties-xemacs 204(defcustom tree-widget-image-properties-xemacs
205 nil 205 nil
206 "*Default properties of XEmacs images." 206 "Default properties of XEmacs images."
207 :type 'plist 207 :type 'plist
208 :group 'tree-widget) 208 :group 'tree-widget)
209 209
diff --git a/lisp/type-break.el b/lisp/type-break.el
index b8b6f48e6f2..5956a054269 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -86,13 +86,13 @@ use either \\[customize] or the function `type-break-mode'."
86 86
87;;;###autoload 87;;;###autoload
88(defcustom type-break-interval (* 60 60) 88(defcustom type-break-interval (* 60 60)
89 "*Number of seconds between scheduled typing breaks." 89 "Number of seconds between scheduled typing breaks."
90 :type 'integer 90 :type 'integer
91 :group 'type-break) 91 :group 'type-break)
92 92
93;;;###autoload 93;;;###autoload
94(defcustom type-break-good-rest-interval (/ type-break-interval 6) 94(defcustom type-break-good-rest-interval (/ type-break-interval 6)
95 "*Number of seconds of idle time considered to be an adequate typing rest. 95 "Number of seconds of idle time considered to be an adequate typing rest.
96 96
97When this variable is non-nil, Emacs checks the idle time between 97When this variable is non-nil, Emacs checks the idle time between
98keystrokes. If this idle time is long enough to be considered a \"good\" 98keystrokes. If this idle time is long enough to be considered a \"good\"
@@ -105,7 +105,7 @@ asked whether or not really to interrupt the break."
105 105
106;;;###autoload 106;;;###autoload
107(defcustom type-break-good-break-interval nil 107(defcustom type-break-good-break-interval nil
108 "*Number of seconds considered to be an adequate explicit typing rest. 108 "Number of seconds considered to be an adequate explicit typing rest.
109 109
110When this variable is non-nil, its value is considered to be a \"good\" 110When this variable is non-nil, its value is considered to be a \"good\"
111length (in seconds) for a break initiated by the command `type-break', 111length (in seconds) for a break initiated by the command `type-break',
@@ -129,7 +129,7 @@ break interruptions when `type-break-good-rest-interval' is nil."
129 (upper (* wpm avg-word-length (/ type-break-interval 60))) 129 (upper (* wpm avg-word-length (/ type-break-interval 60)))
130 (lower (/ upper 5))) 130 (lower (/ upper 5)))
131 (cons lower upper)) 131 (cons lower upper))
132 "*Upper and lower bound on number of keystrokes for considering typing break. 132 "Upper and lower bound on number of keystrokes for considering typing break.
133This structure is a pair of numbers (MIN . MAX). 133This structure is a pair of numbers (MIN . MAX).
134 134
135The first number is the minimum number of keystrokes that must have been 135The first number is the minimum number of keystrokes that must have been
@@ -153,14 +153,14 @@ guess a reasonably good pair of values for this variable."
153 :group 'type-break) 153 :group 'type-break)
154 154
155(defcustom type-break-query-mode t 155(defcustom type-break-query-mode t
156 "*Non-nil means ask whether or not to prompt user for breaks. 156 "Non-nil means ask whether or not to prompt user for breaks.
157If so, call the function specified in the value of the variable 157If so, call the function specified in the value of the variable
158`type-break-query-function' to do the asking." 158`type-break-query-function' to do the asking."
159 :type 'boolean 159 :type 'boolean
160 :group 'type-break) 160 :group 'type-break)
161 161
162(defcustom type-break-query-function 'yes-or-no-p 162(defcustom type-break-query-function 'yes-or-no-p
163 "*Function to use for making query for a typing break. 163 "Function to use for making query for a typing break.
164It should take a string as an argument, the prompt. 164It should take a string as an argument, the prompt.
165Usually this should be set to `yes-or-no-p' or `y-or-n-p'. 165Usually this should be set to `yes-or-no-p' or `y-or-n-p'.
166 166
@@ -171,21 +171,21 @@ To avoid being queried at all, set `type-break-query-mode' to nil."
171 :group 'type-break) 171 :group 'type-break)
172 172
173(defcustom type-break-query-interval 60 173(defcustom type-break-query-interval 60
174 "*Number of seconds between queries to take a break, if put off. 174 "Number of seconds between queries to take a break, if put off.
175The user will continue to be prompted at this interval until he or she 175The user will continue to be prompted at this interval until he or she
176finally submits to taking a typing break." 176finally submits to taking a typing break."
177 :type 'integer 177 :type 'integer
178 :group 'type-break) 178 :group 'type-break)
179 179
180(defcustom type-break-time-warning-intervals '(300 120 60 30) 180(defcustom type-break-time-warning-intervals '(300 120 60 30)
181 "*List of time intervals for warnings about upcoming typing break. 181 "List of time intervals for warnings about upcoming typing break.
182At each of the intervals (specified in seconds) away from a scheduled 182At each of the intervals (specified in seconds) away from a scheduled
183typing break, print a warning in the echo area." 183typing break, print a warning in the echo area."
184 :type '(repeat integer) 184 :type '(repeat integer)
185 :group 'type-break) 185 :group 'type-break)
186 186
187(defcustom type-break-keystroke-warning-intervals '(300 200 100 50) 187(defcustom type-break-keystroke-warning-intervals '(300 200 100 50)
188 "*List of keystroke measurements for warnings about upcoming typing break. 188 "List of keystroke measurements for warnings about upcoming typing break.
189At each of the intervals (specified in keystrokes) away from the upper 189At each of the intervals (specified in keystrokes) away from the upper
190keystroke threshold, print a warning in the echo area. 190keystroke threshold, print a warning in the echo area.
191If either this variable or the upper threshold is set, then no warnings 191If either this variable or the upper threshold is set, then no warnings
@@ -194,21 +194,21 @@ will occur."
194 :group 'type-break) 194 :group 'type-break)
195 195
196(defcustom type-break-warning-repeat 40 196(defcustom type-break-warning-repeat 40
197 "*Number of keystrokes for which warnings should be repeated. 197 "Number of keystrokes for which warnings should be repeated.
198That is, for each of this many keystrokes the warning is redisplayed 198That is, for each of this many keystrokes the warning is redisplayed
199in the echo area to make sure it's really seen." 199in the echo area to make sure it's really seen."
200 :type 'integer 200 :type 'integer
201 :group 'type-break) 201 :group 'type-break)
202 202
203(defcustom type-break-time-stamp-format "[%H:%M] " 203(defcustom type-break-time-stamp-format "[%H:%M] "
204 "*Timestamp format used to prefix messages. 204 "Timestamp format used to prefix messages.
205Format specifiers are as used by `format-time-string'." 205Format specifiers are as used by `format-time-string'."
206 :type 'string 206 :type 'string
207 :group 'type-break) 207 :group 'type-break)
208 208
209(defcustom type-break-demo-functions 209(defcustom type-break-demo-functions
210 '(type-break-demo-boring type-break-demo-life type-break-demo-hanoi) 210 '(type-break-demo-boring type-break-demo-life type-break-demo-hanoi)
211 "*List of functions to consider running as demos during typing breaks. 211 "List of functions to consider running as demos during typing breaks.
212When a typing break begins, one of these functions is selected randomly 212When a typing break begins, one of these functions is selected randomly
213to have Emacs do something interesting. 213to have Emacs do something interesting.
214 214
@@ -218,17 +218,17 @@ key is pressed."
218 :group 'type-break) 218 :group 'type-break)
219 219
220(defcustom type-break-demo-boring-stats nil 220(defcustom type-break-demo-boring-stats nil
221 "*Show word per minute and keystroke figures in the Boring demo." 221 "Show word per minute and keystroke figures in the Boring demo."
222 :type 'boolean 222 :type 'boolean
223 :group 'type-break) 223 :group 'type-break)
224 224
225(defcustom type-break-terse-messages nil 225(defcustom type-break-terse-messages nil
226 "*Use slightly terser messages." 226 "Use slightly terser messages."
227 :type 'boolean 227 :type 'boolean
228 :group 'type-break) 228 :group 'type-break)
229 229
230(defcustom type-break-file-name (convert-standard-filename "~/.type-break") 230(defcustom type-break-file-name (convert-standard-filename "~/.type-break")
231 "*Name of file used to save state across sessions. 231 "Name of file used to save state across sessions.
232If this is nil, no data will be saved across sessions." 232If this is nil, no data will be saved across sessions."
233 :type 'file 233 :type 'file
234 :group 'type-break) 234 :group 'type-break)
@@ -246,7 +246,7 @@ remove themselves after running.")
246;; Mode line frobs 246;; Mode line frobs
247 247
248(defcustom type-break-mode-line-message-mode nil 248(defcustom type-break-mode-line-message-mode nil
249 "*Non-nil means put type-break related messages in the mode line. 249 "Non-nil means put type-break related messages in the mode line.
250Otherwise, messages typically go in the echo area. 250Otherwise, messages typically go in the echo area.
251 251
252See also `type-break-mode-line-format' and its members." 252See also `type-break-mode-line-format' and its members."
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 1e47a6543f2..441b2cab370 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -60,7 +60,7 @@
60;;; 60;;;
61 61
62(defcustom vc-cvs-global-switches nil 62(defcustom vc-cvs-global-switches nil
63 "*Global switches to pass to any CVS command." 63 "Global switches to pass to any CVS command."
64 :type '(choice (const :tag "None" nil) 64 :type '(choice (const :tag "None" nil)
65 (string :tag "Argument String") 65 (string :tag "Argument String")
66 (repeat :tag "Argument List" 66 (repeat :tag "Argument List"
@@ -70,7 +70,7 @@
70 :group 'vc) 70 :group 'vc)
71 71
72(defcustom vc-cvs-register-switches nil 72(defcustom vc-cvs-register-switches nil
73 "*Extra switches for registering a file into CVS. 73 "Extra switches for registering a file into CVS.
74A string or list of strings passed to the checkin program by 74A string or list of strings passed to the checkin program by
75\\[vc-register]." 75\\[vc-register]."
76 :type '(choice (const :tag "None" nil) 76 :type '(choice (const :tag "None" nil)
@@ -82,7 +82,7 @@ A string or list of strings passed to the checkin program by
82 :group 'vc) 82 :group 'vc)
83 83
84(defcustom vc-cvs-diff-switches nil 84(defcustom vc-cvs-diff-switches nil
85 "*A string or list of strings specifying extra switches for cvs diff under VC." 85 "A string or list of strings specifying extra switches for cvs diff under VC."
86 :type '(choice (const :tag "None" nil) 86 :type '(choice (const :tag "None" nil)
87 (string :tag "Argument String") 87 (string :tag "Argument String")
88 (repeat :tag "Argument List" 88 (repeat :tag "Argument List"
@@ -92,13 +92,13 @@ A string or list of strings passed to the checkin program by
92 :group 'vc) 92 :group 'vc)
93 93
94(defcustom vc-cvs-header (or (cdr (assoc 'CVS vc-header-alist)) '("\$Id\$")) 94(defcustom vc-cvs-header (or (cdr (assoc 'CVS vc-header-alist)) '("\$Id\$"))
95 "*Header keywords to be inserted by `vc-insert-headers'." 95 "Header keywords to be inserted by `vc-insert-headers'."
96 :version "21.1" 96 :version "21.1"
97 :type '(repeat string) 97 :type '(repeat string)
98 :group 'vc) 98 :group 'vc)
99 99
100(defcustom vc-cvs-use-edit t 100(defcustom vc-cvs-use-edit t
101 "*Non-nil means to use `cvs edit' to \"check out\" a file. 101 "Non-nil means to use `cvs edit' to \"check out\" a file.
102This is only meaningful if you don't use the implicit checkout model 102This is only meaningful if you don't use the implicit checkout model
103\(i.e. if you have $CVSREAD set)." 103\(i.e. if you have $CVSREAD set)."
104 :type 'boolean 104 :type 'boolean
@@ -106,7 +106,7 @@ This is only meaningful if you don't use the implicit checkout model
106 :group 'vc) 106 :group 'vc)
107 107
108(defcustom vc-cvs-stay-local 'only-file 108(defcustom vc-cvs-stay-local 'only-file
109 "*Non-nil means use local operations when possible for remote repositories. 109 "Non-nil means use local operations when possible for remote repositories.
110This avoids slow queries over the network and instead uses heuristics 110This avoids slow queries over the network and instead uses heuristics
111and past information to determine the current status of a file. 111and past information to determine the current status of a file.
112 112
@@ -131,7 +131,7 @@ by these regular expressions."
131 :group 'vc) 131 :group 'vc)
132 132
133(defcustom vc-cvs-sticky-date-format-string "%c" 133(defcustom vc-cvs-sticky-date-format-string "%c"
134 "*Format string for mode-line display of sticky date. 134 "Format string for mode-line display of sticky date.
135Format is according to `format-time-string'. Only used if 135Format is according to `format-time-string'. Only used if
136`vc-cvs-sticky-tag-display' is t." 136`vc-cvs-sticky-tag-display' is t."
137 :type '(string) 137 :type '(string)
@@ -139,7 +139,7 @@ Format is according to `format-time-string'. Only used if
139 :group 'vc) 139 :group 'vc)
140 140
141(defcustom vc-cvs-sticky-tag-display t 141(defcustom vc-cvs-sticky-tag-display t
142 "*Specify the mode-line display of sticky tags. 142 "Specify the mode-line display of sticky tags.
143Value t means default display, nil means no display at all. If the 143Value t means default display, nil means no display at all. If the
144value is a function or macro, it is called with the sticky tag and 144value is a function or macro, it is called with the sticky tag and
145its' type as parameters, in that order. TYPE can have three different 145its' type as parameters, in that order. TYPE can have three different
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 4c538d91ddd..8d40cf8aa49 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -117,7 +117,7 @@
117;;; Customization options 117;;; Customization options
118 118
119(defcustom vc-hg-global-switches nil 119(defcustom vc-hg-global-switches nil
120 "*Global switches to pass to any Hg command." 120 "Global switches to pass to any Hg command."
121 :type '(choice (const :tag "None" nil) 121 :type '(choice (const :tag "None" nil)
122 (string :tag "Argument String") 122 (string :tag "Argument String")
123 (repeat :tag "Argument List" 123 (repeat :tag "Argument List"
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 32c7b99b41b..fcfda057f0b 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -61,7 +61,7 @@
61;;; 61;;;
62 62
63(defcustom vc-mcvs-global-switches nil 63(defcustom vc-mcvs-global-switches nil
64 "*Global switches to pass to any Meta-CVS command." 64 "Global switches to pass to any Meta-CVS command."
65 :type '(choice (const :tag "None" nil) 65 :type '(choice (const :tag "None" nil)
66 (string :tag "Argument String") 66 (string :tag "Argument String")
67 (repeat :tag "Argument List" 67 (repeat :tag "Argument List"
@@ -71,7 +71,7 @@
71 :group 'vc) 71 :group 'vc)
72 72
73(defcustom vc-mcvs-register-switches nil 73(defcustom vc-mcvs-register-switches nil
74 "*Extra switches for registering a file into Meta-CVS. 74 "Extra switches for registering a file into Meta-CVS.
75A string or list of strings passed to the checkin program by 75A string or list of strings passed to the checkin program by
76\\[vc-register]." 76\\[vc-register]."
77 :type '(choice (const :tag "None" nil) 77 :type '(choice (const :tag "None" nil)
@@ -83,7 +83,7 @@ A string or list of strings passed to the checkin program by
83 :group 'vc) 83 :group 'vc)
84 84
85(defcustom vc-mcvs-diff-switches nil 85(defcustom vc-mcvs-diff-switches nil
86 "*A string or list of strings specifying extra switches for cvs diff under VC." 86 "A string or list of strings specifying extra switches for cvs diff under VC."
87 :type '(choice (const :tag "None" nil) 87 :type '(choice (const :tag "None" nil)
88 (string :tag "Argument String") 88 (string :tag "Argument String")
89 (repeat :tag "Argument List" 89 (repeat :tag "Argument List"
@@ -94,13 +94,13 @@ A string or list of strings passed to the checkin program by
94 94
95(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist)) 95(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
96 vc-cvs-header) 96 vc-cvs-header)
97 "*Header keywords to be inserted by `vc-insert-headers'." 97 "Header keywords to be inserted by `vc-insert-headers'."
98 :version "22.1" 98 :version "22.1"
99 :type '(repeat string) 99 :type '(repeat string)
100 :group 'vc) 100 :group 'vc)
101 101
102(defcustom vc-mcvs-use-edit vc-cvs-use-edit 102(defcustom vc-mcvs-use-edit vc-cvs-use-edit
103 "*Non-nil means to use `cvs edit' to \"check out\" a file. 103 "Non-nil means to use `cvs edit' to \"check out\" a file.
104This is only meaningful if you don't use the implicit checkout model 104This is only meaningful if you don't use the implicit checkout model
105\(i.e. if you have $CVSREAD set)." 105\(i.e. if you have $CVSREAD set)."
106 :type 'boolean 106 :type 'boolean
@@ -410,7 +410,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
410 (message "Merging changes into %s...done" file)))) 410 (message "Merging changes into %s...done" file))))
411 411
412(defun vc-mcvs-modify-change-comment (files rev comment) 412(defun vc-mcvs-modify-change-comment (files rev comment)
413 "Modify the change comments for FILES on a specified REV. 413 "Modify the change comments for FILES on a specified REV.
414Will fail unless you have administrative privileges on the repo." 414Will fail unless you have administrative privileges on the repo."
415 (vc-mcvs-command nil 0 files "rcs" (concat "-m" comment ":" rev))) 415 (vc-mcvs-command nil 0 files "rcs" (concat "-m" comment ":" rev)))
416 416
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 31ec90f586e..77b6be2046c 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -38,7 +38,7 @@
38 (require 'vc)) 38 (require 'vc))
39 39
40(defcustom vc-rcs-release nil 40(defcustom vc-rcs-release nil
41 "*The release number of your RCS installation, as a string. 41 "The release number of your RCS installation, as a string.
42If nil, VC itself computes this value when it is first needed." 42If nil, VC itself computes this value when it is first needed."
43 :type '(choice (const :tag "Auto" nil) 43 :type '(choice (const :tag "Auto" nil)
44 (string :tag "Specified") 44 (string :tag "Specified")
@@ -46,7 +46,7 @@ If nil, VC itself computes this value when it is first needed."
46 :group 'vc) 46 :group 'vc)
47 47
48(defcustom vc-rcs-register-switches nil 48(defcustom vc-rcs-register-switches nil
49 "*Extra switches for registering a file in RCS. 49 "Extra switches for registering a file in RCS.
50A string or list of strings. These are passed to the checkin program 50A string or list of strings. These are passed to the checkin program
51by \\[vc-rcs-register]." 51by \\[vc-rcs-register]."
52 :type '(choice (const :tag "None" nil) 52 :type '(choice (const :tag "None" nil)
@@ -58,7 +58,7 @@ by \\[vc-rcs-register]."
58 :group 'vc) 58 :group 'vc)
59 59
60(defcustom vc-rcs-diff-switches nil 60(defcustom vc-rcs-diff-switches nil
61 "*A string or list of strings specifying extra switches for rcsdiff under VC." 61 "A string or list of strings specifying extra switches for rcsdiff under VC."
62 :type '(choice (const :tag "None" nil) 62 :type '(choice (const :tag "None" nil)
63 (string :tag "Argument String") 63 (string :tag "Argument String")
64 (repeat :tag "Argument List" 64 (repeat :tag "Argument List"
@@ -68,13 +68,13 @@ by \\[vc-rcs-register]."
68 :group 'vc) 68 :group 'vc)
69 69
70(defcustom vc-rcs-header (or (cdr (assoc 'RCS vc-header-alist)) '("\$Id\$")) 70(defcustom vc-rcs-header (or (cdr (assoc 'RCS vc-header-alist)) '("\$Id\$"))
71 "*Header keywords to be inserted by `vc-insert-headers'." 71 "Header keywords to be inserted by `vc-insert-headers'."
72 :type '(repeat string) 72 :type '(repeat string)
73 :version "21.1" 73 :version "21.1"
74 :group 'vc) 74 :group 'vc)
75 75
76(defcustom vc-rcsdiff-knows-brief nil 76(defcustom vc-rcsdiff-knows-brief nil
77 "*Indicates whether rcsdiff understands the --brief option. 77 "Indicates whether rcsdiff understands the --brief option.
78The value is either `yes', `no', or nil. If it is nil, VC tries 78The value is either `yes', `no', or nil. If it is nil, VC tries
79to use --brief and sets this variable to remember whether it worked." 79to use --brief and sets this variable to remember whether it worked."
80 :type '(choice (const :tag "Work out" nil) (const yes) (const no)) 80 :type '(choice (const :tag "Work out" nil) (const yes) (const no))
@@ -83,7 +83,7 @@ to use --brief and sets this variable to remember whether it worked."
83;;;###autoload 83;;;###autoload
84(defcustom vc-rcs-master-templates 84(defcustom vc-rcs-master-templates
85 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s") 85 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")
86 "*Where to look for RCS master files. 86 "Where to look for RCS master files.
87For a description of possible values, see `vc-check-master-templates'." 87For a description of possible values, see `vc-check-master-templates'."
88 :type '(choice (const :tag "Use standard RCS file names" 88 :type '(choice (const :tag "Use standard RCS file names"
89 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) 89 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s"))
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index b8957b94c38..8307def6c09 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -57,7 +57,7 @@ A string or list of strings passed to the checkin program by
57 :group 'vc) 57 :group 'vc)
58 58
59(defcustom vc-sccs-diff-switches nil 59(defcustom vc-sccs-diff-switches nil
60 "*A string or list of strings specifying extra switches for `vcdiff', 60 "A string or list of strings specifying extra switches for `vcdiff',
61the diff utility used for SCCS under VC." 61the diff utility used for SCCS under VC."
62 :type '(choice (const :tag "None" nil) 62 :type '(choice (const :tag "None" nil)
63 (string :tag "Argument String") 63 (string :tag "Argument String")
@@ -68,14 +68,14 @@ the diff utility used for SCCS under VC."
68 :group 'vc) 68 :group 'vc)
69 69
70(defcustom vc-sccs-header (or (cdr (assoc 'SCCS vc-header-alist)) '("%W%")) 70(defcustom vc-sccs-header (or (cdr (assoc 'SCCS vc-header-alist)) '("%W%"))
71 "*Header keywords to be inserted by `vc-insert-headers'." 71 "Header keywords to be inserted by `vc-insert-headers'."
72 :type '(repeat string) 72 :type '(repeat string)
73 :group 'vc) 73 :group 'vc)
74 74
75;;;###autoload 75;;;###autoload
76(defcustom vc-sccs-master-templates 76(defcustom vc-sccs-master-templates
77 '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir) 77 '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)
78 "*Where to look for SCCS master files. 78 "Where to look for SCCS master files.
79For a description of possible values, see `vc-check-master-templates'." 79For a description of possible values, see `vc-check-master-templates'."
80 :type '(choice (const :tag "Use standard SCCS file names" 80 :type '(choice (const :tag "Use standard SCCS file names"
81 ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) 81 ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir))
diff --git a/lisp/vc.el b/lisp/vc.el
index a4e2b8e027f..865a4018eb1 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -711,7 +711,7 @@ specific to any particular backend."
711 :version "21.1") 711 :version "21.1")
712 712
713(defcustom vc-diff-knows-L nil 713(defcustom vc-diff-knows-L nil
714 "*Indicates whether diff understands the -L option. 714 "Indicates whether diff understands the -L option.
715The value is either `yes', `no', or nil. If it is nil, VC tries 715The value is either `yes', `no', or nil. If it is nil, VC tries
716to use -L and sets this variable to remember whether it worked." 716to use -L and sets this variable to remember whether it worked."
717 :type '(choice (const :tag "Work out" nil) (const yes) (const no)) 717 :type '(choice (const :tag "Work out" nil) (const yes) (const no))
@@ -754,7 +754,7 @@ See `run-hooks'."
754(defcustom vc-static-header-alist 754(defcustom vc-static-header-alist
755 '(("\\.c\\'" . 755 '(("\\.c\\'" .
756 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) 756 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
757 "*Associate static header string templates with file types. 757 "Associate static header string templates with file types.
758A \%s in the template is replaced with the first string associated with 758A \%s in the template is replaced with the first string associated with
759the file's version control type in `vc-header-alist'." 759the file's version control type in `vc-header-alist'."
760 :type '(repeat (cons :format "%v" 760 :type '(repeat (cons :format "%v"
@@ -764,7 +764,7 @@ the file's version control type in `vc-header-alist'."
764 764
765(defcustom vc-comment-alist 765(defcustom vc-comment-alist
766 '((nroff-mode ".\\\"" "")) 766 '((nroff-mode ".\\\"" ""))
767 "*Special comment delimiters for generating VC headers. 767 "Special comment delimiters for generating VC headers.
768Add an entry in this list if you need to override the normal `comment-start' 768Add an entry in this list if you need to override the normal `comment-start'
769and `comment-end' variables. This will only be necessary if the mode language 769and `comment-end' variables. This will only be necessary if the mode language
770is sensitive to blank lines." 770is sensitive to blank lines."
@@ -775,7 +775,7 @@ is sensitive to blank lines."
775 :group 'vc) 775 :group 'vc)
776 776
777(defcustom vc-checkout-carefully (= (user-uid) 0) 777(defcustom vc-checkout-carefully (= (user-uid) 0)
778 "*Non-nil means be extra-careful in checkout. 778 "Non-nil means be extra-careful in checkout.
779Verify that the file really is not locked 779Verify that the file really is not locked
780and that its contents match what the master file says." 780and that its contents match what the master file says."
781 :type 'boolean 781 :type 'boolean
@@ -1402,12 +1402,12 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
1402BACKEND is a symbol such as `CVS', which will be downcased. 1402BACKEND is a symbol such as `CVS', which will be downcased.
1403OP is a symbol such as `diff'. 1403OP is a symbol such as `diff'.
1404 1404
1405In decreasing order of preference, returns the value of: 1405In decreasing order of preference, return the value of:
1406vc-BACKEND-OP-switches (e.g. `vc-cvs-diff-switches'); 1406vc-BACKEND-OP-switches (e.g. `vc-cvs-diff-switches');
1407vc-OP-switches (e.g. `vc-diff-switches'); or, in the case of 1407vc-OP-switches (e.g. `vc-diff-switches'); or, in the case of
1408diff only, `diff-switches'. 1408diff only, `diff-switches'.
1409 1409
1410If the chosen value is not a string or a list, returns nil. 1410If the chosen value is not a string or a list, return nil.
1411This is so that you may set, e.g. `vc-svn-diff-switches' to t in order 1411This is so that you may set, e.g. `vc-svn-diff-switches' to t in order
1412to override the value of `vc-diff-switches' and `diff-switches'." 1412to override the value of `vc-diff-switches' and `diff-switches'."
1413 (let ((switches 1413 (let ((switches
diff --git a/lisp/view.el b/lisp/view.el
index caaba225e61..1854ebdb81c 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -52,7 +52,7 @@
52 :group 'editing) 52 :group 'editing)
53 53
54(defcustom view-highlight-face 'highlight 54(defcustom view-highlight-face 'highlight
55 "*The face used for highlighting the match found by View mode search." 55 "The face used for highlighting the match found by View mode search."
56 :type 'face 56 :type 'face
57 :group 'view) 57 :group 'view)
58 58
@@ -61,14 +61,14 @@
61;; doesn't say if leaving view mode should restore windows or not. The latter 61;; doesn't say if leaving view mode should restore windows or not. The latter
62;; is now controlled by the presence of a value in `view-return-to-alist'. 62;; is now controlled by the presence of a value in `view-return-to-alist'.
63(defcustom view-scroll-auto-exit nil 63(defcustom view-scroll-auto-exit nil
64 "*Non-nil means scrolling past the end of buffer exits View mode. 64 "Non-nil means scrolling past the end of buffer exits View mode.
65A value of nil means attempting to scroll past the end of the buffer, 65A value of nil means attempting to scroll past the end of the buffer,
66only rings the bell and gives a message on how to leave." 66only rings the bell and gives a message on how to leave."
67 :type 'boolean 67 :type 'boolean
68 :group 'view) 68 :group 'view)
69 69
70(defcustom view-try-extend-at-buffer-end nil 70(defcustom view-try-extend-at-buffer-end nil
71 "*Non-nil means try to load more of file when reaching end of buffer. 71 "Non-nil means try to load more of file when reaching end of buffer.
72This variable is mainly intended to be temporarily set to non-nil by 72This variable is mainly intended to be temporarily set to non-nil by
73the F command in view-mode, but you can set it to t if you want the action 73the F command in view-mode, but you can set it to t if you want the action
74for all scroll commands in view mode." 74for all scroll commands in view mode."
@@ -77,7 +77,7 @@ for all scroll commands in view mode."
77 77
78;;;###autoload 78;;;###autoload
79(defcustom view-remove-frame-by-deleting t 79(defcustom view-remove-frame-by-deleting t
80 "*Determine how View mode removes a frame no longer needed. 80 "Determine how View mode removes a frame no longer needed.
81If nil, make an icon of the frame. If non-nil, delete the frame." 81If nil, make an icon of the frame. If non-nil, delete the frame."
82 :type 'boolean 82 :type 'boolean
83 :group 'view 83 :group 'view
@@ -86,7 +86,7 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
86 :version "23.1") 86 :version "23.1")
87 87
88(defcustom view-exits-all-viewing-windows nil 88(defcustom view-exits-all-viewing-windows nil
89 "*Non-nil means restore all windows used to view buffer. 89 "Non-nil means restore all windows used to view buffer.
90Commands that restore windows when finished viewing a buffer, apply to all 90Commands that restore windows when finished viewing a buffer, apply to all
91windows that display the buffer and have restore information in 91windows that display the buffer and have restore information in
92`view-return-to-alist'. 92`view-return-to-alist'.
@@ -96,7 +96,7 @@ considered for restoring."
96 :group 'view) 96 :group 'view)
97 97
98(defcustom view-inhibit-help-message nil 98(defcustom view-inhibit-help-message nil
99 "*Non-nil inhibits the help message shown upon entering View mode." 99 "Non-nil inhibits the help message shown upon entering View mode."
100 :type 'boolean 100 :type 'boolean
101 :group 'view 101 :group 'view
102 :version "22.1") 102 :version "22.1")
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 2d366f398ef..3d9db27bb6e 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -33,26 +33,26 @@
33 33
34;; Redefine the font selection to use the standard W32 dialog 34;; Redefine the font selection to use the standard W32 dialog
35(defcustom w32-use-w32-font-dialog t 35(defcustom w32-use-w32-font-dialog t
36 "*Use the standard font dialog. 36 "Use the standard font dialog.
37If nil, pop up a menu of a fixed set of fonts including fontsets, like 37If nil, pop up a menu of a fixed set of fonts including fontsets, like
38X does. See `w32-fixed-font-alist' for the font menu definition." 38X does. See `w32-fixed-font-alist' for the font menu definition."
39 :type 'boolean 39 :type 'boolean
40 :group 'w32) 40 :group 'w32)
41 41
42(defcustom w32-list-proportional-fonts nil 42(defcustom w32-list-proportional-fonts nil
43 "*Include proportional fonts in the default font dialog." 43 "Include proportional fonts in the default font dialog."
44 :type 'boolean 44 :type 'boolean
45 :group 'w32) 45 :group 'w32)
46 46
47(defcustom w32-allow-system-shell nil 47(defcustom w32-allow-system-shell nil
48 "*Disable startup warning when using \"system\" shells." 48 "Disable startup warning when using \"system\" shells."
49 :type 'boolean 49 :type 'boolean
50 :group 'w32) 50 :group 'w32)
51 51
52(defcustom w32-system-shells '("cmd" "cmd.exe" "command" "command.com" 52(defcustom w32-system-shells '("cmd" "cmd.exe" "command" "command.com"
53 "4nt" "4nt.exe" "4dos" "4dos.exe" 53 "4nt" "4nt.exe" "4dos" "4dos.exe"
54 "tcc" "tcc.exe" "ndos" "ndos.exe") 54 "tcc" "tcc.exe" "ndos" "ndos.exe")
55 "*List of strings recognized as Windows NT/9X system shells." 55 "List of strings recognized as Windows NT/9X system shells."
56 :type '(repeat string) 56 :type '(repeat string)
57 :group 'w32) 57 :group 'w32)
58 58
@@ -130,7 +130,7 @@ X does. See `w32-fixed-font-alist' for the font menu definition."
130 ("11 bold italic" "-*-Courier New-bold-i-*-*-15-*-*-*-c-*-iso8859-1") 130 ("11 bold italic" "-*-Courier New-bold-i-*-*-15-*-*-*-c-*-iso8859-1")
131 ("12 bold italic" "-*-Courier New-bold-i-*-*-16-*-*-*-c-*-iso8859-1") 131 ("12 bold italic" "-*-Courier New-bold-i-*-*-16-*-*-*-c-*-iso8859-1")
132 )) 132 ))
133 "*Fonts suitable for use in Emacs. 133 "Fonts suitable for use in Emacs.
134Initially this is a list of some fixed width fonts that most people 134Initially this is a list of some fixed width fonts that most people
135will have like Terminal and Courier. These fonts are used in the font 135will have like Terminal and Courier. These fonts are used in the font
136menu if the variable `w32-use-w32-font-dialog' is nil." 136menu if the variable `w32-use-w32-font-dialog' is nil."
@@ -148,7 +148,7 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
148 :group 'w32) 148 :group 'w32)
149 149
150(defcustom x-select-enable-clipboard t 150(defcustom x-select-enable-clipboard t
151 "*Non-nil means cutting and pasting uses the clipboard. 151 "Non-nil means cutting and pasting uses the clipboard.
152This is in addition to the primary selection." 152This is in addition to the primary selection."
153 :type 'boolean 153 :type 'boolean
154 :group 'killing) 154 :group 'killing)
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 4504c4c9f14..293416c8d10 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -381,7 +381,7 @@
381 '(tabs spaces trailing lines space-before-tab newline 381 '(tabs spaces trailing lines space-before-tab newline
382 indentation empty space-after-tab 382 indentation empty space-after-tab
383 space-mark tab-mark newline-mark) 383 space-mark tab-mark newline-mark)
384 "*Specify which kind of blank is visualized. 384 "Specify which kind of blank is visualized.
385 385
386It's a list containing some or all of the following values: 386It's a list containing some or all of the following values:
387 387
@@ -508,7 +508,7 @@ See also `whitespace-display-mappings' for documentation."
508 508
509 509
510(defcustom whitespace-space 'whitespace-space 510(defcustom whitespace-space 'whitespace-space
511 "*Symbol face used to visualize SPACE. 511 "Symbol face used to visualize SPACE.
512 512
513Used when `whitespace-style' includes the value `spaces'." 513Used when `whitespace-style' includes the value `spaces'."
514 :type 'face 514 :type 'face
@@ -526,7 +526,7 @@ Used when `whitespace-style' includes the value `spaces'."
526 526
527 527
528(defcustom whitespace-hspace 'whitespace-hspace 528(defcustom whitespace-hspace 'whitespace-hspace
529 "*Symbol face used to visualize HARD SPACE. 529 "Symbol face used to visualize HARD SPACE.
530 530
531Used when `whitespace-style' includes the value `spaces'." 531Used when `whitespace-style' includes the value `spaces'."
532 :type 'face 532 :type 'face
@@ -544,7 +544,7 @@ Used when `whitespace-style' includes the value `spaces'."
544 544
545 545
546(defcustom whitespace-tab 'whitespace-tab 546(defcustom whitespace-tab 'whitespace-tab
547 "*Symbol face used to visualize TAB. 547 "Symbol face used to visualize TAB.
548 548
549Used when `whitespace-style' includes the value `tabs'." 549Used when `whitespace-style' includes the value `tabs'."
550 :type 'face 550 :type 'face
@@ -562,7 +562,7 @@ Used when `whitespace-style' includes the value `tabs'."
562 562
563 563
564(defcustom whitespace-newline 'whitespace-newline 564(defcustom whitespace-newline 'whitespace-newline
565 "*Symbol face used to visualize NEWLINE char mapping. 565 "Symbol face used to visualize NEWLINE char mapping.
566 566
567See `whitespace-display-mappings'. 567See `whitespace-display-mappings'.
568 568
@@ -585,7 +585,7 @@ See `whitespace-display-mappings'."
585 585
586 586
587(defcustom whitespace-trailing 'whitespace-trailing 587(defcustom whitespace-trailing 'whitespace-trailing
588 "*Symbol face used to visualize trailing blanks. 588 "Symbol face used to visualize trailing blanks.
589 589
590Used when `whitespace-style' includes the value `trailing'." 590Used when `whitespace-style' includes the value `trailing'."
591 :type 'face 591 :type 'face
@@ -600,7 +600,7 @@ Used when `whitespace-style' includes the value `trailing'."
600 600
601 601
602(defcustom whitespace-line 'whitespace-line 602(defcustom whitespace-line 'whitespace-line
603 "*Symbol face used to visualize \"long\" lines. 603 "Symbol face used to visualize \"long\" lines.
604 604
605See `whitespace-line-column'. 605See `whitespace-line-column'.
606 606
@@ -619,7 +619,7 @@ See `whitespace-line-column'."
619 619
620 620
621(defcustom whitespace-space-before-tab 'whitespace-space-before-tab 621(defcustom whitespace-space-before-tab 'whitespace-space-before-tab
622 "*Symbol face used to visualize SPACEs before TAB. 622 "Symbol face used to visualize SPACEs before TAB.
623 623
624Used when `whitespace-style' includes the value `space-before-tab'." 624Used when `whitespace-style' includes the value `space-before-tab'."
625 :type 'face 625 :type 'face
@@ -634,7 +634,7 @@ Used when `whitespace-style' includes the value `space-before-tab'."
634 634
635 635
636(defcustom whitespace-indentation 'whitespace-indentation 636(defcustom whitespace-indentation 'whitespace-indentation
637 "*Symbol face used to visualize 8 or more SPACEs at beginning of line. 637 "Symbol face used to visualize 8 or more SPACEs at beginning of line.
638 638
639Used when `whitespace-style' includes the value `indentation'." 639Used when `whitespace-style' includes the value `indentation'."
640 :type 'face 640 :type 'face
@@ -649,7 +649,7 @@ Used when `whitespace-style' includes the value `indentation'."
649 649
650 650
651(defcustom whitespace-empty 'whitespace-empty 651(defcustom whitespace-empty 'whitespace-empty
652 "*Symbol face used to visualize empty lines at beginning and/or end of buffer. 652 "Symbol face used to visualize empty lines at beginning and/or end of buffer.
653 653
654Used when `whitespace-style' includes the value `empty'." 654Used when `whitespace-style' includes the value `empty'."
655 :type 'face 655 :type 'face
@@ -664,7 +664,7 @@ Used when `whitespace-style' includes the value `empty'."
664 664
665 665
666(defcustom whitespace-space-after-tab 'whitespace-space-after-tab 666(defcustom whitespace-space-after-tab 'whitespace-space-after-tab
667 "*Symbol face used to visualize 8 or more SPACEs after TAB. 667 "Symbol face used to visualize 8 or more SPACEs after TAB.
668 668
669Used when `whitespace-style' includes the value `space-after-tab'." 669Used when `whitespace-style' includes the value `space-after-tab'."
670 :type 'face 670 :type 'face
@@ -680,7 +680,7 @@ Used when `whitespace-style' includes the value `space-after-tab'."
680 680
681(defcustom whitespace-hspace-regexp 681(defcustom whitespace-hspace-regexp
682 "\\(\\(\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)" 682 "\\(\\(\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)"
683 "*Specify HARD SPACE characters regexp. 683 "Specify HARD SPACE characters regexp.
684 684
685If you're using `mule' package, there may be other characters besides: 685If you're using `mule' package, there may be other characters besides:
686 686
@@ -708,7 +708,7 @@ Used when `whitespace-style' includes `spaces'."
708 708
709 709
710(defcustom whitespace-space-regexp "\\( +\\)" 710(defcustom whitespace-space-regexp "\\( +\\)"
711 "*Specify SPACE characters regexp. 711 "Specify SPACE characters regexp.
712 712
713If you're using `mule' package, there may be other characters 713If you're using `mule' package, there may be other characters
714besides \" \" that should be considered SPACE. 714besides \" \" that should be considered SPACE.
@@ -730,7 +730,7 @@ Used when `whitespace-style' includes `spaces'."
730 730
731 731
732(defcustom whitespace-tab-regexp "\\(\t+\\)" 732(defcustom whitespace-tab-regexp "\\(\t+\\)"
733 "*Specify TAB characters regexp. 733 "Specify TAB characters regexp.
734 734
735If you're using `mule' package, there may be other characters 735If you're using `mule' package, there may be other characters
736besides \"\\t\" that should be considered TAB. 736besides \"\\t\" that should be considered TAB.
@@ -753,7 +753,7 @@ Used when `whitespace-style' includes `tabs'."
753 753
754(defcustom whitespace-trailing-regexp 754(defcustom whitespace-trailing-regexp
755 "\\(\\(\t\\| \\|\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)$" 755 "\\(\\(\t\\| \\|\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)$"
756 "*Specify trailing characters regexp. 756 "Specify trailing characters regexp.
757 757
758If you're using `mule' package, there may be other characters besides: 758If you're using `mule' package, there may be other characters besides:
759 759
@@ -771,7 +771,7 @@ Used when `whitespace-style' includes `trailing'."
771 771
772 772
773(defcustom whitespace-space-before-tab-regexp "\\( +\\)\\(\t+\\)" 773(defcustom whitespace-space-before-tab-regexp "\\( +\\)\\(\t+\\)"
774 "*Specify SPACEs before TAB regexp. 774 "Specify SPACEs before TAB regexp.
775 775
776If you're using `mule' package, there may be other characters besides: 776If you're using `mule' package, there may be other characters besides:
777 777
@@ -789,7 +789,7 @@ Used when `whitespace-style' includes `space-before-tab',
789(defcustom whitespace-indentation-regexp 789(defcustom whitespace-indentation-regexp
790 '("^\t*\\(\\( \\{%d\\}\\)+\\)[^\n\t]" 790 '("^\t*\\(\\( \\{%d\\}\\)+\\)[^\n\t]"
791 . "^ *\\(\t+\\)[^\n]") 791 . "^ *\\(\t+\\)[^\n]")
792 "*Specify regexp for 8 or more SPACEs at beginning of line. 792 "Specify regexp for 8 or more SPACEs at beginning of line.
793 793
794It is a cons where the cons car is used for SPACEs visualization 794It is a cons where the cons car is used for SPACEs visualization
795and the cons cdr is used for TABs visualization. 795and the cons cdr is used for TABs visualization.
@@ -809,7 +809,7 @@ Used when `whitespace-style' includes `indentation',
809 809
810 810
811(defcustom whitespace-empty-at-bob-regexp "\\`\\(\\([ \t]*\n\\)+\\)" 811(defcustom whitespace-empty-at-bob-regexp "\\`\\(\\([ \t]*\n\\)+\\)"
812 "*Specify regexp for empty lines at beginning of buffer. 812 "Specify regexp for empty lines at beginning of buffer.
813 813
814If you're using `mule' package, there may be other characters besides: 814If you're using `mule' package, there may be other characters besides:
815 815
@@ -824,7 +824,7 @@ Used when `whitespace-style' includes `empty'."
824 824
825 825
826(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'" 826(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'"
827 "*Specify regexp for empty lines at end of buffer. 827 "Specify regexp for empty lines at end of buffer.
828 828
829If you're using `mule' package, there may be other characters besides: 829If you're using `mule' package, there may be other characters besides:
830 830
@@ -841,7 +841,7 @@ Used when `whitespace-style' includes `empty'."
841(defcustom whitespace-space-after-tab-regexp 841(defcustom whitespace-space-after-tab-regexp
842 '("\t+\\(\\( \\{%d\\}\\)+\\)" 842 '("\t+\\(\\( \\{%d\\}\\)+\\)"
843 . "\\(\t+\\) +") 843 . "\\(\t+\\) +")
844 "*Specify regexp for 8 or more SPACEs after TAB. 844 "Specify regexp for 8 or more SPACEs after TAB.
845 845
846It is a cons where the cons car is used for SPACEs visualization 846It is a cons where the cons car is used for SPACEs visualization
847and the cons cdr is used for TABs visualization. 847and the cons cdr is used for TABs visualization.
@@ -860,7 +860,7 @@ Used when `whitespace-style' includes `space-after-tab',
860 860
861 861
862(defcustom whitespace-line-column 80 862(defcustom whitespace-line-column 80
863 "*Specify column beyond which the line is highlighted. 863 "Specify column beyond which the line is highlighted.
864 864
865Used when `whitespace-style' includes `lines' or `lines-tail'." 865Used when `whitespace-style' includes `lines' or `lines-tail'."
866 :type '(integer :tag "Line Length") 866 :type '(integer :tag "Line Length")
@@ -891,7 +891,7 @@ Used when `whitespace-style' includes `lines' or `lines-tail'."
891 ;; If this is a problem for you, please, comment the line below. 891 ;; If this is a problem for you, please, comment the line below.
892 (tab-mark ?\t [?\xBB ?\t] [?\\ ?\t]) ; tab - left quote mark 892 (tab-mark ?\t [?\xBB ?\t] [?\\ ?\t]) ; tab - left quote mark
893 ) 893 )
894 "*Specify an alist of mappings for displaying characters. 894 "Specify an alist of mappings for displaying characters.
895 895
896Each element has the following form: 896Each element has the following form:
897 897
@@ -936,7 +936,7 @@ Used when `whitespace-style' includes `tab-mark', `space-mark' or
936 936
937 937
938(defcustom whitespace-global-modes t 938(defcustom whitespace-global-modes t
939 "*Modes for which global `whitespace-mode' is automagically turned on. 939 "Modes for which global `whitespace-mode' is automagically turned on.
940 940
941Global `whitespace-mode' is controlled by the command 941Global `whitespace-mode' is controlled by the command
942`global-whitespace-mode'. 942`global-whitespace-mode'.
@@ -967,7 +967,7 @@ C++ modes only."
967 967
968 968
969(defcustom whitespace-action nil 969(defcustom whitespace-action nil
970 "*Specify which action is taken when a buffer is visited or written. 970 "Specify which action is taken when a buffer is visited or written.
971 971
972It's a list containing some or all of the following values: 972It's a list containing some or all of the following values:
973 973
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index c0135f842b3..180b50cf515 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -198,7 +198,7 @@ For a larger number of items, the minibuffer is used."
198 :type 'integer) 198 :type 'integer)
199 199
200(defcustom widget-menu-minibuffer-flag nil 200(defcustom widget-menu-minibuffer-flag nil
201 "*Control how to ask for a choice from the keyboard. 201 "Control how to ask for a choice from the keyboard.
202Non-nil means use the minibuffer; 202Non-nil means use the minibuffer;
203nil means read a single character." 203nil means read a single character."
204 :group 'widgets 204 :group 'widgets
@@ -3045,7 +3045,7 @@ widget. If that isn't a list, it's evalled and expected to yield a list."
3045 (message "Only match")) 3045 (message "Only match"))
3046 ((null completion) 3046 ((null completion)
3047 (error "No match")) 3047 (error "No match"))
3048 ((not (eq t (compare-strings prefix nil nil completion nil nil 3048 ((not (eq t (compare-strings prefix nil nil completion nil nil
3049 completion-ignore-case))) 3049 completion-ignore-case)))
3050 (when completion-ignore-case 3050 (when completion-ignore-case
3051 ;; Replace field with completion in case its case is different. 3051 ;; Replace field with completion in case its case is different.