branch: externals/marginalia
commit 61f374e1c2b4a580b7d3923dca59452968554fa8
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Simplify marginalia--function-args
---
marginalia.el | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 1b906af..34db149 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -416,19 +416,17 @@ t cl-type"
;; Derived from elisp-get-fnsym-args-string
(defun marginalia--function-args (sym)
"Return function arguments for SYM."
- (let* ((advertised (gethash (indirect-function sym)
- advertised-signature-table t))
- doc
- (args
- (cond
- ((listp advertised) advertised)
- ((setq doc (help-split-fundoc
- (condition-case nil (documentation sym t)
- (invalid-function nil))
- sym))
- (substitute-command-keys (car doc)))
- (t (help-function-arglist sym)))))
- (elisp-function-argstring args)))
+ (let ((tmp))
+ (elisp-function-argstring
+ (cond
+ ((listp (setq tmp (gethash (indirect-function sym)
+ advertised-signature-table t)))
+ tmp)
+ ((setq tmp (help-split-fundoc
+ (ignore-errors (documentation sym t))
+ sym))
+ (substitute-command-keys (car tmp)))
+ (t (help-function-arglist sym))))))
(defun marginalia-annotate-symbol (cand)
"Annotate symbol CAND with its documentation string."
