mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

Fix eldoc-in-minibuffer's modeline update.

Browse source 
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message):
Call force-mode-line-update is the proper buffer.

Fixes: debbugs:16042
This commit is contained in:
Stefan Monnier 2013-12-03 23:42:01 -05:00
parent dda6191643
commit 8497f93806
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-04 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/eldoc.el (eldoc-minibuffer-message):
Call force-mode-line-update is the proper buffer (bug#16042).
2013-12-04 Dmitry Gutov <dgutov@yandex.ru> 2013-12-04 Dmitry Gutov <dgutov@yandex.ru>
* vc/log-edit.el (log-edit-add-new-comment): Rename to * vc/log-edit.el (log-edit-add-new-comment): Rename to

19
lisp/emacs-lisp/eldoc.el
View file

@ -216,6 +216,9 @@ expression point is on."
Otherwise work like `message'." Otherwise work like `message'."
(if (minibufferp) (if (minibufferp)
(progn (progn
(add-hook 'minibuffer-exit-hook
(lambda () (setq eldoc-mode-line-string nil))
nil t)
(with-current-buffer (with-current-buffer
(window-buffer (window-buffer
(or (window-in-direction 'above (minibuffer-window)) (or (window-in-direction 'above (minibuffer-window))
@ -226,17 +229,11 @@ Otherwise work like `message'."
(setq mode-line-format (setq mode-line-format
(list "" '(eldoc-mode-line-string (list "" '(eldoc-mode-line-string
(" " eldoc-mode-line-string " ")) (" " eldoc-mode-line-string " "))
mode-line-format)))) mode-line-format)))
(add-hook 'minibuffer-exit-hook (setq eldoc-mode-line-string
(lambda () (setq eldoc-mode-line-string nil)) (when (stringp format-string)
nil t) (apply 'format format-string args)))
(cond (force-mode-line-update)))
((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))
(apply 'message format-string args))) (apply 'message format-string args)))
(defun eldoc-message (&rest args) (defun eldoc-message (&rest args)