From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 28 Jun 2024 09:28:33 +0000 (+0200)
Subject: Make `shell-mode' more robust
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a4135b7a7d1b956ead01ed16fa18536c92bf9b4;p=emacs.git

Make `shell-mode' more robust

* lisp/shell.el (shell-mode): Ensure that
`comint-input-ring-file-name' is non-nil when calling `file-truename'.

(cherry picked from commit c4ad54812acaf8f156962047eaaaf75b0c0ecf96)
---

diff --git a/lisp/shell.el b/lisp/shell.el
index d6f1b443ed4..89ec893a308 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -764,9 +764,10 @@ command."
              (setq-local comint-input-ring-size hsize))
         (setq comint-input-ring-file-name
               (concat remote hfile)))
-      (if (or (equal comint-input-ring-file-name "")
-	      (equal (file-truename comint-input-ring-file-name)
-		     (file-truename null-device)))
+      (if (and comint-input-ring-file-name
+               (or (equal comint-input-ring-file-name "")
+	           (equal (file-truename comint-input-ring-file-name)
+		          (file-truename null-device))))
 	  (setq comint-input-ring-file-name nil))
       ;; Arrange to write out the input ring on exit, if the shell doesn't
       ;; do this itself.