aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-07-01 20:45:59 +0000
committerRichard M. Stallman1994-07-01 20:45:59 +0000
commit3c24374d1455125915edae88c6408ecdb4bbbf48 (patch)
tree35a7f18bd8c1c140ebd14bedbf14a515320f5a06
parent1e2300d39b87ddd99a8b1a0ae5ed9a6753a38241 (diff)
downloademacs-3c24374d1455125915edae88c6408ecdb4bbbf48.tar.gz
emacs-3c24374d1455125915edae88c6408ecdb4bbbf48.zip
(shell-mode): Don't read history from /dev/null.
-rw-r--r--lisp/shell.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 8c38328b82f..010af64ba1f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -346,6 +346,8 @@ buffer."
346 (cond ((string-equal shell "bash") "~/.bash_history") 346 (cond ((string-equal shell "bash") "~/.bash_history")
347 ((string-equal shell "ksh") "~/.sh_history") 347 ((string-equal shell "ksh") "~/.sh_history")
348 (t "~/.history")))) 348 (t "~/.history"))))
349 (if (equal comint-input-ring-file-name "/dev/null")
350 (setq comint-input-ring-file-name nil))
349 (setq shell-dirstack-query 351 (setq shell-dirstack-query
350 (if (string-match "^k?sh$" shell) "pwd" "dirs"))) 352 (if (string-match "^k?sh$" shell) "pwd" "dirs")))
351 (run-hooks 'shell-mode-hook) 353 (run-hooks 'shell-mode-hook)