emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/marginalia 61f374e 2/2: Simplify marginalia--function-a


From: ELPA Syncer
Subject: [elpa] externals/marginalia 61f374e 2/2: Simplify marginalia--function-args
Date: Wed, 14 Jul 2021 10:57:14 -0400 (EDT)

branch: externals/marginalia
commit 61f374e1c2b4a580b7d3923dca59452968554fa8
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    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."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]