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

1 files changed, 12 insertions, 11 deletions

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index a080cd22ea0..e30fe28682c 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -101,15 +101,13 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
   ;; Handle symbols aliased to other symbols.
   (if (and (symbolp def) (fboundp def)) (setq def (indirect-function def)))
   ;; If definition is a macro, find the function inside it.
-  (let ((advertised (gethash def advertised-signature-table t)))
-    (if (listp advertised) advertised
-      (if (eq (car-safe def) 'macro) (setq def (cdr def)))
-      (cond
-       ((byte-code-function-p def) (aref def 0))
-       ((eq (car-safe def) 'lambda) (nth 1 def))
-       ((and (eq (car-safe def) 'autoload) (not (eq (nth 4 def) 'keymap)))
-        "[Arg list not available until function definition is loaded.]")
-       (t t)))))
+  (if (eq (car-safe def) 'macro) (setq def (cdr def)))
+  (cond
+   ((byte-code-function-p def) (aref def 0))
+   ((eq (car-safe def) 'lambda) (nth 1 def))
+   ((and (eq (car-safe def) 'autoload) (not (eq (nth 4 def) 'keymap)))
+    "[Arg list not available until function definition is loaded.]")
+   (t t)))
 
 (defun help-make-usage (function arglist)
   (cons (if (symbolp function) function 'anonymous)
@@ -469,14 +467,17 @@ suitable file is found, return nil."
 		(re-search-backward "`\\([^`']+\\)'" nil t)
 		(help-xref-button 1 'help-function-cmacro function lib)))))
 	(princ ".\n\n"))
-      (let* ((arglist (help-function-arglist def))
+      (let* ((advertised (gethash def advertised-signature-table t))
+	     (arglist (if (listp advertised)
+			  advertised (help-function-arglist def)))
 	     (doc (documentation function))
 	     (usage (help-split-fundoc doc function)))
 	(with-current-buffer standard-output
 	  ;; If definition is a keymap, skip arglist note.
 	  (unless (keymapp function)
+	    (if usage (setq doc (cdr usage)))
 	    (let* ((use (cond
-			 (usage (setq doc (cdr usage)) (car usage))
+			 ((and usage (not (listp advertised))) (car usage))
 			 ((listp arglist)
 			  (format "%S" (help-make-usage function arglist)))
 			 ((stringp arglist) arglist)