aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-02-23 19:22:09 +0000
committerEli Zaretskii2007-02-23 19:22:09 +0000
commitd695bd172e89b29d811d42b227f30e4db29abf54 (patch)
tree71f0d49db4cdc51b0d47dab8a2d15cb5895fac6f
parentc34a8a87401584b5501580890def8a2133973951 (diff)
downloademacs-d695bd172e89b29d811d42b227f30e4db29abf54.tar.gz
emacs-d695bd172e89b29d811d42b227f30e4db29abf54.zip
(comint-read-input-ring): Use comint-input-ring-size from the comint buffer
instead of the temporary one.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/comint.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33a52985550..670175f4194 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-02-23 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
2
3 * comint.el (comint-read-input-ring): Use comint-input-ring-size
4 from the comint buffer instead of the temporary one.
5
12007-02-23 David Reitter <david.reitter@gmail.com> 62007-02-23 David Reitter <david.reitter@gmail.com>
2 7
3 * cus-edit.el (custom-save-all): Canonicalize custom-file before 8 * cus-edit.el (custom-save-all): Canonicalize custom-file before
diff --git a/lisp/comint.el b/lisp/comint.el
index eeb3e720d06..19ce168a02e 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -896,7 +896,7 @@ See also `comint-input-ignoredups' and `comint-write-input-ring'."
896 ;; Watch for those date stamps in history files! 896 ;; Watch for those date stamps in history files!
897 (goto-char (point-max)) 897 (goto-char (point-max))
898 (let (start end history) 898 (let (start end history)
899 (while (and (< count comint-input-ring-size) 899 (while (and (< count size)
900 (re-search-backward comint-input-ring-separator nil t) 900 (re-search-backward comint-input-ring-separator nil t)
901 (setq end (match-beginning 0))) 901 (setq end (match-beginning 0)))
902 (if (re-search-backward comint-input-ring-separator nil t) 902 (if (re-search-backward comint-input-ring-separator nil t)