From: Kim F. Storm <storm@cua.dk>
Date: Fri, 3 Jun 2005 23:21:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~9339
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61e40b6ddef45b4dbcaa9ae53c389b301f49eb3b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb5212c7fdb..af17cd24d4a 100644
--- 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