[Emacs-diffs] trunk r115370: Fix eldoc-in-minibuffer's modeline update.

[Stefan Monnier]

------------------------------------------------------------
revno: 115370
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16042
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-03 23:42:01 -0500
message:
  Fix eldoc-in-minibuffer's modeline update.
  * lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message):
  Call force-mode-line-update is the proper buffer.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/eldoc.el       eldoc.el-20091113204419-o5vbwnq5f7feedwu-952

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-04 00:37:33 +0000
+++ b/lisp/ChangeLog    2013-12-04 04:42:01 +0000
@@ -1,3 +1,8 @@
+2013-12-04  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/eldoc.el (eldoc-minibuffer-message):
+       Call force-mode-line-update is the proper buffer (bug#16042).
+
 2013-12-04  Dmitry Gutov  <address@hidden>
 
        * vc/log-edit.el (log-edit-add-new-comment): Rename to

=== modified file 'lisp/emacs-lisp/eldoc.el'
--- a/lisp/emacs-lisp/eldoc.el  2013-09-12 05:32:57 +0000
+++ b/lisp/emacs-lisp/eldoc.el  2013-12-04 04:42:01 +0000
@@ -216,6 +216,9 @@
 Otherwise work like `message'."
   (if (minibufferp)
       (progn
+       (add-hook 'minibuffer-exit-hook
+                 (lambda () (setq eldoc-mode-line-string nil))
+                 nil t)
        (with-current-buffer
            (window-buffer
             (or (window-in-direction 'above (minibuffer-window))
@@ -226,17 +229,11 @@
            (setq mode-line-format
                  (list "" '(eldoc-mode-line-string
                             (" " eldoc-mode-line-string " "))
-                       mode-line-format))))
-       (add-hook 'minibuffer-exit-hook
-                 (lambda () (setq eldoc-mode-line-string nil))
-                 nil t)
-       (cond
-        ((null format-string)
-         (setq eldoc-mode-line-string nil))
-        ((stringp format-string)
-         (setq eldoc-mode-line-string
-               (apply 'format format-string args))))
-       (force-mode-line-update))
+                       mode-line-format)))
+          (setq eldoc-mode-line-string
+                (when (stringp format-string)
+                  (apply 'format format-string args)))
+          (force-mode-line-update)))
     (apply 'message format-string args)))
 
 (defun eldoc-message (&rest args)