diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-02 14:36:54 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-02 14:36:54 +0000 |
| commit | 8d6c1239cb77da219180facf7937c259fc66767c (patch) | |
| tree | fe57546bf7b7a8be5bbbe76a2a174caf95f50b70 /lisp/emacs-lisp | |
| parent | c4861de07b4cb7d2379c621bb67d44dd3497efff (diff) | |
* help-fns.el (help-function-arglist): Don't check advertised-signature-table.
(describe-function-1): Do it here instead so it also applies to subrs.
* emacs-lisp/eldoc.el (eldoc-get-fnsym-args-string):
Obey advertised-signature-table.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 47f4dd470b..f1a92035bb 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -290,11 +290,14 @@ or elsewhere, return a 1-line docstring. Calls the functions former calls `eldoc-argument-case'; the latter gives the function name `font-lock-function-name-face', and optionally highlights argument number INDEX." - (let (args doc) + (let (args doc advertised) (cond ((not (and sym (symbolp sym) (fboundp sym)))) ((and (eq sym (aref eldoc-last-data 0)) (eq 'function (aref eldoc-last-data 2))) (setq doc (aref eldoc-last-data 1))) + ((listp (setq advertised (gethash (indirect-function sym) + advertised-signature-table t))) + (setq args advertised)) ((setq doc (help-split-fundoc (documentation sym t) sym)) (setq args (car doc)) ;; Remove any enclosing (), since e-function-argstring adds them. |