diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2015-08-23 13:42:04 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2015-08-23 16:33:39 +0200 |
| commit | 0b0c9565d050bfecc581b342c40b719917395896 (patch) | |
| tree | 66db74031501dff2cd612095c62a6d065a25b023 /lisp/faces.el | |
| parent | 70ff62413a17cbe5a4f218202a6a91c38d86c8c8 (diff) | |
| download | emacs-0b0c9565d050bfecc581b342c40b719917395896.tar.gz | |
Revert "Prefer ‘format’ to ‘substitute-command-keys’"
This reverts commit 6af5aad26411ffe21c3fe4bc5438347110910111.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 15ed699aaa8..e628ee7870b 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1436,10 +1436,12 @@ If FRAME is omitted or nil, use the selected frame." (when alias (setq face alias) (insert - (format "\n %s is an alias for the face ‘%s’.\n%s" + (format (substitute-command-keys + "\n %s is an alias for the face ‘%s’.\n%s") f alias (if (setq obsolete (get f 'obsolete-face)) - (format " This face is obsolete%s; use ‘%s’ instead.\n" + (format (substitute-command-keys + " This face is obsolete%s; use ‘%s’ instead.\n") (if (stringp obsolete) (format " since %s" obsolete) "") @@ -1457,11 +1459,13 @@ If FRAME is omitted or nil, use the selected frame." (help-xref-button 1 'help-customize-face f))) (setq file-name (find-lisp-object-file-name f 'defface)) (when file-name - (princ (format "Defined in ‘%s’" - (file-name-nondirectory file-name))) + (princ (substitute-command-keys "Defined in ‘")) + (princ (file-name-nondirectory file-name)) + (princ (substitute-command-keys "’")) ;; Make a hyperlink to the library. (save-excursion - (re-search-backward (format "‘\\([^‘’]+\\)’") nil t) + (re-search-backward + (substitute-command-keys "‘\\([^‘’]+\\)’") nil t) (help-xref-button 1 'help-face-def f file-name)) (princ ".") (terpri) |