[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 196ea8c 2/2: Tweak output of doc in advice--make-do
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 196ea8c 2/2: Tweak output of doc in advice--make-docstring |
Date: |
Sat, 13 Jul 2019 11:50:49 -0400 (EDT) |
branch: master
commit 196ea8c4b3ff20c41b8202a1cce746ca54232cbd
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Tweak output of doc in advice--make-docstring
* lisp/emacs-lisp/nadvice.el (advice--make-docstring): Make the
bit about the function/macro having an advice into a complete
sentence (bug#31063) and make it less dramatic.
---
lisp/emacs-lisp/nadvice.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index b0dd03ed..b7c2dab 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -87,8 +87,9 @@ Each element has the form (WHERE BYTECODE STACK) where:
"Build the raw docstring for FUNCTION, presumably advised."
(let* ((flist (indirect-function function))
(docfun nil)
+ (macrop (eq 'macro (car-safe flist)))
(docstring nil))
- (if (eq 'macro (car-safe flist)) (setq flist (cdr flist)))
+ (if macrop (setq flist (cdr flist)))
(while (advice--p flist)
(let ((doc (aref flist 4))
(where (advice--where flist)))
@@ -100,10 +101,11 @@ Each element has the form (WHERE BYTECODE STACK) where:
(setq docstring
(concat
docstring
- (propertize (format "%s advice: " where)
- 'face 'warning)
+ (format "This %s has %s advice: "
+ (if macrop "macro" "function")
+ where)
(let ((fun (advice--car flist)))
- (if (symbolp fun) (format-message "`%S'" fun)
+ (if (symbolp fun) (format-message "`%S'." fun)
(let* ((name (cdr (assq 'name (advice--props flist))))
(doc (documentation fun t))
(usage (help-split-fundoc doc function)))