Merge from origin/emacs-26

56c37bb Use @key{} where it is missing in the manuals
25c0198 Another round of manual fixes from proofreading

6 files changed, 22 insertions, 20 deletions

diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 6700b8fac30..0753d6fb67c 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -748,7 +748,7 @@ part of the prompt.
 @group
 (execute-extended-command 3)
 ---------- Buffer: Minibuffer ----------
-3 M-x forward-word RET
+3 M-x forward-word @key{RET}
 ---------- Buffer: Minibuffer ----------
      @result{} t
 @end group
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index e69f95b9d1a..09692073bf9 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -941,10 +941,10 @@ The profiler report buffer shows, on each line, a function that was
 called, followed by how much resource (processor or memory) it used in
 absolute and percentage times since profiling started.  If a given
 line has a @samp{+} symbol at the left-hand side, you can expand that
-line by typing @key{RET}, in order to see the function(s) called by
-the higher-level function.  Use a prefix argument (@key{C-u RET}) to
-see the whole call tree below a function.  Pressing @key{RET} again
-will collapse back to the original state.
+line by typing @kbd{@key{RET}}, in order to see the function(s) called
+by the higher-level function.  Use a prefix argument (@kbd{C-u
+@key{RET}}) to see the whole call tree below a function.  Pressing
+@kbd{@key{RET}} again will collapse back to the original state.
 
 Press @kbd{j} or @kbd{mouse-2} to jump to the definition of a function.
 Press @kbd{d} to view a function's documentation.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index fbf943a08c7..bd1f671225c 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4599,7 +4599,7 @@ first character in the group of consecutive characters that have the
 same @code{display} property.  The space width is the pixel width of
 that character, multiplied by @var{factor}.  (On text-mode terminals,
 the ``pixel width'' of a character is usually 1, but it could be more
-for TABs and double-width CJK characters.)
+for @key{TAB}s and double-width CJK characters.)
 
 @item :align-to @var{hpos}
 Specifies that the space should be wide enough to reach @var{hpos}.
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index efa14e5e2a6..f1a00e72f3d 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3545,10 +3545,11 @@ provided grammar is precise enough, @code{transpose-sexps} can correctly
 transpose the two arguments of a @code{+} operator, taking into account
 the precedence rules of the language.
 
-Calling @code{smie-setup} is also sufficient to make TAB indentation work in
-the expected way, extends @code{blink-matching-paren} to apply to
-elements like @code{begin...end}, and provides some commands that you
-can bind in the major mode keymap.
+Calling @code{smie-setup} is also sufficient to make @key{TAB}
+indentation work in the expected way, extends
+@code{blink-matching-paren} to apply to elements like
+@code{begin...end}, and provides some commands that you can bind in
+the major mode keymap.
 
 @deffn Command smie-close-block
 This command closes the most recently opened (and not yet closed) block.
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 2fd2bbc1ce5..8bc7e209894 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1776,7 +1776,7 @@ affect it.
 Binding @code{coding-system-for-write} to a non-@code{nil} value
 prevents output primitives from calling the function specified by
 @code{select-safe-coding-system-function} (@pxref{User-Chosen Coding
-Systems}).  This is because @kbd{C-x RET c}
+Systems}).  This is because @kbd{C-x @key{RET} c}
 (@code{universal-coding-system-argument}) works by binding
 @code{coding-system-for-write}, and Emacs should obey user selection.
 If a Lisp program binds @code{coding-system-for-write} to a value that
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 0f883fe4b4d..0695d9b7b12 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -17,14 +17,15 @@ should follow.
 @findex checkdoc
 @findex checkdoc-current-buffer
 @findex checkdoc-file
-  You can automatically check some of the conventions described below by
-running the command @kbd{M-x checkdoc RET} when visiting a Lisp file.
-It cannot check all of the conventions, and not all the warnings it
-gives necessarily correspond to problems, but it is worth examining them
-all.  Alternatively, use the command @kbd{M-x checkdoc-current-buffer RET}
-to check the conventions in the current buffer, or @code{checkdoc-file}
-when you want to check a file in batch mode, e.g., with a command run by
-@kbd{@w{M-x compile RET}}.
+  You can automatically check some of the conventions described below
+by running the command @kbd{M-x checkdoc @key{RET}} when visiting a
+Lisp file.  It cannot check all of the conventions, and not all the
+warnings it gives necessarily correspond to problems, but it is worth
+examining them all.  Alternatively, use the command @kbd{M-x
+checkdoc-current-buffer @key{RET}} to check the conventions in the
+current buffer, or @code{checkdoc-file} when you want to check a file
+in batch mode, e.g., with a command run by @kbd{@w{M-x compile
+@key{RET}}}.
 
 @menu
 * Coding Conventions::        Conventions for clean and robust programs.
@@ -1028,7 +1029,7 @@ but only the main one.
 @findex checkdoc-package-keywords
 This line lists keywords for the @code{finder-by-keyword} help command.
 Please use that command to see a list of the meaningful keywords.  The
-command @kbd{M-x checkdoc-package-keywords RET} will find and display
+command @kbd{M-x checkdoc-package-keywords @key{RET}} will find and display
 any keywords that are not in @code{finder-known-keywords}.  If you set
 the variable @code{checkdoc-package-keywords-flag} non-@code{nil},
 checkdoc commands will include the keyword verification in its checks.