* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Avoid nesting
'mode-line-format', since that breaks 'mode-line-format-right-align'.
(cherry picked from commit
412cc0212d7bf2f2d0f49fdb8a4ff69480b8afed)
(assq 'eldoc-mode-line-string mode-line-format))))
(setq mode-line-format
(funcall
- (if (listp mode-line-format)
- #'append
- #'list)
+ (if (listp mode-line-format) #'append #'list)
(list "" '(eldoc-mode-line-string
(" " eldoc-mode-line-string " ")))
mode-line-format)))