diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 23 |
2 files changed, 17 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f39518c7bf3..2604475ac00 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-01-03 John Paul Wallington <jpw@shootybangbang.com> + + * emacs-lisp/eldoc.el (eldoc-get-var-docstring): Only return a + documentation string when `sym' is non-nil. + 2003-01-02 Steven Tamm <steventamm@mac.com> * scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index ea09720db24..b40ffc0afb1 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -7,7 +7,7 @@ ;; Keywords: extensions ;; Created: 1995-10-06 -;; $Id: eldoc.el,v 1.20 2002/01/08 23:57:30 rms Exp $ +;; $Id: eldoc.el,v 1.21 2002/11/19 23:32:54 monnier Exp $ ;; This file is part of GNU Emacs. @@ -327,16 +327,17 @@ With prefix ARG, turn ElDoc mode on if and only if ARG is positive." ;; Return a string containing a brief (one-line) documentation string for ;; the variable. (defun eldoc-get-var-docstring (sym) - (cond ((and (eq sym (aref eldoc-last-data 0)) - (eq 'variable (aref eldoc-last-data 2))) - (aref eldoc-last-data 1)) - (t - (let ((doc (documentation-property sym 'variable-documentation t))) - (cond (doc - (setq doc (eldoc-docstring-format-sym-doc - sym (eldoc-docstring-first-line doc))) - (eldoc-last-data-store sym doc 'variable))) - doc)))) + (when sym + (cond ((and (eq sym (aref eldoc-last-data 0)) + (eq 'variable (aref eldoc-last-data 2))) + (aref eldoc-last-data 1)) + (t + (let ((doc (documentation-property sym 'variable-documentation t))) + (cond (doc + (setq doc (eldoc-docstring-format-sym-doc + sym (eldoc-docstring-first-line doc))) + (eldoc-last-data-store sym doc 'variable))) + doc))))) (defun eldoc-last-data-store (symbol doc type) (aset eldoc-last-data 0 symbol) |