Remove no-op calls to substitute-command-keys

* lisp/org/org-src.el (org-edit-src-code)
(org-edit-fixed-width-region):
* lisp/simple.el (completion-setup-function):
Remove calls to substitute-command-keys that always just return
their argument.

diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 5c2ceaf341bcdffea297c50a73a498014a05df55..12d7fa1264ce56e9a851663546763755e9514328 100644 (file)
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -270,8 +270,7 @@ the display of windows containing the Org buffer and the code buffer."
       (setq beg (move-marker beg (nth 0 info))
            end (move-marker end (nth 1 info))
            msg (if allow-write-back-p
-                   (substitute-command-keys
-                    "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort")
+                    "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort"
                  "Exit with C-c ' (C-c and single quote) -- C-c C-k to abort")
            code (or code (buffer-substring-no-properties beg end))
            lang (or (cdr (assoc (nth 2 info) org-src-lang-modes))
@@ -468,8 +467,7 @@ the fragment in the Org-mode buffer."
   (let ((line (org-current-line))
        (col (current-column))
        (case-fold-search t)
-       (msg (substitute-command-keys
-             "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort"))
+       (msg "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort")
        (org-mode-p (derived-mode-p 'org-mode))
        (beg (make-marker))
        (end (make-marker))

diff --git a/lisp/simple.el b/lisp/simple.el
index 00c25db07d780bd0cfed3e0f2ac45041538730c3..2636777bb9e968b4b112ea6a82664a10ee8e691d 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7686,8 +7686,7 @@ Called from `temp-buffer-show-hook'."
       (when completion-show-help
        (goto-char (point-min))
        (if (display-mouse-p)
-           (insert (substitute-command-keys
-                    "Click on a completion to select it.\n")))
+           (insert "Click on a completion to select it.\n"))
        (insert (substitute-command-keys
                 "In this buffer, type \\[choose-completion] to \
 select the completion near point.\n\n"))))))