* emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear

eldoc-last-message.

Fixes: debbugs:16920

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43f285fddc45ddcec4e3acca2da75d48f785089e..0f675a642ff39c82cb288328d4b307dca89f5796 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10  Leo Liu  <sdl.web@gmail.com>
+
+       * emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear
+       eldoc-last-message.  (Bug#16920)
+
 2014-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * desktop.el (desktop-create-buffer): Don't run activate-mark-hook

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index cedfd44dd1f73c8d5320ca2bb734c5f667398ced..c64ec52decb5341c0cb9aa2abe186ea14112ff66 100644 (file)
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -219,7 +219,9 @@ Otherwise work like `message'."
   (if (minibufferp)
       (progn
        (add-hook 'minibuffer-exit-hook
-                 (lambda () (setq eldoc-mode-line-string nil))
+                 (lambda () (setq eldoc-mode-line-string nil
+                             ;; http://debbugs.gnu.org/16920
+                             eldoc-last-message nil))
                  nil t)
        (with-current-buffer
            (window-buffer