[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 4f478ca: Improve documentation of dabbrevs
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 4f478ca: Improve documentation of dabbrevs |
Date: |
Mon, 7 Nov 2016 17:35:06 +0000 (UTC) |
branch: emacs-25
commit 4f478ca04be6d9b87b25e0a16a6beef300504fb1
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Improve documentation of dabbrevs
* lisp/dabbrev.el (dabbrev-expand): Doc fix. (Bug#24890)
* doc/emacs/abbrevs.texi (Dynamic Abbrevs): Mention
'dabbrev-check-all-buffers', 'dabbrev-check-other-buffers', and
'dabbrev-ignored-buffer-names' and their purpose. (Bug#24890)
---
doc/emacs/abbrevs.texi | 17 +++++++++++------
lisp/dabbrev.el | 5 ++++-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index a1db34c..227fe6f 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -341,7 +341,7 @@ abbrev expansion happens only when you request it
explicitly.
@table @kbd
@item M-/
Expand the word in the buffer before point as a @dfn{dynamic abbrev},
-by searching in the buffer for words starting with that abbreviation
+by searching for words starting with that abbreviation
(@code{dabbrev-expand}).
@item C-M-/
@@ -361,14 +361,19 @@ The variable @code{dabbrev-limit}, if address@hidden,
specifies how far
away in the buffer to search for an expansion.
@vindex dabbrev-check-all-buffers
address@hidden dabbrev-check-other-buffers
After scanning the current buffer, @kbd{M-/} normally searches other
-buffers, unless you have set @code{dabbrev-check-all-buffers} to
address@hidden
+buffers. The variables @code{dabbrev-check-all-buffers} and
address@hidden can be used to determine which
+other buffers, if any, are searched.
address@hidden dabbrev-ignored-buffer-names
@vindex dabbrev-ignored-buffer-regexps
- For finer control over which buffers to scan, customize the variable
address@hidden Its value is a list of regular
-expressions. If a buffer's name matches any of these regular
+ For finer control over which buffers to scan, customize the
+variables @code{dabbrev-ignored-buffer-names} and
address@hidden The value of the former is a
+list of buffer names to skip. The value of the latter is a list of
+regular expressions; if a buffer's name matches any of these regular
expressions, dynamic abbrev expansion skips that buffer.
A negative argument to @kbd{M-/}, as in @kbd{C-u - M-/}, says to
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index d9f36b1..438eda3 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -433,7 +433,10 @@ Expands to the most recent, preceding word for which this
is a prefix.
If no suitable preceding word is found, words following point are
considered. If still no suitable word is found, then look in the
buffers accepted by the function pointed out by variable
-`dabbrev-friend-buffer-function'.
+`dabbrev-friend-buffer-function', if `dabbrev-check-other-buffers'
+says so. Then, if `dabbrev-check-all-buffers' is non-nil, look in
+all the other buffers, subject to constraints specified
+by `dabbrev-ignored-buffer-names' and `dabbrev-ignored-regexps'.
A positive prefix argument, N, says to take the Nth backward *distinct*
possibility. A negative argument says search forward.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 4f478ca: Improve documentation of dabbrevs,
Eli Zaretskii <=