summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/eldoc.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43f285fddc..0f675a642f 100644
--- 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 cedfd44dd1..c64ec52dec 100644
--- 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