aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-08-09 07:48:00 -0700
committerPaul Eggert2015-08-09 07:48:23 -0700
commit5091586f5704280e04dc3d12354965d24693f0d5 (patch)
treeb6727c9f3864fef6999dd54fb0d78c7f67ce8462
parentcec82457f27476dd6f2882649f1b0e7ad342338f (diff)
downloademacs-5091586f5704280e04dc3d12354965d24693f0d5.tar.gz
emacs-5091586f5704280e04dc3d12354965d24693f0d5.zip
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.
-rw-r--r--lisp/org/org-src.el6
-rw-r--r--lisp/simple.el3
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."
270 (setq beg (move-marker beg (nth 0 info)) 270 (setq beg (move-marker beg (nth 0 info))
271 end (move-marker end (nth 1 info)) 271 end (move-marker end (nth 1 info))
272 msg (if allow-write-back-p 272 msg (if allow-write-back-p
273 (substitute-command-keys 273 "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort"
274 "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort")
275 "Exit with C-c ' (C-c and single quote) -- C-c C-k to abort") 274 "Exit with C-c ' (C-c and single quote) -- C-c C-k to abort")
276 code (or code (buffer-substring-no-properties beg end)) 275 code (or code (buffer-substring-no-properties beg end))
277 lang (or (cdr (assoc (nth 2 info) org-src-lang-modes)) 276 lang (or (cdr (assoc (nth 2 info) org-src-lang-modes))
@@ -468,8 +467,7 @@ the fragment in the Org-mode buffer."
468 (let ((line (org-current-line)) 467 (let ((line (org-current-line))
469 (col (current-column)) 468 (col (current-column))
470 (case-fold-search t) 469 (case-fold-search t)
471 (msg (substitute-command-keys 470 (msg "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort")
472 "Edit, then exit with C-c ' (C-c and single quote) -- C-c C-k to abort"))
473 (org-mode-p (derived-mode-p 'org-mode)) 471 (org-mode-p (derived-mode-p 'org-mode))
474 (beg (make-marker)) 472 (beg (make-marker))
475 (end (make-marker)) 473 (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'."
7686 (when completion-show-help 7686 (when completion-show-help
7687 (goto-char (point-min)) 7687 (goto-char (point-min))
7688 (if (display-mouse-p) 7688 (if (display-mouse-p)
7689 (insert (substitute-command-keys 7689 (insert "Click on a completion to select it.\n"))
7690 "Click on a completion to select it.\n")))
7691 (insert (substitute-command-keys 7690 (insert (substitute-command-keys
7692 "In this buffer, type \\[choose-completion] to \ 7691 "In this buffer, type \\[choose-completion] to \
7693select the completion near point.\n\n")))))) 7692select the completion near point.\n\n"))))))