diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-10-21 09:07:30 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-10-21 09:07:30 -0700 |
| commit | cda4c74e60962a49908d130f6dd70b0ae90a0255 (patch) | |
| tree | e60604475057495c22fb64bf81933f72602151e0 /lisp/emacs-lisp | |
| parent | 701c65829d79dbc479fd8c282af3c6faffc21665 (diff) | |
| parent | 888e51f2203c125e8283852d55e54acc8e893f8a (diff) | |
| download | emacs-cda4c74e60962a49908d130f6dd70b0ae90a0255.tar.gz emacs-cda4c74e60962a49908d130f6dd70b0ae90a0255.tar.bz2 emacs-cda4c74e60962a49908d130f6dd70b0ae90a0255.zip | |
Merge from origin/emacs-26
888e51f220 (origin/emacs-26) Update describe-function for recent Fdoc...
75bb482763 Make flymake's mouse-wheel interaction portable (Bug#28732)
035d7ac7e4 Prevent eldoc from changing the mode line
c9d71b31bf Fix doc strings in simple.el
0d8e4f45d6 Avoid creating inconsistent buffer states in term-char-mode
79d57f4b7a New input method 'usbek-cyrillic'
4587d8e0ef Document 'minibuffer-with-setup-hook'
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 3 |
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))) |