diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
| commit | 46e7613ad3b88807d25cfab3d78bf46c9e2fe13e (patch) | |
| tree | a7b560c36e097660536697c9d0057c9273d779b2 /lisp/emacs-lisp/eldoc.el | |
| parent | f6502f959253b8f705e324e137c2933c5a668f62 (diff) | |
| parent | e9eafd22681b8e95d8d642def0512d9290564206 (diff) | |
| download | emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.gz emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.bz2 emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 19b3bd78aea..4825b5c5e6c 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -289,13 +289,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)) + (when (and mode-line-format + (not (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))) |