aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-02-18 20:52:21 +0200
committerEli Zaretskii2018-02-18 20:52:21 +0200
commitd962be5a562221802b738cc98142a4e838ddfa97 (patch)
treeb65324223d890d786a62a23d615106ed470ce45c
parent6dc2846a2d6432648e88f76ab0946a4534b81bc0 (diff)
downloademacs-d962be5a562221802b738cc98142a4e838ddfa97.tar.gz
emacs-d962be5a562221802b738cc98142a4e838ddfa97.zip
More fixes in the Emacs manual
* doc/emacs/abbrevs.texi (Defining Abbrevs, Expanding Abbrevs) (Editing Abbrevs, Saving Abbrevs): Insert blank lines between @item's. (Expanding Abbrevs): Add 'unexpand-abbrev' to the list of commands. Suggested by Michael Albinus <michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.
-rw-r--r--doc/emacs/abbrevs.texi17
1 files changed, 16 insertions, 1 deletions
diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 9349d2d5baa..00b9e560ac0 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -72,18 +72,24 @@ use in later sessions.
72@item C-x a g 72@item C-x a g
73Define an abbrev, using one or more words before point as its expansion 73Define an abbrev, using one or more words before point as its expansion
74(@code{add-global-abbrev}). 74(@code{add-global-abbrev}).
75
75@item C-x a l 76@item C-x a l
76Similar, but define an abbrev specific to the current major mode 77Similar, but define an abbrev specific to the current major mode
77(@code{add-mode-abbrev}). 78(@code{add-mode-abbrev}).
79
78@item C-x a i g 80@item C-x a i g
79Define a word in the buffer as an abbrev (@code{inverse-add-global-abbrev}). 81Define a word in the buffer as an abbrev (@code{inverse-add-global-abbrev}).
82
80@item C-x a i l 83@item C-x a i l
81Define a word in the buffer as a mode-specific abbrev 84Define a word in the buffer as a mode-specific abbrev
82(@code{inverse-add-mode-abbrev}). 85(@code{inverse-add-mode-abbrev}).
86
83@item M-x define-global-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET} 87@item M-x define-global-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET}
84Define @var{abbrev} as an abbrev expanding into @var{exp}. 88Define @var{abbrev} as an abbrev expanding into @var{exp}.
89
85@item M-x define-mode-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET} 90@item M-x define-mode-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET}
86Define @var{abbrev} as a mode-specific abbrev expanding into @var{exp}. 91Define @var{abbrev} as a mode-specific abbrev expanding into @var{exp}.
92
87@item M-x kill-all-abbrevs 93@item M-x kill-all-abbrevs
88Discard all abbrev definitions, leaving a blank slate. 94Discard all abbrev definitions, leaving a blank slate.
89@end table 95@end table
@@ -160,10 +166,16 @@ to @samp{FIND OUTER OTTER}.
160@item M-' 166@item M-'
161Separate a prefix from a following abbrev to be expanded 167Separate a prefix from a following abbrev to be expanded
162(@code{abbrev-prefix-mark}). 168(@code{abbrev-prefix-mark}).
169
163@item C-x a e 170@item C-x a e
164@findex expand-abbrev 171@findex expand-abbrev
165Expand the abbrev before point (@code{expand-abbrev}). 172Expand the abbrev before point (@code{expand-abbrev}).
166This is effective even when Abbrev mode is not enabled. 173This is effective even when Abbrev mode is not enabled.
174
175@item M-x unexpand-abbrev
176@findex unexpand-abbrev
177Undo the expansion of the last expanded abbrev.
178
167@item M-x expand-region-abbrevs 179@item M-x expand-region-abbrevs
168Expand some or all abbrevs found in the region. 180Expand some or all abbrevs found in the region.
169@end table 181@end table
@@ -188,7 +200,6 @@ its expansion, you can accomplish this by inserting the following
188punctuation with @kbd{C-q}. Thus, @kbd{foo C-q ,} leaves @samp{foo,} in 200punctuation with @kbd{C-q}. Thus, @kbd{foo C-q ,} leaves @samp{foo,} in
189the buffer, not expanding it. 201the buffer, not expanding it.
190 202
191@findex unexpand-abbrev
192 If you expand an abbrev by mistake, you can undo the expansion by 203 If you expand an abbrev by mistake, you can undo the expansion by
193typing @kbd{C-/} (@code{undo}). @xref{Undo}. This undoes the 204typing @kbd{C-/} (@code{undo}). @xref{Undo}. This undoes the
194insertion of the abbrev expansion and brings back the abbrev text. If 205insertion of the abbrev expansion and brings back the abbrev text. If
@@ -219,6 +230,7 @@ Reference Manual}.
219@item M-x list-abbrevs 230@item M-x list-abbrevs
220Display a list of all abbrev definitions. With a numeric argument, list 231Display a list of all abbrev definitions. With a numeric argument, list
221only local abbrevs. 232only local abbrevs.
233
222@item M-x edit-abbrevs 234@item M-x edit-abbrevs
223Edit a list of abbrevs; you can add, alter or remove definitions. 235Edit a list of abbrevs; you can add, alter or remove definitions.
224@end table 236@end table
@@ -278,10 +290,13 @@ sessions.
278@table @kbd 290@table @kbd
279@item M-x write-abbrev-file @key{RET} @var{file} @key{RET} 291@item M-x write-abbrev-file @key{RET} @var{file} @key{RET}
280Write a file @var{file} describing all defined abbrevs. 292Write a file @var{file} describing all defined abbrevs.
293
281@item M-x read-abbrev-file @key{RET} @var{file} @key{RET} 294@item M-x read-abbrev-file @key{RET} @var{file} @key{RET}
282Read the file @var{file} and define abbrevs as specified therein. 295Read the file @var{file} and define abbrevs as specified therein.
296
283@item M-x define-abbrevs 297@item M-x define-abbrevs
284Define abbrevs from definitions in current buffer. 298Define abbrevs from definitions in current buffer.
299
285@item M-x insert-abbrevs 300@item M-x insert-abbrevs
286Insert all abbrevs and their expansions into current buffer. 301Insert all abbrevs and their expansions into current buffer.
287@end table 302@end table