diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-14 15:50:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-14 15:55:58 -0700 |
| commit | 6af5aad26411ffe21c3fe4bc5438347110910111 (patch) | |
| tree | 2fdf4b741c5025f60924c902123bb31536eca511 /lisp/faces.el | |
| parent | 244c801689d2f7a80480d83cd7d092d4762ebe08 (diff) | |
| download | emacs-6af5aad26411ffe21c3fe4bc5438347110910111.tar.gz | |
Prefer ‘format’ to ‘substitute-command-keys’
* src/character.h (uLSQM, uRSQM): Move here ...
* src/doc.c (uLSQM, uRSQM): ... from here.
* src/doc.c (Fsubstitute_command_keys):
* src/syntax.c (Finternal_describe_syntax_value):
* lisp/cedet/mode-local.el (mode-local-print-binding)
(mode-local-describe-bindings-2):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/cl-extra.el (cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode):
Prefer ‘format’ to ‘substitute-command-keys’ when either will do
to implement quoting style. This generally makes the code simpler.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 511b3541265..125b14d8085 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1435,12 +1435,10 @@ If FRAME is omitted or nil, use the selected frame." (when alias (setq face alias) (insert - (format (substitute-command-keys - "\n %s is an alias for the face ‘%s’.\n%s") + (format "\n %s is an alias for the face ‘%s’.\n%s" f alias (if (setq obsolete (get f 'obsolete-face)) - (format (substitute-command-keys - " This face is obsolete%s; use ‘%s’ instead.\n") + (format " This face is obsolete%s; use ‘%s’ instead.\n" (if (stringp obsolete) (format " since %s" obsolete) "") @@ -1458,13 +1456,11 @@ 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 (substitute-command-keys "Defined in ‘")) - (princ (file-name-nondirectory file-name)) - (princ (substitute-command-keys "’")) + (princ (format "Defined in ‘%s’" + (file-name-nondirectory file-name))) ;; Make a hyperlink to the library. (save-excursion - (re-search-backward - (substitute-command-keys "‘\\([^‘’]+\\)’") nil t) + (re-search-backward (format "‘\\([^‘’]+\\)’") nil t) (help-xref-button 1 'help-face-def f file-name)) (princ ".") (terpri) |