emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master 92879a1: Fix bug #26529: C-h k errors with a lambda


From: Alan Mackenzie
Subject: [Emacs-diffs] master 92879a1: Fix bug #26529: C-h k errors with a lambda function bound to a key.
Date: Sun, 16 Apr 2017 06:05:21 -0400 (EDT)

branch: master
commit 92879a1b035baf297158812ccdbaf6ae1d157e16
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    Fix bug #26529: C-h k errors with a lambda function bound to a key.
    
    * lisp/help-fns.el (help-fns--signature, describe-function-1): Check
    `function' is a symbol before trying to get property `reader-construct' from
    it.
---
 lisp/help-fns.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 5459ddf..2c635ff 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -473,7 +473,8 @@ suitable file is found, return nil."
         (let ((fill-begin (point))
               (high-usage (car high))
               (high-doc (cdr high)))
-          (unless (get function 'reader-construct)
+          (unless (and (symbolp function)
+                       (get function 'reader-construct))
             (insert high-usage "\n"))
           (fill-region fill-begin (point))
           high-doc)))))
@@ -613,7 +614,8 @@ FILE is the file where FUNCTION was probably defined."
     ;; Print what kind of function-like object FUNCTION is.
     (princ (cond ((or (stringp def) (vectorp def))
                  "a keyboard macro")
-                ((get function 'reader-construct)
+                ((and (symbolp function)
+                       (get function 'reader-construct))
                   "a reader construct")
                 ;; Aliases are Lisp functions, so we need to check
                 ;; aliases before functions.



reply via email to

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