mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
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
This commit is contained in:
Glenn Morris 2018-11-24 07:51:04 -08:00
commit 023502af45
8 changed files with 150 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/abbrev.el
View file

@ -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)