From 5091586f5704280e04dc3d12354965d24693f0d5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Aug 2015 07:48:00 -0700 Subject: [PATCH] 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. --- lisp/org/org-src.el | 6 ++---- lisp/simple.el | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index 5c2ceaf341b..12d7fa1264c 100644 --- 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 00c25db07d7..2636777bb9e 100644 --- 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")))))) -- 2.39.2