summaryrefslogtreecommitdiff
path: root/lisp/descr-text.el
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/descr-text.el
parent70ff62413a17cbe5a4f218202a6a91c38d86c8c8 (diff)
Revert "Prefer ‘format’ to ‘substitute-command-keys’"
This reverts commit 6af5aad26411ffe21c3fe4bc5438347110910111.
Diffstat (limited to 'lisp/descr-text.el')
-rw-r--r--lisp/descr-text.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 579278ceaa0..71233d406e1 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -161,8 +161,11 @@ otherwise."
;; Buttons
(when (and button (not (widgetp wid-button)))
(newline)
- (insert (format "Here is a ‘%S’ button labeled ‘%s’.\n\n"
- button-type button-label)))
+ (insert (substitute-command-keys "Here is a ‘")
+ (format "%S" button-type)
+ (substitute-command-keys "’ button labeled ‘")
+ button-label
+ (substitute-command-keys "’.\n\n")))
;; Overlays
(when overlays
(newline)
@@ -736,7 +739,9 @@ relevant to POS."
(when face
(insert (propertize " " 'display '(space :align-to 5))
"face: ")
- (insert (format "‘%s’\n" face))))))
+ (insert (substitute-command-keys "‘")
+ (symbol-name face)
+ (substitute-command-keys "’\n"))))))
(insert "these terminal codes:\n")
(dotimes (i (length disp-vector))
(insert (car (aref disp-vector i))