diff options
| author | Eli Zaretskii | 2016-03-19 13:05:55 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-03-19 13:05:55 +0200 |
| commit | dd2737b375d1eb3d7e0acbb9544fc8c85403d65e (patch) | |
| tree | 2b733900dd661d39150d69658fb5d4d6ac89c774 | |
| parent | 26f9c5075ff273013418a66b70fae477301d41d5 (diff) | |
| download | emacs-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-process | 4 | ||||
| -rw-r--r-- | doc/emacs/abbrevs.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/abbrevs.texi | 9 |
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 | ||
| 240 | abbrevs.texi | 240 | abbrevs.texi Steve Byrne |
| 241 | ack.texi | 241 | ack.texi |
| 242 | anti.texi | 242 | anti.texi |
| 243 | arevert-xtra.texi | 243 | arevert-xtra.texi |
| @@ -292,7 +292,7 @@ xresources.texi | |||
| 292 | 292 | ||
| 293 | ** Check the Lisp manual. | 293 | ** Check the Lisp manual. |
| 294 | 294 | ||
| 295 | abbrevs.texi | 295 | abbrevs.texi Steve Byrne |
| 296 | anti.texi | 296 | anti.texi |
| 297 | back.texi | 297 | back.texi |
| 298 | backups.texi | 298 | backups.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. | |||
| 435 | controls which characters are considered part of a word, for dynamic expansion | 435 | controls which characters are considered part of a word, for dynamic expansion |
| 436 | purposes. The regular expression must match just one character, never | 436 | purposes. The regular expression must match just one character, never |
| 437 | two or more. The same regular expression also determines which | 437 | two or more. The same regular expression also determines which |
| 438 | characters are part of an expansion. The value @code{nil} has a special | 438 | characters are part of an expansion. The (default) value @code{nil} |
| 439 | meaning: dynamic abbrevs are made of word characters, but expansions are | 439 | has a special meaning: dynamic abbrevs are made of word characters, |
| 440 | made of word and symbol characters. | 440 | but 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 | |||
| 445 | customize dynamic abbrev expansion to handle optional prefixes by setting | 445 | customize dynamic abbrev expansion to handle optional prefixes by setting |
| 446 | the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value | 446 | the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value |
| 447 | should be a regular expression that matches the optional prefix that | 447 | should be a regular expression that matches the optional prefix that |
| 448 | dynamic abbrev expression should ignore. | 448 | dynamic abbrev expression should ignore. The default is @code{nil}, |
| 449 | which 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 | |||
| 198 | described here. | 198 | described here. |
| 199 | 199 | ||
| 200 | @defopt abbrev-file-name | 200 | @defopt abbrev-file-name |
| 201 | This is the default file name for reading and saving abbrevs. | 201 | This is the default file name for reading and saving abbrevs. By |
| 202 | default, Emacs will look for @file{~/.emacs.d/abbrev_defs}, and, if | ||
| 203 | not found, for @file{~/.abbrev_defs}; if neither file exists, Emacs | ||
| 204 | will 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 | |||
| 216 | offer to save abbrevs (if any have changed) when files are saved. If | 219 | offer to save abbrevs (if any have changed) when files are saved. If |
| 217 | the value is @code{silently}, Emacs saves the abbrevs without asking | 220 | the value is @code{silently}, Emacs saves the abbrevs without asking |
| 218 | the user. @code{abbrev-file-name} specifies the file to save the | 221 | the user. @code{abbrev-file-name} specifies the file to save the |
| 219 | abbrevs in. | 222 | abbrevs 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 | |||
| 282 | be the name by which this abbrev was found (a string); it is used to | 285 | be the name by which this abbrev was found (a string); it is used to |
| 283 | figure out whether to adjust the capitalization of the expansion. The | 286 | figure out whether to adjust the capitalization of the expansion. The |
| 284 | function returns @code{abbrev} if the abbrev was successfully | 287 | function returns @code{abbrev} if the abbrev was successfully |
| 285 | inserted. | 288 | inserted, 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 |