summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/shell.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 02d00fd72e2..33e10847616 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -340,7 +340,8 @@ buffer."
(cond ((string-equal shell "bash") "~/.bash_history")
((string-equal shell "ksh") "~/.sh_history")
(t "~/.history"))))
- (if (equal (file-truename comint-input-ring-file-name) "/dev/null")
+ (if (or (equal comint-input-ring-file-name "")
+ (equal (file-truename comint-input-ring-file-name) "/dev/null"))
(setq comint-input-ring-file-name nil))
(setq shell-dirstack-query
(if (string-match "^k?sh$" shell) "pwd" "dirs")))