# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1117840877 0
# Node ID 4bb4e96b2e17fa403de07bb17d1618d23029fb5b
# Parent  5a6bae733c666521fc604043d51793b34c991189
*** empty log message ***

diff -r 5a6bae733c66 -r 4bb4e96b2e17 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 03 23:02:50 2005 +0000
+++ b/lisp/ChangeLog	Fri Jun 03 23:21:17 2005 +0000
@@ -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