diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-03-12 16:42:51 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-03-12 16:42:51 +0100 |
| commit | 82bd6d57d54d4cdb205d921c2476d1dbb17f4188 (patch) | |
| tree | fca7c47620f8d246015b85aab8dd91e440847743 /lisp/help-fns.el | |
| parent | d9cd55a4f1c3f391b996dfbe77ed24306b37ac9f (diff) | |
| parent | a0854f939ce3a1de2c8cbc5e38b106a8df4480f6 (diff) | |
| download | emacs-82bd6d57d54d4cdb205d921c2476d1dbb17f4188.tar.gz emacs-82bd6d57d54d4cdb205d921c2476d1dbb17f4188.tar.bz2 emacs-82bd6d57d54d4cdb205d921c2476d1dbb17f4188.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'lisp/help-fns.el')
| -rw-r--r-- | lisp/help-fns.el | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 057f18f85bf..e20a1a5e6fb 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -466,13 +466,16 @@ suitable file is found, return nil." ;; If lots of ordinary text characters run this command, ;; don't mention them one by one. (if (< (length non-modified-keys) 10) - (princ (mapconcat #'key-description keys ", ")) + (with-current-buffer standard-output + (insert (mapconcat #'help--key-description-fontified + keys ", "))) (dolist (key non-modified-keys) (setq keys (delq key keys))) (if keys - (progn - (princ (mapconcat #'key-description keys ", ")) - (princ ", and many ordinary text characters")) + (with-current-buffer standard-output + (insert (mapconcat #'help--key-description-fontified + keys ", ")) + (insert ", and many ordinary text characters")) (princ "many ordinary text characters")))) (when (or remapped keys non-modified-keys) (princ ".") @@ -1826,10 +1829,12 @@ documentation for the major and minor modes of that buffer." (save-excursion (re-search-backward (substitute-command-keys "`\\([^`']+\\)'") nil t) - (help-xref-button 1 'help-function-def mode file-name))))) - (princ ":\n") - (princ (help-split-fundoc (documentation major-mode) nil 'doc)) - (princ (help-fns--list-local-commands))))) + (help-xref-button 1 'help-function-def mode file-name))))) + (let ((fundoc (help-split-fundoc (documentation major-mode) nil 'doc))) + (with-current-buffer standard-output + (insert ":\n") + (insert fundoc) + (insert (help-fns--list-local-commands))))))) ;; For the sake of IELM and maybe others nil) |