diff options
| author | Simon Marshall | 1995-06-13 08:16:08 +0000 |
|---|---|---|
| committer | Simon Marshall | 1995-06-13 08:16:08 +0000 |
| commit | 525c5be7ddf9ec6a873832194b41eacd65a9dc3c (patch) | |
| tree | d109537a9c847344b1a0c799c11afaec3bbd2ffc | |
| parent | fe4163b126639c1d44033d373473a0c4ee9f182e (diff) | |
| download | emacs-525c5be7ddf9ec6a873832194b41eacd65a9dc3c.tar.gz emacs-525c5be7ddf9ec6a873832194b41eacd65a9dc3c.zip | |
check comint-input-ring-file-name for the empty string too.
| -rw-r--r-- | lisp/shell.el | 3 |
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." | |||
| 340 | (cond ((string-equal shell "bash") "~/.bash_history") | 340 | (cond ((string-equal shell "bash") "~/.bash_history") |
| 341 | ((string-equal shell "ksh") "~/.sh_history") | 341 | ((string-equal shell "ksh") "~/.sh_history") |
| 342 | (t "~/.history")))) | 342 | (t "~/.history")))) |
| 343 | (if (equal (file-truename comint-input-ring-file-name) "/dev/null") | 343 | (if (or (equal comint-input-ring-file-name "") |
| 344 | (equal (file-truename comint-input-ring-file-name) "/dev/null")) | ||
| 344 | (setq comint-input-ring-file-name nil)) | 345 | (setq comint-input-ring-file-name nil)) |
| 345 | (setq shell-dirstack-query | 346 | (setq shell-dirstack-query |
| 346 | (if (string-match "^k?sh$" shell) "pwd" "dirs"))) | 347 | (if (string-match "^k?sh$" shell) "pwd" "dirs"))) |