*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb5212c7fdbddf45f66001ebf38b08ac79bfa4a5..af17cd24d4a67ae5949231d168096aab5517b4ee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-04  Kim F. Storm  <storm@cua.dk>
+
+       * ido.el (ido-make-merged-file-list-1): New defun split from
+       ido-make-merged-file-list.
+       (ido-make-merged-file-list): Bind throw-on-input around call to
+       ido-make-merged-file-list-1.  Return input-pending-p if
+       interrupted by more input available.
+       (ido-read-internal): Handle input-pending-p return value from
+       ido-make-merged-file-list.
+
 2005-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/flyspell.el (flyspell-check-word-p): Simplify silly