summaryrefslogtreecommitdiff
path: root/lisp/cedet
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2015-08-23 13:42:04 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2015-08-23 16:33:39 +0200
commit0b0c9565d050bfecc581b342c40b719917395896 (patch)
tree66db74031501dff2cd612095c62a6d065a25b023 /lisp/cedet
parent70ff62413a17cbe5a4f218202a6a91c38d86c8c8 (diff)
downloademacs-0b0c9565d050bfecc581b342c40b719917395896.tar.gz
Revert "Prefer ‘format’ to ‘substitute-command-keys’"
This reverts commit 6af5aad26411ffe21c3fe4bc5438347110910111.
Diffstat (limited to 'lisp/cedet')
-rw-r--r--lisp/cedet/mode-local.el9
-rw-r--r--lisp/cedet/srecode/srt-mode.el4
2 files changed, 7 insertions, 6 deletions
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index aa1dd65068f..3bdc3ea6155 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -629,9 +629,10 @@ SYMBOL is a function that can be overridden."
(defun mode-local-print-binding (symbol)
"Print the SYMBOL binding."
(let ((value (symbol-value symbol)))
- (princ (format "\n ‘%s’ value is\n " symbol))
+ (princ (format (substitute-command-keys "\n ‘%s’ value is\n ")
+ symbol))
(if (and value (symbolp value))
- (princ (format "‘%s’" value))
+ (princ (format (substitute-command-keys "‘%s’") value))
(let ((pt (point)))
(pp value)
(save-excursion
@@ -689,7 +690,7 @@ SYMBOL is a function that can be overridden."
)
((symbolp buffer-or-mode)
(setq mode buffer-or-mode)
- (princ (format "‘%s’\n" buffer-or-mode))
+ (princ (format (substitute-command-keys "‘%s’\n") buffer-or-mode))
)
((signal 'wrong-type-argument
(list 'buffer-or-mode buffer-or-mode))))
@@ -699,7 +700,7 @@ SYMBOL is a function that can be overridden."
(while mode
(setq table (get mode 'mode-local-symbol-table))
(when table
- (princ (format "\n- From ‘%s’\n" mode))
+ (princ (format (substitute-command-keys "\n- From ‘%s’\n") mode))
(mode-local-print-bindings table))
(setq mode (get-mode-local-parent mode)))))
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index efcfe4ba51d..48f055561ea 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -258,9 +258,9 @@ we can tell font lock about them.")
(when (class-abstract-p C)
(throw 'skip nil))
- (princ (format "‘"))
+ (princ (substitute-command-keys "‘"))
(princ name)
- (princ (format "’"))
+ (princ (substitute-command-keys "’"))
(when (slot-exists-p C 'key)
(when key
(princ " - Character Key: ")