From: Eshel Yaron <me@eshelyaron.com>
Date: Sat, 20 Jan 2024 11:43:27 +0000 (-0600)
Subject: Eldoc: play nice with mode-line-format-right-align (bug#68547)
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~2890
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=412cc0212d7bf2f2d0f49fdb8a4ff69480b8afed;p=emacs.git

Eldoc: play nice with mode-line-format-right-align (bug#68547)

* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Avoid nesting
'mode-line-format', since that breaks 'mode-line-format-right-align'.
---

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 06970d40e8a..912a7357ca7 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -312,9 +312,11 @@ Otherwise, it displays the message like `message' would."
                      (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)))
+                  (funcall
+                   (if (listp mode-line-format) #'append #'list)
+                   (list "" '(eldoc-mode-line-string
+			      (" " eldoc-mode-line-string " ")))
+                   mode-line-format)))
           (setq eldoc-mode-line-string
                 (when (stringp format-string)
                   (apply #'format-message format-string args)))