summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorNick Helm <nick@tenpoint.co.nz>2017-10-21 11:41:28 +0300
committerEli Zaretskii <eliz@gnu.org>2017-10-21 11:41:28 +0300
commit035d7ac7e42f1e1e82f4948e19ef8d8188bb902c (patch)
tree6e4b932f7fe6137f467dcf6086cddb4bde8fc420 /lisp/emacs-lisp
parentc9d71b31bf1144c3f11a82612f07a7bd649c25d4 (diff)
downloademacs-035d7ac7e42f1e1e82f4948e19ef8d8188bb902c.tar.gz
Prevent eldoc from changing the mode line
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Don't change the mode line if it is not displayed. (Bug#28697)
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/eldoc.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index cba9a00fa5a..ad08977b81a 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -264,12 +264,13 @@ Otherwise work like `message'."
(or (window-in-direction 'above (minibuffer-window))
(minibuffer-selected-window)
(get-largest-window)))
+ (when mode-line-format
(unless (and (listp mode-line-format)
(assq 'eldoc-mode-line-string mode-line-format))
(setq mode-line-format
(list "" '(eldoc-mode-line-string
(" " eldoc-mode-line-string " "))
- mode-line-format)))
+ mode-line-format))))
(setq eldoc-mode-line-string
(when (stringp format-string)
(apply #'format-message format-string args)))