aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEshel Yaron2024-01-20 05:43:27 -0600
committerJoão Távora2024-01-20 06:00:21 -0600
commit412cc0212d7bf2f2d0f49fdb8a4ff69480b8afed (patch)
tree14acbcbf2b789f3047c49f8d9aaacd4d3196f76a
parentce836aafaa581e5b713eb289071dbeed73166c99 (diff)
downloademacs-412cc0212d7bf2f2d0f49fdb8a4ff69480b8afed.tar.gz
emacs-412cc0212d7bf2f2d0f49fdb8a4ff69480b8afed.zip
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'.
-rw-r--r--lisp/emacs-lisp/eldoc.el8
1 files changed, 5 insertions, 3 deletions
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."
312 (not (and (listp mode-line-format) 312 (not (and (listp mode-line-format)
313 (assq 'eldoc-mode-line-string mode-line-format)))) 313 (assq 'eldoc-mode-line-string mode-line-format))))
314 (setq mode-line-format 314 (setq mode-line-format
315 (list "" '(eldoc-mode-line-string 315 (funcall
316 (" " eldoc-mode-line-string " ")) 316 (if (listp mode-line-format) #'append #'list)
317 mode-line-format))) 317 (list "" '(eldoc-mode-line-string
318 (" " eldoc-mode-line-string " ")))
319 mode-line-format)))
318 (setq eldoc-mode-line-string 320 (setq eldoc-mode-line-string
319 (when (stringp format-string) 321 (when (stringp format-string)
320 (apply #'format-message format-string args))) 322 (apply #'format-message format-string args)))