comparison lisp/help.el @ 4535:69a1eda3da06

Distinguish vars and functions in #'symbol-file, #'describe-{function,variable} lisp/ChangeLog addition: 2008-12-22 Aidan Kehoe <kehoea@parhasard.net> * loadhist.el (symbol-file): Add support for differentiating between variables and functions to #'symbol-file. * help.el (describe-function-1): (describe-variable): Call #'symbol-function explicitly with a 'defun or 'defvar argument, depending on whether we're looking for a variable or a function. * cus-face.el (custom-declare-face): Record information about the face in the load history; code taken from GNU, pre-GPLv3 revision 1.45. src/ChangeLog addition: 2008-12-22 Aidan Kehoe <kehoea@parhasard.net> * symbols.c (Fdefine_function): * eval.c (define_function): Record explicitly that we're defining a function in the load history, in both these files.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 22 Dec 2008 14:07:48 +0000
parents bd28481bb0e1
children a1a8728fec10
comparison
equal deleted inserted replaced
4534:f32c7f843961 4535:69a1eda3da06
1423 (princ "a symbol with a void (unbound) function definition.")) 1423 (princ "a symbol with a void (unbound) function definition."))
1424 (t 1424 (t
1425 nil))) 1425 nil)))
1426 (princ "\n") 1426 (princ "\n")
1427 (or file-name 1427 (or file-name
1428 (setq file-name (symbol-file function))) 1428 (setq file-name (symbol-file function 'defun)))
1429 (when file-name 1429 (when file-name
1430 (princ " -- loaded from \"") 1430 (princ " -- loaded from \"")
1431 (if (not (bufferp standard-output)) 1431 (if (not (bufferp standard-output))
1432 (princ file-name) 1432 (princ file-name)
1433 (let ((opoint (point standard-output)) 1433 (let ((opoint (point standard-output))
1649 (if aliases 1649 (if aliases
1650 (princ (format "%s" aliases))) 1650 (princ (format "%s" aliases)))
1651 (princ (built-in-variable-doc variable)) 1651 (princ (built-in-variable-doc variable))
1652 (princ ".\n") 1652 (princ ".\n")
1653 (require 'hyper-apropos) 1653 (require 'hyper-apropos)
1654 (let ((file-name (symbol-file variable)) 1654 (let ((file-name (symbol-file variable 'defvar))
1655 opoint e) 1655 opoint e)
1656 (when file-name 1656 (when file-name
1657 (princ " -- loaded from \"") 1657 (princ " -- loaded from \"")
1658 (if (not (bufferp standard-output)) 1658 (if (not (bufferp standard-output))
1659 (princ file-name) 1659 (princ file-name)