Subject: bug#28697: 25.3; eldoc changes mode-line settings

From: Nick Helm <[email-masked]>
Date: Wed, 04 Oct 2017 22:25:41 +1300

On Wed,  4 Oct 2017 at 20:55:04 +1300, Nick Helm wrote:

> -	  (unless (and (listp mode-line-format)
> -		       (assq 'eldoc-mode-line-string mode-line-format))
> +	  (when (and mode-line-format
> +		          (not (assq 'eldoc-mode-line-string mode-line-format)))

Sorry, I got the patch wrong. This one works a little better:

--- a/lisp/emacs-lisp/eldoc.el	2017-10-04 22:11:09.000000000 +1300
+++ b/lisp/emacs-lisp/eldoc.el	2017-10-04 22:10:32.000000000 +1300
@@ -261,12 +261,13 @@
 	     (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)))