summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMattias EngdegÄrd <mattiase@acm.org>2020-12-29 16:55:06 +0100
committerMattias EngdegÄrd <mattiase@acm.org>2021-01-05 11:28:58 +0100
commit7f16f177270e8e69cb8b78fb502caae3653a32cf (patch)
tree457b69dbfefe25efde1217b8432ac882986b65c7 /doc
parente6617f0dffbb1ca7a72287621c9c38c8a72145aa (diff)
downloademacs-7f16f177270e8e69cb8b78fb502caae3653a32cf.tar.gz
Pretty-print keys without <> around modifiers (bug#45536)
Be consistent when pretty-printing keys: put modifiers outside <>, thus the more logical C-M-<return> instead of <C-M-return>. * src/keymap.c (Fsingle_key_description): Skip modifier prefix before adding <>. * doc/lispref/help.texi (Describing Characters): Update example. * doc/lispref/debugging.texi (Backtraces): * doc/lispref/minibuf.texi (Text from Minibuffer): Use @kbd instead of @key. * etc/NEWS: Announce the change. * test/src/keymap-tests.el (keymap--key-description): * test/lisp/subr-tests.el (subr--kbd): New tests.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/debugging.texi2
-rw-r--r--doc/lispref/help.texi2
-rw-r--r--doc/lispref/minibuf.texi2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 1e779ac7054..8e4b0ebfe96 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -424,7 +424,7 @@ move to it and type @key{RET}, to visit the source code. You can also
type @key{RET} while point is on any name of a function or variable
which is not underlined, to see help information for that symbol in a
help buffer, if any exists. The @code{xref-find-definitions} command,
-bound to @key{M-.}, can also be used on any identifier in a backtrace
+bound to @kbd{M-.}, can also be used on any identifier in a backtrace
(@pxref{Looking Up Identifiers,,,emacs, The GNU Emacs Manual}).
In backtraces, the tails of long lists and the ends of long strings,
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 2fd05b73917..298bec5230c 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -545,7 +545,7 @@ brackets.
@end group
@group
(single-key-description 'C-mouse-1)
- @result{} "<C-mouse-1>"
+ @result{} "C-<mouse-1>"
@end group
@group
(single-key-description 'C-mouse-1 t)
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 81139b9e746..f0036f0ccfc 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -348,7 +348,7 @@ default, it makes the following bindings:
@item @key{RET}
@code{exit-minibuffer}
-@item @key{M-<}
+@item @kbd{M-<}
@code{minibuffer-beginning-of-buffer}
@item @kbd{C-g}