aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Helm2017-10-21 11:41:28 +0300
committerEli Zaretskii2017-10-21 11:41:28 +0300
commit035d7ac7e42f1e1e82f4948e19ef8d8188bb902c (patch)
tree6e4b932f7fe6137f467dcf6086cddb4bde8fc420
parentc9d71b31bf1144c3f11a82612f07a7bd649c25d4 (diff)
downloademacs-035d7ac7e42f1e1e82f4948e19ef8d8188bb902c.tar.gz
emacs-035d7ac7e42f1e1e82f4948e19ef8d8188bb902c.zip
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)
-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'."
264 (or (window-in-direction 'above (minibuffer-window)) 264 (or (window-in-direction 'above (minibuffer-window))
265 (minibuffer-selected-window) 265 (minibuffer-selected-window)
266 (get-largest-window))) 266 (get-largest-window)))
267 (when mode-line-format
267 (unless (and (listp mode-line-format) 268 (unless (and (listp mode-line-format)
268 (assq 'eldoc-mode-line-string mode-line-format)) 269 (assq 'eldoc-mode-line-string mode-line-format))
269 (setq mode-line-format 270 (setq mode-line-format
270 (list "" '(eldoc-mode-line-string 271 (list "" '(eldoc-mode-line-string
271 (" " eldoc-mode-line-string " ")) 272 (" " eldoc-mode-line-string " "))
272 mode-line-format))) 273 mode-line-format))))
273 (setq eldoc-mode-line-string 274 (setq eldoc-mode-line-string
274 (when (stringp format-string) 275 (when (stringp format-string)
275 (apply #'format-message format-string args))) 276 (apply #'format-message format-string args)))