aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-10-21 09:00:16 -0700
committerGlenn Morris2017-10-21 09:00:16 -0700
commit888e51f2203c125e8283852d55e54acc8e893f8a (patch)
tree5069f580395d48ce3be9b64d88bb1fe21e6df10b
parent75bb4827637111a210c79583f45dd1c5d59a745f (diff)
downloademacs-888e51f2203c125e8283852d55e54acc8e893f8a.tar.gz
emacs-888e51f2203c125e8283852d55e54acc8e893f8a.zip
Update describe-function for recent Fdocumentation change
* lisp/help-fns.el (describe-function-1): Handle Fdocumentation returning either void or invalid.
-rw-r--r--lisp/help-fns.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index dfff8be2a6a..cae0247a542 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -698,7 +698,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
698 ;; for invalid functions i.s.o. signaling an error. 698 ;; for invalid functions i.s.o. signaling an error.
699 (documentation function t) 699 (documentation function t)
700 ;; E.g. an alias for a not yet defined function. 700 ;; E.g. an alias for a not yet defined function.
701 (invalid-function nil))) 701 ((invalid-function void-function) nil)))
702 (key-bindings-buffer (current-buffer))) 702 (key-bindings-buffer (current-buffer)))
703 703
704 ;; If the function is autoloaded, and its docstring has 704 ;; If the function is autoloaded, and its docstring has
@@ -718,7 +718,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
718 (if (subrp def) (indirect-function real-def) real-def) 718 (if (subrp def) (indirect-function real-def) real-def)
719 real-function key-bindings-buffer) 719 real-function key-bindings-buffer)
720 ;; E.g. an alias for a not yet defined function. 720 ;; E.g. an alias for a not yet defined function.
721 (invalid-function doc-raw)))) 721 ((invalid-function void-function) doc-raw))))
722 (run-hook-with-args 'help-fns-describe-function-functions function) 722 (run-hook-with-args 'help-fns-describe-function-functions function)
723 (insert "\n" (or doc "Not documented."))) 723 (insert "\n" (or doc "Not documented.")))
724 ;; Avoid asking the user annoying questions if she decides 724 ;; Avoid asking the user annoying questions if she decides