1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00

(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.
This commit is contained in:
Gerd Moellmann 2000-05-11 20:35:51 +00:00
parent 578979ee4a
commit cdc4401d66
2 changed files with 10 additions and 5 deletions

View File

@ -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.

View File

@ -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)