emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 888e51f: Update describe-function for recent Fdoc


From: Glenn Morris
Subject: [Emacs-diffs] emacs-26 888e51f: Update describe-function for recent Fdocumentation change
Date: Sat, 21 Oct 2017 12:00:33 -0400 (EDT)

branch: emacs-26
commit 888e51f2203c125e8283852d55e54acc8e893f8a
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Update describe-function for recent Fdocumentation change
    
    * lisp/help-fns.el (describe-function-1):
    Handle Fdocumentation returning either void or invalid.
---
 lisp/help-fns.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index dfff8be..cae0247 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]