diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 146dda5b9c..a1a453abd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-09-27 Leo Liu <sdl.web@gmail.com> + + * progmodes/elisp-mode.el (elisp--eldoc-last-data): Use defvar. + + * emacs-lisp/eldoc.el (eldoc-mode): Fix thinko. + 2014-09-27 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/pcase.el (pcase--split-match, pcase--app-subst-match): diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index c190e2745e..9e15375d92 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -186,7 +186,7 @@ expression point is on." :group 'eldoc :lighter eldoc-minor-mode-string (setq eldoc-last-message nil) (cond - (eldoc-documentation-function + ((not eldoc-documentation-function) (message "There is no ElDoc support in this buffer") (setq eldoc-mode nil)) (eldoc-mode diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 41d2cd83b2..f3143bd76e 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1009,7 +1009,7 @@ which see." ;;; ElDoc Support -(defconst elisp--eldoc-last-data (make-vector 3 nil) +(defvar elisp--eldoc-last-data (make-vector 3 nil) "Bookkeeping; elements are as follows: 0 - contains the last symbol read from the buffer. 1 - contains the string last displayed in the echo area for variables, |