* lisp/emacs-lisp/eldoc.el (eldoc-mode): Fix thinko.

* lisp/progmodes/elisp-mode.el (elisp--eldoc-last-data): Use defvar.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 146dda5b9cd4b6e6a30a1ea0ee7a799d443aa788..a1a453abd7dbac537a94219f326be2e9c72fb45e 100644 (file)
--- 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 c190e2745efc70d8a40efc058d2cf58aea69cacc..9e15375d924e0d2426095232a097dc1b413ee6ce 100644 (file)
--- 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 41d2cd83b2529b5787daaf81097d003f7b10d87e..f3143bd76ee194ba4f6eb6f50893df832c6e4a18 100644 (file)
--- 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,