summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorSimon Marshall <simon@gnu.org>1995-06-13 08:16:08 +0000
committerSimon Marshall <simon@gnu.org>1995-06-13 08:16:08 +0000
commitd5087ab9cc64c66d7a18d1a6a4badedb00523ac1 (patch)
treee4b49948ead7201330160b7c9c2249321ed80abc /lisp/shell.el
parentae7ea130993b3a43bac846eb91a7725eed4ebc7f (diff)
downloademacs-d5087ab9cc64c66d7a18d1a6a4badedb00523ac1.tar.gz
check comint-input-ring-file-name for the empty string too.
Diffstat (limited to 'lisp/shell.el')
-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")))