diff options
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 29f1c9aeb6b..ff427fd51da 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el | |||
| @@ -599,9 +599,13 @@ It can be quoted, or be inside a quoted form." | |||
| 599 | (find-function-library sym))) | 599 | (find-function-library sym))) |
| 600 | (setq sym (car fun-lib)) | 600 | (setq sym (car fun-lib)) |
| 601 | (cdr fun-lib)))) | 601 | (cdr fun-lib)))) |
| 602 | (`defvar (when (boundp sym) | 602 | (`defvar (and (boundp sym) |
| 603 | (or (symbol-file sym 'defvar) | 603 | ;; Don't show minor modes twice. |
| 604 | (help-C-file-name sym 'var)))) | 604 | ;; TODO: If TYPE ever becomes dependent on the |
| 605 | ;; context, move this check outside. | ||
| 606 | (not (fboundp sym)) | ||
| 607 | (or (symbol-file sym 'defvar) | ||
| 608 | (help-C-file-name sym 'var)))) | ||
| 605 | (`feature (when (featurep sym) | 609 | (`feature (when (featurep sym) |
| 606 | (ignore-errors | 610 | (ignore-errors |
| 607 | (find-library-name (symbol-name sym))))) | 611 | (find-library-name (symbol-name sym))))) |