summaryrefslogtreecommitdiff
path: root/lisp/abbrev.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-11-24 07:51:04 -0800
committerGlenn Morris <rgm@gnu.org>2018-11-24 07:51:04 -0800
commit023502af450f9af3ab80747e5be4812cbc750f45 (patch)
tree5fea297e38d2c3f2f7fd7f9f365773301f01f601 /lisp/abbrev.el
parentdcacff41958d6dc12baf05e7e9de13d1ab5b09ae (diff)
parent56e3e4fe6816b5f13c410300e2bf5a0c1fcbe03a (diff)
downloademacs-023502af450f9af3ab80747e5be4812cbc750f45.tar.gz
Merge from origin/emacs-26
56e3e4f Improve indexing in the ELisp manual 7a4992a More Symbola-related extensions for default fontset 4ae0a75 Better support for display of U+1F900..U+1F9FF block 8f0c788 Improve documentation of 'edit-abbrevs-mode' 3c643e7 ; NEWS tweak 477414a Improve documentation of 'dired-do-compress' 9c09b1d ; * etc/NES: Minor change in the description of Dired's 'Z'. 52715e3 Improve doc string and display of 'describe-character' 93242b1 * etc/NEWS: Clarify what 'Z' does in Dired. (Bug#33450) 0d59ae3 Update the docs of object internals Conflicts: etc/NEWS
Diffstat (limited to 'lisp/abbrev.el')
-rw-r--r--lisp/abbrev.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 20a967d7d61..70123b6fac6 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -147,11 +147,12 @@ Otherwise display all abbrevs."
(defun edit-abbrevs ()
"Alter abbrev definitions by editing a list of them.
Selects a buffer containing a list of abbrev definitions with
-point located in the abbrev table of current buffer.
+point located in the abbrev table for the current buffer, and
+turns on `edit-abbrevs-mode' in that buffer.
You can edit them and type \\<edit-abbrevs-map>\\[edit-abbrevs-redefine] to redefine abbrevs
according to your editing.
-Buffer contains a header line for each abbrev table,
- which is the abbrev table name in parentheses.
+The abbrevs editing buffer contains a header line for each
+abbrev table, which is the abbrev table name in parentheses.
This is followed by one line per abbrev in that table:
NAME USECOUNT EXPANSION HOOK
where NAME and EXPANSION are strings with quotes,
@@ -1036,7 +1037,9 @@ SORTFUN is passed to `sort' to change the default ordering."
;; Keep it after define-abbrev-table, since define-derived-mode uses
;; define-abbrev-table.
(define-derived-mode edit-abbrevs-mode fundamental-mode "Edit-Abbrevs"
- "Major mode for editing the list of abbrev definitions.")
+ "Major mode for editing the list of abbrev definitions.
+This mode is for editing abbrevs in a buffer prepared by `edit-abbrevs',
+which see.")
(provide 'abbrev)