(comint-read-input-ring): Move reference to

comint-input-ring-size outside of the save-excursion.  It was
causing the default value to be the only one ever seen.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f45a9ba06ba713f7fd91022c1b802df1196d200d..5729927101be7ea761b982a1d28a3b90d2e4b72e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-11  Gerd Moellmann  <gerd@gnu.org>
 
+       * comint.el (comint-read-input-ring): Move reference to
+       comint-input-ring-size outside of the save-excursion.  It was
+       causing the default value to be the only one ever seen.
+       
        * font-lock.el: Update copyright.  Remove Simon Marshall's email
        address on request from him.
 

diff --git a/lisp/comint.el b/lisp/comint.el
index 7084d77bd219bee2fc51db69f219a252fdf4e222..a08cd097c7aaccecaac30388d88381cba1afe79c 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -762,10 +762,11 @@ See also `comint-input-ignoredups' and `comint-write-input-ring'."
             (message "Cannot read history file %s"
                      comint-input-ring-file-name)))
        (t
-        (let ((history-buf (get-buffer-create " *temp*"))
-              (file comint-input-ring-file-name)
-              (count 0)
-              (ring (make-ring comint-input-ring-size)))
+        (let* ((history-buf (get-buffer-create " *temp*"))
+               (file comint-input-ring-file-name)
+               (count 0)
+               (size comint-input-ring-size)
+               (ring (make-ring size)))
           (unwind-protect
               (save-excursion
                 (set-buffer history-buf)
@@ -775,7 +776,7 @@ See also `comint-input-ignoredups' and `comint-write-input-ring'."
                 ;; Save restriction in case file is already visited...
                 ;; Watch for those date stamps in history files!
                 (goto-char (point-max))
-                (while (and (< count comint-input-ring-size)
+                (while (and (< count size)
                             (re-search-backward "^[ \t]*\\([^#\n].*\\)[ \t]*$"
                                                 nil t))
               (let (start end history)