[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 dd2737b: Adjudicate review comments in abbrevs.te
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 dd2737b: Adjudicate review comments in abbrevs.texi |
Date: |
Sat, 19 Mar 2016 11:07:44 +0000 |
branch: emacs-25
commit dd2737b375d1eb3d7e0acbb9544fc8c85403d65e
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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
<address@hidden>. (Bug#23016)
* admin/release-process (Check manuals): Mark files reviewed by
Steve Byrne.
---
admin/release-process | 4 ++--
doc/emacs/abbrevs.texi | 9 +++++----
doc/lispref/abbrevs.texi | 9 ++++++---
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/admin/release-process b/admin/release-process
index 2f23dac..3f75ff5 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -237,7 +237,7 @@ TUTORIAL.zh
** Check the manual.
-abbrevs.texi
+abbrevs.texi Steve Byrne
ack.texi
anti.texi
arevert-xtra.texi
@@ -292,7 +292,7 @@ xresources.texi
** Check the Lisp manual.
-abbrevs.texi
+abbrevs.texi Steve Byrne
anti.texi
back.texi
backups.texi
diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index e0441a1..a1db34c 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -435,9 +435,9 @@ copies the expansion verbatim including its case pattern.
controls which characters are considered part of a word, for dynamic expansion
purposes. The regular expression must match just one character, never
two or more. The same regular expression also determines which
-characters are part of an expansion. The value @code{nil} has a special
-meaning: dynamic abbrevs are made of word characters, but expansions are
-made of word and symbol characters.
+characters are part of an expansion. The (default) value @code{nil}
+has a special meaning: dynamic abbrevs are made of word characters,
+but expansions are made of word and symbol characters.
@vindex dabbrev-abbrev-skip-leading-regexp
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
customize dynamic abbrev expansion to handle optional prefixes by setting
the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value
should be a regular expression that matches the optional prefix that
-dynamic abbrev expression should ignore.
+dynamic abbrev expression should ignore. The default is @code{nil},
+which means no characters should be skipped.
diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi
index 5f5a395..cdea2a8 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
described here.
@defopt abbrev-file-name
-This is the default file name for reading and saving abbrevs.
+This is the default file name for reading and saving abbrevs. By
+default, Emacs will look for @file{~/.emacs.d/abbrev_defs}, and, if
+not found, for @file{~/.abbrev_defs}; if neither file exists, Emacs
+will create @file{~/.emacs.d/abbrev_defs}.
@end defopt
@defun quietly-read-abbrev-file &optional filename
@@ -216,7 +219,7 @@ A address@hidden value for @code{save-abbrevs} means that
Emacs should
offer to save abbrevs (if any have changed) when files are saved. If
the value is @code{silently}, Emacs saves the abbrevs without asking
the user. @code{abbrev-file-name} specifies the file to save the
-abbrevs in.
+abbrevs in. The default value is @code{t}.
@end defopt
@defvar abbrevs-changed
@@ -282,7 +285,7 @@ omitted, it defaults to point. @code{name}, if
address@hidden, should
be the name by which this abbrev was found (a string); it is used to
figure out whether to adjust the capitalization of the expansion. The
function returns @code{abbrev} if the abbrev was successfully
-inserted.
+inserted, otherwise it returns @code{nil}.
@end defun
@deffn Command abbrev-prefix-mark &optional arg
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 dd2737b: Adjudicate review comments in abbrevs.texi,
Eli Zaretskii <=