aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-03-19 13:05:55 +0200
committerEli Zaretskii2016-03-19 13:05:55 +0200
commitdd2737b375d1eb3d7e0acbb9544fc8c85403d65e (patch)
tree2b733900dd661d39150d69658fb5d4d6ac89c774
parent26f9c5075ff273013418a66b70fae477301d41d5 (diff)
downloademacs-dd2737b375d1eb3d7e0acbb9544fc8c85403d65e.tar.gz
emacs-dd2737b375d1eb3d7e0acbb9544fc8c85403d65e.zip
Adjudicate review comments in abbrevs.texi
* doc/lispref/abbrevs.texi (Abbrev Files, Abbrev Expansion): * doc/emacs/abbrevs.texi (Dabbrev Customization): State the default values of variables. Suggested by Steve Byrne <sbb@penguinis.org>. (Bug#23016) * admin/release-process (Check manuals): Mark files reviewed by Steve Byrne.
-rw-r--r--admin/release-process4
-rw-r--r--doc/emacs/abbrevs.texi9
-rw-r--r--doc/lispref/abbrevs.texi9
3 files changed, 13 insertions, 9 deletions
diff --git a/admin/release-process b/admin/release-process
index 2f23dac9b7f..3f75ff52ca4 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -237,7 +237,7 @@ TUTORIAL.zh
237 237
238** Check the manual. 238** Check the manual.
239 239
240abbrevs.texi 240abbrevs.texi Steve Byrne
241ack.texi 241ack.texi
242anti.texi 242anti.texi
243arevert-xtra.texi 243arevert-xtra.texi
@@ -292,7 +292,7 @@ xresources.texi
292 292
293** Check the Lisp manual. 293** Check the Lisp manual.
294 294
295abbrevs.texi 295abbrevs.texi Steve Byrne
296anti.texi 296anti.texi
297back.texi 297back.texi
298backups.texi 298backups.texi
diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index e0441a1984d..a1db34cf0ee 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -435,9 +435,9 @@ copies the expansion verbatim including its case pattern.
435controls which characters are considered part of a word, for dynamic expansion 435controls which characters are considered part of a word, for dynamic expansion
436purposes. The regular expression must match just one character, never 436purposes. The regular expression must match just one character, never
437two or more. The same regular expression also determines which 437two or more. The same regular expression also determines which
438characters are part of an expansion. The value @code{nil} has a special 438characters are part of an expansion. The (default) value @code{nil}
439meaning: dynamic abbrevs are made of word characters, but expansions are 439has a special meaning: dynamic abbrevs are made of word characters,
440made of word and symbol characters. 440but expansions are made of word and symbol characters.
441 441
442@vindex dabbrev-abbrev-skip-leading-regexp 442@vindex dabbrev-abbrev-skip-leading-regexp
443 In shell scripts and makefiles, a variable name is sometimes prefixed 443 In shell scripts and makefiles, a variable name is sometimes prefixed
@@ -445,4 +445,5 @@ with @samp{$} and sometimes not. Major modes for this kind of text can
445customize dynamic abbrev expansion to handle optional prefixes by setting 445customize dynamic abbrev expansion to handle optional prefixes by setting
446the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value 446the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value
447should be a regular expression that matches the optional prefix that 447should be a regular expression that matches the optional prefix that
448dynamic abbrev expression should ignore. 448dynamic abbrev expression should ignore. The default is @code{nil},
449which means no characters should be skipped.
diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi
index 5f5a395c97a..cdea2a8b3c8 100644
--- a/doc/lispref/abbrevs.texi
+++ b/doc/lispref/abbrevs.texi
@@ -198,7 +198,10 @@ abbrevs in a file automatically, under the control of variables
198described here. 198described here.
199 199
200@defopt abbrev-file-name 200@defopt abbrev-file-name
201This is the default file name for reading and saving abbrevs. 201This is the default file name for reading and saving abbrevs. By
202default, Emacs will look for @file{~/.emacs.d/abbrev_defs}, and, if
203not found, for @file{~/.abbrev_defs}; if neither file exists, Emacs
204will create @file{~/.emacs.d/abbrev_defs}.
202@end defopt 205@end defopt
203 206
204@defun quietly-read-abbrev-file &optional filename 207@defun quietly-read-abbrev-file &optional filename
@@ -216,7 +219,7 @@ A non-@code{nil} value for @code{save-abbrevs} means that Emacs should
216offer to save abbrevs (if any have changed) when files are saved. If 219offer to save abbrevs (if any have changed) when files are saved. If
217the value is @code{silently}, Emacs saves the abbrevs without asking 220the value is @code{silently}, Emacs saves the abbrevs without asking
218the user. @code{abbrev-file-name} specifies the file to save the 221the user. @code{abbrev-file-name} specifies the file to save the
219abbrevs in. 222abbrevs in. The default value is @code{t}.
220@end defopt 223@end defopt
221 224
222@defvar abbrevs-changed 225@defvar abbrevs-changed
@@ -282,7 +285,7 @@ omitted, it defaults to point. @code{name}, if non-@code{nil}, should
282be the name by which this abbrev was found (a string); it is used to 285be the name by which this abbrev was found (a string); it is used to
283figure out whether to adjust the capitalization of the expansion. The 286figure out whether to adjust the capitalization of the expansion. The
284function returns @code{abbrev} if the abbrev was successfully 287function returns @code{abbrev} if the abbrev was successfully
285inserted. 288inserted, otherwise it returns @code{nil}.
286@end defun 289@end defun
287 290
288@deffn Command abbrev-prefix-mark &optional arg 291@deffn Command abbrev-prefix-mark &optional arg