[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 05297e40c0 6/7: Quote some literal keys to get help-key-binding f
|
From: |
Stefan Kangas |
|
Subject: |
master 05297e40c0 6/7: Quote some literal keys to get help-key-binding face |
|
Date: |
Sun, 3 Jul 2022 17:35:13 -0400 (EDT) |
branch: master
commit 05297e40c0ab3ffcf5b5db74e4aa2aaefe05f5cf
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Quote some literal keys to get help-key-binding face
* lisp/align.el (align):
* lisp/bindings.el (undo-repeat-map):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-prog.el (calc-user-define-invocation):
* lisp/calc/calc-yank.el (calc--edit-mode):
* lisp/comint.el (comint-history-isearch)
* lisp/dired.el (dired-mode):
* lisp/emulation/viper.el (viper-mode):
* lisp/erc/erc-button.el (erc-button-face):
* lisp/erc/erc-track.el (erc-track-enable-keybindings):
* lisp/gnus/gnus-art.el (gnus-article-button-face):
* lisp/gnus/gnus-eform.el (gnus-edit-form):
* lisp/gnus/gnus-sum.el (gnus-summary-stop-at-end-of-message)
(gnus-summary-goto-unread):
* lisp/icomplete.el (icomplete-show-matches-on-no-input):
* lisp/image-mode.el (image-scroll-up):
* lisp/international/iso-transl.el (iso-transl-set-language):
* lisp/isearch.el (isearch-forward-regexp):
* lisp/misc.el (butterfly):
* lisp/outline.el (outline-minor-mode-cycle-filter)
(outline-minor-mode-cycle):
* lisp/progmodes/grep.el (rgrep):
* lisp/progmodes/gud.el (gud-gdb-repeat-map, gud-sdb-repeat-map)
(gud-dbx-repeat-map, gud-xdb-repeat-map, gud-perldb-repeat-map)
(gud-pdb-repeat-map, gud-guiler-repeat-map, gud-jdb-repeat-map):
* lisp/progmodes/idlw-shell.el (idlwave-shell-graphics-window-size)
(idlwave-shell-mode):
* lisp/progmodes/idlwave.el (idlwave-shell-debug-modifiers)
(idlwave-list-shell-load-path-shadows):
* lisp/progmodes/python.el (python-shell-get-process-or-error):
* lisp/repeat.el (repeat-check-key):
* lisp/replace.el (query-replace, query-replace-regexp)
(read-regexp):
* lisp/simple.el (read-extended-command-predicate):
* lisp/tab-bar.el (tab-bar-switch-repeat-map)
(tab-bar-move-repeat-map):
* lisp/term.el (ansi-term):
* lisp/textmodes/reftex-index.el (reftex-index-phrases-set-macro-key):
* lisp/vc/emerge.el (emerge-scroll-left, emerge-scroll-right):
* lisp/windmove.el:
* lisp/winner.el (winner-mode): Quote literal keys to get
'help-key-binding' face.
* lisp/comint.el (comint-insert-previous-argument): Use regular
quotes.
---
lisp/align.el | 4 ++--
lisp/bindings.el | 2 +-
lisp/calc/calc-embed.el | 3 ++-
lisp/calc/calc-prog.el | 2 +-
lisp/calc/calc-yank.el | 4 ++--
lisp/comint.el | 4 ++--
lisp/dired.el | 2 +-
lisp/emulation/viper.el | 10 +++++-----
lisp/erc/erc-button.el | 2 +-
lisp/erc/erc-track.el | 2 +-
lisp/gnus/gnus-art.el | 2 +-
lisp/gnus/gnus-eform.el | 2 +-
lisp/gnus/gnus-sum.el | 6 +++---
lisp/icomplete.el | 2 +-
lisp/image-mode.el | 4 ++--
lisp/international/iso-transl.el | 4 ++--
lisp/isearch.el | 2 +-
lisp/misc.el | 2 +-
lisp/outline.el | 9 ++++-----
lisp/progmodes/grep.el | 2 +-
lisp/progmodes/gud.el | 16 ++++++++--------
lisp/progmodes/idlw-shell.el | 4 ++--
lisp/progmodes/idlwave.el | 6 +++---
lisp/progmodes/python.el | 3 ++-
lisp/repeat.el | 4 ++--
lisp/replace.el | 12 ++++++------
lisp/simple.el | 2 +-
lisp/tab-bar.el | 4 ++--
lisp/term.el | 2 +-
lisp/textmodes/reftex-index.el | 4 ++--
lisp/vc/emerge.el | 4 ++--
lisp/windmove.el | 2 +-
lisp/winner.el | 4 ++--
33 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/lisp/align.el b/lisp/align.el
index 9364d54665..1ee6bb0cac 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -841,8 +841,8 @@ Interactively, BEG and END are the mark/point of the
current region.
Many modes define specific alignment rules, and some of these
rules in some modes react to the current prefix argument. For
-instance, in `text-mode', `M-x align' will align into columns
-based on space delimiters, while `C-u - M-x align' will align
+instance, in `text-mode', \\`M-x align' will align into columns
+based on space delimiters, while \\`C-u -' \\`M-x align' will align
into columns based on the \"$\" character. See the
`align-rules-list' variable definition for the specific rules.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c67a104b4c..0cf1834a4f 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1013,7 +1013,7 @@ if `inhibit-field-text-motion' is non-nil."
(let ((map (make-sparse-keymap)))
(define-key map "u" 'undo)
map)
- "Keymap to repeat undo key sequences `C-x u u'. Used in `repeat-mode'.")
+ "Keymap to repeat undo key sequences \\`C-x u u'. Used in `repeat-mode'.")
(put 'undo 'repeat-map 'undo-repeat-map)
(define-key global-map '[(control ??)] 'undo-redo)
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 9a580d9602..bb427ef86e 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -335,7 +335,8 @@
(message (concat
"Embedded Calc mode enabled; "
(if calc-embedded-quiet
- "Type `C-x * x'"
+ (substitute-command-keys
+ "Type \\`C-x * x'")
"Give this command again")
" to return to normal")))))
(scroll-down 0))) ; fix a bug which occurs when truncate-lines is changed.
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index ec30ee7e0f..f11d9741ec 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -678,7 +678,7 @@
(or last-kbd-macro
(error "No keyboard macro defined"))
(setq calc-invocation-macro last-kbd-macro)
- (message "Use `C-x * Z' to invoke this macro"))
+ (message (substitute-command-keys "Use \\`C-x * Z' to invoke this macro")))
(defun calc-user-define-edit ()
(interactive) ; but no calc-wrapper!
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index c98505a0b1..71cc68b0c2 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -715,9 +715,9 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
(insert (propertize
(concat
(or title title "Calc Edit Mode. ")
- (format-message "Press `C-c C-c'")
+ (substitute-command-keys "Press \\`C-c C-c'")
(if allow-ret "" " or RET")
- (format-message " to finish, `C-x k RET' to cancel.\n\n"))
+ (substitute-command-keys " to finish, \\`C-x k RET' to
cancel.\n\n"))
'font-lock-face 'italic 'read-only t 'rear-nonsticky t
'front-sticky t))
(setq-local calc-edit-top (point))))
diff --git a/lisp/comint.el b/lisp/comint.el
index 92262eab32..4fc1ffcf0c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1466,7 +1466,7 @@ A useful command to bind to SPC. See
`comint-replace-by-expanded-history'."
(defcustom comint-history-isearch nil
"Non-nil to Isearch in input history only, not in comint buffer output.
-If t, usual Isearch keys like `C-r' and `C-M-r' in comint mode search
+If t, usual Isearch keys like \\`C-r' and \\`C-M-r' in comint mode search
in the input history.
If `dwim', Isearch keys search in the input history only when initial
point position is at the comint command line. When starting Isearch
@@ -2812,7 +2812,7 @@ Interactively, if no prefix argument is given, the last
argument is inserted.
Repeated interactive invocations will cycle through the same argument
from progressively earlier commands (using the value of INDEX specified
with the first command). Values of INDEX < 0 count from the end, so
-INDEX = -1 is the last argument. This command is like `M-.' in
+INDEX = -1 is the last argument. This command is like \"M-.\" in
Bash and zsh."
(interactive "P")
(unless (null index)
diff --git a/lisp/dired.el b/lisp/dired.el
index 6b9bb35543..3eff218728 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2469,7 +2469,7 @@ Type \\[dired-do-copy] to Copy files.
Type \\[dired-sort-toggle-or-edit] to toggle Sorting by name/date or change
the `ls' switches.
Type \\[revert-buffer] to read all currently expanded directories aGain.
This retains all marks and hides subdirs again that were hidden before.
-Use `SPC' and `DEL' to move down and up by lines.
+Use \\`SPC' and \\`DEL' to move down and up by lines.
If Dired ever gets confused, you can either type \\[revert-buffer] \
to read the
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index b1c361145c..be87d788e9 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -559,10 +559,10 @@ and improving upon much of it.
2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they
do not cause Emacs to quit, except at user level 1 (for a novice).
3. ^X^C EXITS EMACS.
- 4. Viper supports multiple undo: `u' will undo. Typing `.' will repeat
- undo. Another `u' changes direction.
+ 4. Viper supports multiple undo: \\`u' will undo. Typing \\`.' will repeat
+ undo. Another \\`u' changes direction.
- 6. Emacs Meta key is `C-\\' (in all modes) or `\\ ESC' (in Vi command mode).
+ 6. Emacs Meta key is \\`C-\\' (in all modes) or \\`\\ ESC' (in Vi command
mode).
On a window system, the best way is to use the Meta-key on your keyboard.
7. Try \\[keyboard-quit] and \\[abort-recursive-edit] repeatedly,if
something funny happens. This would abort the current editing command.
@@ -573,12 +573,12 @@ For more information on Viper:
b. Print Viper manual, found in ./etc/viper.dvi
c. Print the Quick Reference, found in ./etc/viperCard.dvi
-To submit a bug report or to contact the author, type :submitReport in Vi
+To submit a bug report or to contact the author, type \\`:submitReport' in Vi
command mode. To shoo Viper away and return to pure Emacs (horror!), type:
\\[viper-go-away]
-This startup message appears whenever you load Viper, unless you type `y' now."
+This startup message appears whenever you load Viper, unless you type \\`y'
now."
))
(goto-char (point-min))
(if (y-or-n-p "Inhibit Viper startup message? ")
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index aeada705c4..bccf0e6f1f 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -71,7 +71,7 @@
"Face used for highlighting buttons in ERC buffers.
A button is a piece of text that you can activate by pressing
-`RET' or `mouse-2' above it. See also `erc-button-keymap'."
+\\`RET' or `mouse-2' above it. See also `erc-button-keymap'."
:type 'face
:group 'erc-faces)
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 59b79bcfd9..d02a8d13e5 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -46,7 +46,7 @@
(defcustom erc-track-enable-keybindings 'ask
"Whether to enable the ERC track keybindings, namely:
-`C-c C-SPC' and `C-c C-@', which both do the same thing.
+\\`C-c C-SPC' and \\`C-c C-@', which both do the same thing.
The default is to check to see whether these keys are used
already: if not, then enable the ERC track minor mode, which
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 59c3bbc76e..2a56a12dbb 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -743,7 +743,7 @@ Each element is a regular expression."
"Face used for highlighting buttons in the article buffer.
An article button is a piece of text that you can activate by pressing
-`RET' or `mouse-2' above it."
+\\`RET' or `mouse-2' above it."
:type 'face
:group 'gnus-article-buttons)
diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el
index 300532de28..96f515119d 100644
--- a/lisp/gnus/gnus-eform.el
+++ b/lisp/gnus/gnus-eform.el
@@ -92,7 +92,7 @@ The optional LAYOUT overrides the `edit-form' window layout."
(insert ";;; ")
(forward-line 1))
(insert (substitute-command-keys
- ";; Type `C-c C-c' after you've finished editing.\n"))
+ ";; Type \\`C-c C-c' after you've finished editing.\n"))
(insert "\n")
(let ((p (point)))
(gnus-pp form)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index a4f98c9157..7f96e16c8a 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -97,7 +97,7 @@ See `gnus-group-goto-unread'."
:type 'boolean)
(defcustom gnus-summary-stop-at-end-of-message nil
- "If non-nil, don't select the next message when using `SPC'."
+ "If non-nil, don't select the next message when using \\`SPC'."
:link '(custom-manual "(gnus)Group Maneuvering")
:group 'gnus-summary-maneuvering
:version "24.1"
@@ -264,8 +264,8 @@ This variable will only be used if the value of
(defcustom gnus-summary-goto-unread nil
"If t, many commands will go to the next unread article.
This applies to marking commands as well as other commands that
-\"naturally\" select the next article, like, for instance, `SPC' at
-the end of an article.
+\"naturally\" select the next article, like, for instance, \\`SPC'
+at the end of an article.
If nil, the marking commands do NOT go to the next unread article
\(they go to the next article instead). If `never', commands that
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 0bc6330cc5..9640d98ca8 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -81,7 +81,7 @@ selection process starts again from the user's $HOME.")
This means to show completions even when the current minibuffer contents
is the same as was the initial input after minibuffer activation.
This also means that if you traverse the list of completions with
-commands like `C-.' and just hit RET without typing any
+commands like \\`C-.' and just hit \\`RET' without typing any
characters, the match under point will be chosen instead of the
default."
:type 'boolean
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 684f2ff3fc..46c555df27 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -286,7 +286,7 @@ Stop if the bottom edge of the image is reached.
Interactively, giving this command a numerical prefix will scroll
up by that many lines (and down by that many lines if the number
is negative). Without a prefix, scroll up by a full screen.
-If given a `C-u -' prefix, scroll a full page down instead.
+If given a \\`C-u -' prefix, scroll a full page down instead.
If N is omitted or nil, scroll upward by a near full screen.
A near full screen is `next-screen-context-lines' less than a full screen.
@@ -314,7 +314,7 @@ Stop if the top edge of the image is reached.
Interactively, giving this command a numerical prefix will scroll
down by that many lines (and up by that many lines if the number
is negative). Without a prefix, scroll down by a full screen.
-If given a `C-u -' prefix, scroll a full page up instead.
+If given a \\`C-u -' prefix, scroll a full page up instead.
If N is omitted or nil, scroll downward by a near full screen.
A near full screen is `next-screen-context-lines' less than a full screen.
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 912c4b72a0..90fdc06b1e 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -375,12 +375,12 @@ sequence VECTOR. (VECTOR is normally one character
long.)")
(defun iso-transl-set-language (lang)
"Set shorter key bindings for some characters relevant for LANG.
-This affects the `C-x 8' prefix.
+This affects the \\`C-x 8' prefix.
Note that only a few languages are supported, and for more
rigorous support it is recommended to use an input method
instead. Also note that many of these characters can be input
-with the regular `C-x 8' map without having to specify a language
+with the regular \\`C-x 8' map without having to specify a language
here."
(interactive (list (let ((completion-ignore-case t))
(completing-read "Set which language? "
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 34c3665bd8..db7b53c014 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1103,7 +1103,7 @@ In incremental searches, a space or spaces normally
matches any
whitespace defined by the variable `search-whitespace-regexp'.
To search for a literal space and nothing else, enter C-q SPC.
To toggle whitespace matching, use `isearch-toggle-lax-whitespace',
-usually bound to `M-s SPC' during isearch.
+usually bound to \\`M-s SPC' during isearch.
This command does not support character folding."
(interactive "P\np")
(isearch-mode t (null not-regexp) nil (not no-recursive-edit)))
diff --git a/lisp/misc.el b/lisp/misc.el
index 8a01b51c6d..28c5d6e07f 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -151,7 +151,7 @@ ripples outward, changing the flow of the eddy currents in
the
upper atmosphere. These cause momentary pockets of higher-pressure
air to form, which act as lenses that deflect incoming cosmic rays,
focusing them to strike the drive platter and flip the desired bit.
-You can type `M-x butterfly C-M-c' to run it. This is a permuted
+You can type \\`M-x butterfly C-M-c' to run it. This is a permuted
variation of `C-x M-c M-butterfly' from url `https://xkcd.com/378/'."
(interactive)
(if (yes-or-no-p "Do you really want to unleash the powers of the butterfly?
")
diff --git a/lisp/outline.el b/lisp/outline.el
index 7fd43195cc..38a37fb74d 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1,7 +1,6 @@
;;; outline.el --- outline mode commands for Emacs -*- lexical-binding: t; -*-
-;; Copyright (C) 1986, 1993-1995, 1997, 2000-2022 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1986-2022 Free Software Foundation, Inc.
;; Maintainer: emacs-devel@gnu.org
;; Keywords: outlines
@@ -182,7 +181,7 @@ in the file it applies to.")
This option controls, in Outline minor mode, where on a heading typing
the key sequences bound to visibility-cycling commands like `outline-cycle'
and `outline-cycle-buffer' will invoke those commands. By default, you can
-invoke these commands by typing `TAB' and `S-TAB' anywhere on a heading line,
+invoke these commands by typing \\`TAB' and \\`S-TAB' anywhere on a heading
line,
but customizing this option can make those bindings be in effect only at
specific positions on the heading, like only at the line's beginning or
line's end. This allows these keys to be bound to their usual commands,
@@ -381,9 +380,9 @@ After that, changing the prefix key requires manipulating
keymaps."
(defcustom outline-minor-mode-cycle nil
"Enable visibility-cycling commands on headings in `outline-minor-mode'.
-If enabled, typing `TAB' on a heading line cycles the visibility
+If enabled, typing \\`TAB' on a heading line cycles the visibility
state of that heading's body between `hide all', `headings only'
-and `show all' (`outline-cycle'), and typing `S-TAB' on a heading
+and `show all' (`outline-cycle'), and typing \\`S-TAB' on a heading
line likewise cycles the visibility state of the whole buffer
\(`outline-cycle-buffer').
Typing these keys anywhere outside heading lines invokes their default
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4f90a53444..423de7d581 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1218,7 +1218,7 @@ to specify a command to run.
If CONFIRM is non-nil, the user will be given an opportunity to edit the
command before it's run.
-Interactively, the user can use the `M-c' command while entering
+Interactively, the user can use the \\`M-c' command while entering
the regexp to indicate whether the grep should be case sensitive
or not."
(interactive
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 26fecf9c9f..d277eef284 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -334,7 +334,7 @@ Used to gray out relevant toolbar icons.")
(">" . gud-down)))
(define-key map key cmd))
map)
- "Keymap to repeat `gud-gdb' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `gud-gdb' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
(defun gud-set-repeat-map-property (keymap-symbol)
@@ -1054,7 +1054,7 @@ SKIP is the number of chars to skip on each line, it
defaults to 0."
("l" . gud-refresh)))
(define-key map key cmd))
map)
- "Keymap to repeat `sdb' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `sdb' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
(defun gud-sdb-marker-filter (string)
@@ -1301,7 +1301,7 @@ whereby $stopformat=1 produces an output format
compatible with
gud-irix-p)
(define-key map "f" 'gud-finish))
map)
- "Keymap to repeat `dbx' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `dbx' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
;; The process filter is also somewhat
@@ -1476,7 +1476,7 @@ and source-file directory for your debugger."
(">" . gud-down)))
(define-key map key cmd))
map)
- "Keymap to repeat `xdb' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `xdb' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
(defcustom gud-xdb-directories nil
@@ -1564,7 +1564,7 @@ directories if your program contains sources from more
than one directory."
("l" . gud-refresh)))
(define-key map key cmd))
map)
- "Keymap to repeat `perldb' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `perldb' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
(defun gud-perldb-massage-args (_file args)
@@ -1754,7 +1754,7 @@ working directory and source-file directory for your
debugger."
(">" . gud-down)))
(define-key map key cmd))
map)
- "Keymap to repeat `pdb' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `pdb' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
;; There's no guarantee that Emacs will hand the filter the entire
@@ -1871,7 +1871,7 @@ directory and source-file directory for your debugger."
(">" . gud-down)))
(define-key map key cmd))
map)
- "Keymap to repeat `guiler' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `guiler' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
(defun gud-guiler-marker-filter (string)
@@ -2398,7 +2398,7 @@ extension EXTN. Normally EXTN is given as the regular
expression
("l" . gud-refresh)))
(define-key map key cmd))
map)
- "Keymap to repeat `jdb' stepping instructions `C-x C-a C-n n n'.
+ "Keymap to repeat `jdb' stepping instructions \\`C-x C-a C-n n n'.
Used in `repeat-mode'.")
(defun gud-jdb-find-source-using-classpath (p)
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index b606352136..d21a9faec9 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -231,7 +231,7 @@ because these are used as separators by IDL."
(defcustom idlwave-shell-graphics-window-size '(500 400)
"Size of IDL graphics windows popped up by special IDLWAVE command.
-The command is `C-c C-d C-f' and accepts as a prefix the window nr.
+The command is \\`C-c C-d C-f' and accepts as a prefix the window nr.
A command like `WINDOW,N,xsize=XX,ysize=YY' is sent to IDL."
:group 'idlwave-shell-general-setup
:type '(list
@@ -844,7 +844,7 @@ IDL has currently stepped.")
---------
A complete set of commands for compiling and debugging IDL programs
is available from the menu. Also keybindings starting with a
- `C-c C-d' prefix are available for most commands in the *idl* buffer
+ \\`C-c C-d' prefix are available for most commands in the *idl* buffer
and also in source buffers. The best place to learn about the
keybindings is again the menu.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index f55e3449e4..a2061fde76 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -1001,9 +1001,9 @@ Obsolete, if the IDL Assistant is being used for help."
"List of modifiers to be used for the debugging commands.
Will be used to bind debugging commands in the shell buffer and in all
source buffers. These are additional convenience bindings, the debugging
-commands are always available with the `C-c C-d' prefix.
+commands are always available with the \\`C-c C-d' prefix.
If you set this to (control shift), this means setting a breakpoint will
-be on `C-S-b', compiling a source file on `C-S-c' etc. Possible modifiers
+be on \\`C-S-b', compiling a source file on \\`C-S-c' etc. Possible modifiers
are `control', `meta', `super', `hyper', `alt', and `shift'."
:group 'idlwave-shell-general-setup
:type '(set :tag "Specify modifiers"
@@ -8421,7 +8421,7 @@ was pressed."
(defun idlwave-list-shell-load-path-shadows (&optional _arg)
"List the load path shadows of all routines compiled under the shell.
This is very useful for checking an IDL application. Just compile the
-application, do RESOLVE_ALL, and `C-c C-i' to compile all referenced
+application, do RESOLVE_ALL, and \\`C-c C-i' to compile all referenced
routines and update IDLWAVE internal info. Then check for shadowing
with this command."
(interactive)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7a626ae35e..f1191b8faa 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3110,7 +3110,8 @@ of `error' with a user-friendly message."
(or (python-shell-get-process)
(if interactivep
(user-error
- "Start a Python process first with `M-x run-python' or `%s'"
+ (substitute-command-keys
+ "Start a Python process first with \\`M-x run-python' or `%s'")
;; Get the binding.
(key-description
(where-is-internal
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 608f7aaf98..d69640a29c 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -368,8 +368,8 @@ When non-nil and the last typed key (with or without
modifiers)
doesn't exist in the keymap attached by the `repeat-map' property,
then don't activate that keymap for the next command. So only the
same keys among repeatable keys are allowed in the repeating sequence.
-For example, with a non-nil value, only `C-x u u' repeats undo,
-whereas `C-/ u' doesn't.
+For example, with a non-nil value, only \\`C-x u u' repeats undo,
+whereas \\`C-/ u' doesn't.
You can also set the property `repeat-check-key' on the command symbol.
This property can override the value of this variable.
diff --git a/lisp/replace.el b/lisp/replace.el
index 34c3d5299e..163d582148 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -415,7 +415,7 @@ word boundaries. A negative prefix arg means replace
backward.
Use \\<minibuffer-local-map>\\[next-history-element] \
to pull the last incremental search string to the minibuffer
that reads FROM-STRING, or invoke replacements from
-incremental search with a key sequence like `C-s C-s M-%'
+incremental search with a key sequence like \\`C-s C-s M-%'
to use its current search string as the string to replace.
Matching is independent of case if both `case-fold-search'
@@ -472,8 +472,8 @@ To customize possible responses, change the bindings in
`query-replace-map'."
(defun query-replace-regexp (regexp to-string &optional delimited start end
backward region-noncontiguous-p)
"Replace some things after point matching REGEXP with TO-STRING.
As each match is found, the user must type a character saying
-what to do with it. Type SPC or `y' to replace the match,
-DEL or `n' to skip and go to the next match. For more directions,
+what to do with it. Type \\`SPC' or \\`y' to replace the match,
+\\`DEL' or \\`n' to skip and go to the next match. For more directions,
type \\[help-command] at that time.
In Transient Mark mode, if the mark is active, operate on the contents
@@ -481,12 +481,12 @@ of the region. Otherwise, operate from point to the end
of the buffer's
accessible portion.
When invoked interactively, matching a newline with `\\n' will not work;
-use `C-q C-j' instead. To match a tab character (`\\t'), just press `TAB'.
+use \\`C-q C-j' instead. To match a tab character (`\\t'), just press \\`TAB'.
Use \\<minibuffer-local-map>\\[next-history-element] \
to pull the last incremental search regexp to the minibuffer
that reads REGEXP, or invoke replacements from
-incremental search with a key sequence like `C-M-s C-M-s C-M-%'
+incremental search with a key sequence like \\`C-M-s C-M-s C-M-%'
to use its current search regexp as the regexp to replace.
Matching is independent of case if both `case-fold-search'
@@ -931,7 +931,7 @@ in \":\", followed by optional whitespace), DEFAULT is
added to the prompt.
The optional argument HISTORY is a symbol to use for the history list.
If nil, use `regexp-history'.
-If the user has used the `M-c' command to specify case
+If the user has used the \\`M-c' command to specify case
sensitivity, the returned string will have a text property named
`case-fold' that has a value of either `fold' or
`inhibit-fold'. (It's up to the caller of `read-regexp' to
diff --git a/lisp/simple.el b/lisp/simple.el
index ea94727b3a..d02a32b944 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2211,7 +2211,7 @@ to get different commands to edit and resubmit."
If it's nil, include all the commands.
If it's a function, it will be called with two parameters: the
symbol of the command and a buffer. The predicate should return
-non-nil if the command should be present when doing `M-x TAB'
+non-nil if the command should be present when doing \\`M-x TAB'
in that buffer."
:version "28.1"
:group 'completion
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 705b072501..4ca177f73b 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -2425,7 +2425,7 @@ When `switch-to-buffer-obey-display-actions' is non-nil,
(define-key map "o" 'tab-next)
(define-key map "O" 'tab-previous)
map)
- "Keymap to repeat tab switch key sequences `C-x t o o O'.
+ "Keymap to repeat tab switch key sequences \\`C-x t o o O'.
Used in `repeat-mode'.")
(put 'tab-next 'repeat-map 'tab-bar-switch-repeat-map)
(put 'tab-previous 'repeat-map 'tab-bar-switch-repeat-map)
@@ -2435,7 +2435,7 @@ Used in `repeat-mode'.")
(define-key map "m" 'tab-move)
(define-key map "M" 'tab-bar-move-tab-backward)
map)
- "Keymap to repeat tab move key sequences `C-x t m m M'.
+ "Keymap to repeat tab move key sequences \\`C-x t m m M'.
Used in `repeat-mode'.")
(put 'tab-move 'repeat-map 'tab-bar-move-repeat-map)
(put 'tab-bar-move-tab-backward 'repeat-map 'tab-bar-move-repeat-map)
diff --git a/lisp/term.el b/lisp/term.el
index 3bf1531fcd..c129ed976d 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4373,7 +4373,7 @@ the process. Any more args are arguments to PROGRAM."
(defun ansi-term (program &optional new-buffer-name)
"Start a terminal-emulator in a new buffer.
This is almost the same as `term' apart from always creating a new buffer,
-and `C-x' being marked as a `term-escape-char'."
+and \\`C-x' being marked as a `term-escape-char'."
(interactive (list (read-from-minibuffer "Run program: "
(or explicit-shell-file-name
(getenv "ESHELL")
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 9adf0c819b..aeae389da6 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1685,8 +1685,8 @@ this function repeatedly."
(defun reftex-index-phrases-set-macro-key ()
"Change the macro key for the current line.
Prompts for a macro key and insert is at the beginning of the line.
-If you reply with SPACE, the macro keyn will be removed, so that the
-default macro will be used. If you reply with `RET', just prints
+If you reply with \\`SPC', the macro key will be removed, so that the
+default macro will be used. If you reply with \\`RET', just prints
information about the currently selected macro."
(interactive)
(reftex-index-phrases-parse-header)
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index b2fdb07d5f..6e94ea0715 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -1647,7 +1647,7 @@ the height of the merge window.
(defun emerge-scroll-left (&optional arg)
"Scroll left all three merge buffers, if they are in windows.
If an argument is given, that is how many columns are scrolled, else nearly
-the width of the A and B windows. `C-u -' alone as argument scrolls half the
+the width of the A and B windows. \\`C-u -' alone as argument scrolls half the
width of the A and B windows."
(interactive "P")
(emerge-operate-on-windows
@@ -1675,7 +1675,7 @@ width of the A and B windows."
(defun emerge-scroll-right (&optional arg)
"Scroll right all three merge buffers, if they are in windows.
If an argument is given, that is how many columns are scrolled, else nearly
-the width of the A and B windows. `C-u -' alone as argument scrolls half the
+the width of the A and B windows. \\`C-u -' alone as argument scrolls half the
width of the A and B windows."
(interactive "P")
(emerge-operate-on-windows
diff --git a/lisp/windmove.el b/lisp/windmove.el
index c8ea4fd1e5..958a9585dc 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -644,7 +644,7 @@ Default value of MODIFIERS is `shift-meta'."
(defun windmove-delete-in-direction (dir &optional arg)
"Delete the window at direction DIR.
If prefix ARG is `\\[universal-argument]', also kill the buffer in that window.
-With `M-0' prefix, delete the selected window and
+With \\`M-0' prefix, delete the selected window and
select the window at direction DIR.
When `windmove-wrap-around' is non-nil, takes the window
from the opposite side of the frame."
diff --git a/lisp/winner.el b/lisp/winner.el
index e671b83880..9b2433b492 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -343,8 +343,8 @@ Winner mode is a global minor mode that records the changes
in
the window configuration (i.e. how the frames are partitioned
into windows) so that the changes can be \"undone\" using the
command `winner-undo'. By default this one is bound to the key
-sequence `C-c <left>'. If you change your mind (while undoing),
-you can press `C-c <right>' (calling `winner-redo')."
+sequence \\`C-c <left>'. If you change your mind (while undoing),
+you can press \\`C-c <right>' (calling `winner-redo')."
:global t
(if winner-mode
(progn
- master updated (e3f8dd9023 -> ae3416d694), Stefan Kangas, 2022/07/03
- master 8bb770234d 1/7: Fix warning in last commit, Stefan Kangas, 2022/07/03
- master 05297e40c0 6/7: Quote some literal keys to get help-key-binding face,
Stefan Kangas <=
- master b000bd47a6 2/7: Font lock \\<> and \\{} command substitutions in docstrings, Stefan Kangas, 2022/07/03
- master e688176b21 3/7: Use substitute-command-keys in reftex-toc-show-help, Stefan Kangas, 2022/07/03
- master 5cb8303f6b 4/7: Normalize definition of erc-track-minor-mode-map, Stefan Kangas, 2022/07/03
- master bda6e9a226 5/7: Use command substitutions instead of literal keys in some places, Stefan Kangas, 2022/07/03
- master ae3416d694 7/7: Simplify lisp-el-font-lock-keywords-2 definition slightly, Stefan Kangas, 2022/07/03