From 719a3c821ba1a707968dcc55f14d4957e64a96bd Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 17 Jun 2022 16:29:44 +0200
Subject: [PATCH] Fix some command substitutions

* lisp/net/rcirc.el (rcirc-edit-multiline):
* lisp/textmodes/reftex-index.el (reftex-index-phrases-mode)
(reftex-index-phrase-selection-or-word):
* lisp/textmodes/remember.el (remember): Fix command substitutions.
---
 lisp/net/rcirc.el              | 5 ++++-
 lisp/textmodes/reftex-index.el | 5 +++--
 lisp/textmodes/remember.el     | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 0d30b349229..00b57ab8e73 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1708,7 +1708,10 @@ extracted."
       (setq rcirc-parent-buffer parent)
       (insert text)
       (and (> pos 0) (goto-char pos))
-      (message "Type C-c C-c to return text to %s, or C-c C-k to cancel" parent))))
+      (message "Type %s to return text to %s, or %s to cancel"
+               (substitute-command-keys "\\[rcirc-multiline-minor-submit]")
+               parent
+               (substitute-command-keys "\\[rcirc-multiline-minor-cancel]")))))
 
 (defvar rcirc-multiline-minor-mode-map
   (let ((map (make-sparse-keymap)))
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 734f82aba3f..9adf0c819bf 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1272,10 +1272,11 @@ This gets refreshed in every phrases command.")
 ;;;###autoload
 (defun reftex-index-phrase-selection-or-word (arg)
   "Add current selection or word at point to the phrases buffer.
+\\<reftex-index-phrases-mode-map>
 When you are in transient-mark-mode and the region is active, the
 selection will be used - otherwise the word at point.
 You get a chance to edit the entry in the phrases buffer - finish with
-`C-c C-c'."
+\\[reftex-index-phrases-save-and-return]."
   (interactive "P")
   (set-marker reftex-index-return-marker (point))
   (reftex-index-selection-or-word arg 'phrase)
@@ -1373,7 +1374,7 @@ If the buffer is non-empty, delete the old header first."
 ;;;###autoload
 (define-derived-mode reftex-index-phrases-mode fundamental-mode "Phrases"
   "Major mode for managing the Index phrases of a LaTeX document.
-This buffer was created with RefTeX.
+This buffer was created with RefTeX. \\<reftex-index-phrases-mode-map>
 
 To insert new phrases, use
  - `C-c \\' in the LaTeX document to copy selection or word
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index e72f86f7db6..f7ebe04bcf5 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -296,7 +296,8 @@ With a prefix or a visible region, use the region as INITIAL."
         (insert "\n\n" annotation))
       (setq remember-initial-contents nil)
       (goto-char (point-min)))
-    (message "Use C-c C-c to remember the data.")))
+    (message (substitute-command-keys
+              "Use \\[remember-finalize] to remember the data"))))
 
 ;;;###autoload
 (defun remember-other-frame (&optional initial)
-- 
2.39.2