procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incorrect usage of @key in the User Manual (Bug#20135)

Browse source 
doc/emacs/misc.texi (Term Mode):
 doc/emacs/programs.texi (Basic Indent, Custom C Indent):
 doc/emacs/mini.texi (Minibuffer History):
 doc/emacs/text.texi (Org Mode):
 doc/emacs/display.texi (View Mode): Use @kbd where @key was mistakenly
 used.
This commit is contained in:
Eli Zaretskii 2015-03-18 19:32:22 +02:00
parent 14c47d39fa
commit 1a941d6c9e
6 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/emacs/ChangeLog
View file

@ -1,3 +1,12 @@
2015-03-18 Eli Zaretskii <eliz@gnu.org>
* misc.texi (Term Mode):
* programs.texi (Basic Indent, Custom C Indent):
* mini.texi (Minibuffer History):
* text.texi (Org Mode):
* display.texi (View Mode): Use @kbd where @key was mistakenly
used. (Bug#20135)
2015-03-14 Eli Zaretskii <eliz@gnu.org> 2015-03-14 Eli Zaretskii <eliz@gnu.org>
* basic.texi (Moving Point): Improve indexing for HOME and END. * basic.texi (Moving Point): Improve indexing for HOME and END.

2
doc/emacs/display.texi
View file

@ -428,7 +428,7 @@ it. @xref{Disabling}.
screenfuls. It provides commands for scrolling through the buffer screenfuls. It provides commands for scrolling through the buffer
conveniently but not for changing it. Apart from the usual Emacs conveniently but not for changing it. Apart from the usual Emacs
cursor motion commands, you can type @key{SPC} to scroll forward one cursor motion commands, you can type @key{SPC} to scroll forward one
windowful, @key{S-@key{SPC}} or @key{DEL} to scroll backward, and @kbd{s} to windowful, @kbd{S-@key{SPC}} or @key{DEL} to scroll backward, and @kbd{s} to
start an incremental search. start an incremental search.
@kindex q @r{(View mode)} @kindex q @r{(View mode)}

2
doc/emacs/mini.texi
View file

@ -622,7 +622,7 @@ typed @kbd{M-p}), Emacs tries fetching from a list of default
arguments: values that you are likely to enter. You can think of this arguments: values that you are likely to enter. You can think of this
as moving through the ``future history'' list. as moving through the ``future history'' list.
If you edit the text inserted by the @kbd{M-p} or @key{M-n} If you edit the text inserted by the @kbd{M-p} or @kbd{M-n}
minibuffer history commands, this does not change its entry in the minibuffer history commands, this does not change its entry in the
history list. However, the edited argument does go at the end of the history list. However, the edited argument does go at the end of the
history list when you submit it. history list when you submit it.

2
doc/emacs/misc.texi
View file

@ -1306,7 +1306,7 @@ char mode.
@table @kbd @table @kbd
@item C-c C-c @item C-c C-c
Send a literal @key{C-c} to the sub-shell. Send a literal @kbd{C-c} to the sub-shell.
@item C-c @var{char} @item C-c @var{char}
This is equivalent to @kbd{C-x @var{char}} in normal Emacs. For This is equivalent to @kbd{C-x @var{char}} in normal Emacs. For

4
doc/emacs/programs.texi
View file

@ -383,7 +383,7 @@ the preceding lines; if the region is active, @key{TAB} indents each
line within the region, not just the current line. line within the region, not just the current line.
The command @key{RET} (@code{newline}), which was documented in The command @key{RET} (@code{newline}), which was documented in
@ref{Inserting Text}, does the same as @key{C-j} followed by @ref{Inserting Text}, does the same as @kbd{C-j} followed by
@key{TAB}: it inserts a new line, then adjusts the line's indentation. @key{TAB}: it inserts a new line, then adjusts the line's indentation.
When indenting a line that starts within a parenthetical grouping, When indenting a line that starts within a parenthetical grouping,
@ -559,7 +559,7 @@ predefined styles, including @code{gnu}, @code{k&r}, @code{bsd},
styles are primarily intended for one language, but any of them can be styles are primarily intended for one language, but any of them can be
used with any of the languages supported by these modes. To find out used with any of the languages supported by these modes. To find out
what a style looks like, select it and reindent some code, e.g., by what a style looks like, select it and reindent some code, e.g., by
typing @key{C-M-q} at the start of a function definition. typing @kbd{C-M-q} at the start of a function definition.
@kindex C-c . @r{(C mode)} @kindex C-c . @r{(C mode)}
@findex c-set-style @findex c-set-style

2
doc/emacs/text.texi
View file

@ -1293,7 +1293,7 @@ executed.
@kindex S-TAB @r{(Org Mode)} @kindex S-TAB @r{(Org Mode)}
@findex org-shifttab @findex org-shifttab
Typing @key{S-TAB} (@code{org-shifttab}) anywhere in an Org mode Typing @kbd{S-@key{TAB}} (@code{org-shifttab}) anywhere in an Org mode
buffer cycles the visibility of the entire outline structure, between buffer cycles the visibility of the entire outline structure, between
(i) showing only top-level heading lines, (ii) showing all heading (i) showing only top-level heading lines, (ii) showing all heading
lines but no body lines, and (iii) showing everything. lines but no body lines, and (iii) showing everything.