From e1d42f8f4a945669ff8b5159a569cb4b18f56e18 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 20 Oct 2017 16:04:02 -0400 Subject: [PATCH] * lisp/help-fns.el (describe-function-1): Fix help-fns-test-dangling-alias. --- lisp/help-fns.el | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 788c03e9bf5..e509ce6e2a8 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -561,6 +561,8 @@ FILE is the file where FUNCTION was probably defined." short)) (defun help-fns--analyse-function (function) + ;; FIXME: Document/explain the differences between FUNCTION, + ;; REAL-FUNCTION, DEF, and REAL-DEF. "Return information about FUNCTION. Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)." (let* ((advised (and (symbolp function) @@ -689,10 +691,15 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)." (point)))) (terpri)(terpri) - (pcase-let ((`(,real-function ,def ,_aliased ,real-def) - (help-fns--analyse-function function)) - (doc-raw (documentation function t)) - (key-bindings-buffer (current-buffer))) + (pcase-let* ((`(,real-function ,def ,_aliased ,real-def) + (help-fns--analyse-function function)) + (doc-raw (condition-case nil + ;; FIXME: Maybe `documentation' should return nil + ;; 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))) + (key-bindings-buffer (current-buffer))) ;; If the function is autoloaded, and its docstring has ;; key substitution constructs, load the library. @@ -703,10 +710,15 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)." (help-fns--key-bindings function) (with-current-buffer standard-output - (let ((doc (help-fns--signature - function doc-raw - (if (subrp def) (indirect-function real-def) real-def) - real-function key-bindings-buffer))) + (let ((doc (condition-case nil + ;; FIXME: Maybe `help-fns--signature' should return `doc' + ;; for invalid functions i.s.o. signaling an error. + (help-fns--signature + function doc-raw + (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)))) (run-hook-with-args 'help-fns-describe-function-functions function) (insert "\n" (or doc "Not documented."))) (when (or (function-get function 'pure) -- 2.39.2