aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/comint.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index 81e48cd209a..4705d43546b 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -611,7 +611,8 @@ Useful within mode or mode hooks.
611The structure of the history file should be one input command per line, and 611The structure of the history file should be one input command per line, and
612most recent command last. 612most recent command last.
613See also `comint-input-ignoredups' and `comint-write-input-ring'." 613See also `comint-input-ignoredups' and `comint-write-input-ring'."
614 (cond ((null comint-input-ring-file-name) 614 (cond ((or (null comint-input-ring-file-name)
615 (equal comint-input-ring-file-name ""))
615 nil) 616 nil)
616 ((not (file-readable-p comint-input-ring-file-name)) 617 ((not (file-readable-p comint-input-ring-file-name))
617 (message "Cannot read history file %s" comint-input-ring-file-name)) 618 (message "Cannot read history file %s" comint-input-ring-file-name))
@@ -650,6 +651,7 @@ Useful within process sentinels.
650 651
651See also `comint-read-input-ring'." 652See also `comint-read-input-ring'."
652 (cond ((or (null comint-input-ring-file-name) 653 (cond ((or (null comint-input-ring-file-name)
654 (equal comint-input-ring-file-name "")
653 (null comint-input-ring) (ring-empty-p comint-input-ring)) 655 (null comint-input-ring) (ring-empty-p comint-input-ring))
654 nil) 656 nil)
655 ((not (file-writable-p comint-input-ring-file-name)) 657 ((not (file-writable-p comint-input-ring-file-name))