From: Glenn Morris Date: Sat, 21 Oct 2017 16:00:16 +0000 (-0700) Subject: Update describe-function for recent Fdocumentation change X-Git-Tag: emacs-26.0.91~499 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=888e51f2203c125e8283852d55e54acc8e893f8a;p=emacs.git Update describe-function for recent Fdocumentation change * lisp/help-fns.el (describe-function-1): Handle Fdocumentation returning either void or invalid. --- 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)." ;; for invalid functions i.s.o. signaling an error. (documentation function t) ;; E.g. an alias for a not yet defined function. - (invalid-function nil))) + ((invalid-function void-function) nil))) (key-bindings-buffer (current-buffer))) ;; 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)." (if (subrp def) (indirect-function real-def) real-def) real-function key-bindings-buffer) ;; E.g. an alias for a not yet defined function. - (invalid-function doc-raw)))) + ((invalid-function void-function) doc-raw)))) (run-hook-with-args 'help-fns-describe-function-functions function) (insert "\n" (or doc "Not documented."))) ;; Avoid asking the user annoying questions if she decides