From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 15 Aug 2022 07:27:13 +0000 (+0200)
Subject: Make eshell-mode more resilient towards `mode-line-format'
X-Git-Tag: emacs-29.0.90~1447^2~141
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20b8ac5723661de8920c0090fe91368d3229723c;p=emacs.git

Make eshell-mode more resilient towards `mode-line-format'

* lisp/eshell/esh-mode.el (eshell-mode): `mode-line-format' can be
a string (bug#57185).  In that case, don't alter anything.
---

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 972d4f9df00..ecbcf88b973 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -301,7 +301,8 @@ and the hook `eshell-exit-hook'."
   "Emacs shell interactive mode."
   (setq-local eshell-mode t)
 
-  (when eshell-status-in-mode-line
+  (when (and eshell-status-in-mode-line
+             (listp mode-line-format))
     (make-local-variable 'eshell-command-running-string)
     (let ((fmt (copy-sequence mode-line-format)))
       (setq-local mode-line-format fmt))