aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-05-05 19:50:43 -0400
committerGlenn Morris2015-05-05 19:50:43 -0400
commit0ed044dc1b524370f02f531b3b6fcc1ef45c395d (patch)
tree07ef3a5eda07a66663a6c1915dea0d4d785a4582
parent4ac426a1b90912ea947d46a57b6fcbbbf7586da1 (diff)
downloademacs-0ed044dc1b524370f02f531b3b6fcc1ef45c395d.tar.gz
emacs-0ed044dc1b524370f02f531b3b6fcc1ef45c395d.zip
* lisp/help-fns.el (describe-function-1):
Handle builtins with advertised calling conventions. (Bug#20479)
-rw-r--r--lisp/help-fns.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 90200377428..4982ee54f46 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -495,6 +495,9 @@ FILE is the file where FUNCTION was probably defined."
495 f)) 495 f))
496 ((subrp def) (intern (subr-name def))) 496 ((subrp def) (intern (subr-name def)))
497 (t def))) 497 (t def)))
498 (sig-key (if (subrp def)
499 (indirect-function real-def)
500 real-def))
498 (file-name (find-lisp-object-file-name function def)) 501 (file-name (find-lisp-object-file-name function def))
499 (pt1 (with-current-buffer (help-buffer) (point))) 502 (pt1 (with-current-buffer (help-buffer) (point)))
500 (beg (if (and (or (byte-code-function-p def) 503 (beg (if (and (or (byte-code-function-p def)
@@ -586,7 +589,7 @@ FILE is the file where FUNCTION was probably defined."
586 589
587 (help-fns--key-bindings function) 590 (help-fns--key-bindings function)
588 (with-current-buffer standard-output 591 (with-current-buffer standard-output
589 (setq doc (help-fns--signature function doc real-def real-function)) 592 (setq doc (help-fns--signature function doc sig-key real-function))
590 (run-hook-with-args 'help-fns-describe-function-functions function) 593 (run-hook-with-args 'help-fns-describe-function-functions function)
591 (insert "\n" 594 (insert "\n"
592 (or doc "Not documented."))))))) 595 (or doc "Not documented.")))))))