# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1175207712 0
# Node ID 5f487f7cb186ba900406121f05246942214845ed
# Parent  bcf68ba23417f65175e24d7886e3595efe273e54
*** empty log message ***

diff -r bcf68ba23417 -r 5f487f7cb186 admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Thu Mar 29 22:33:22 2007 +0000
+++ b/admin/FOR-RELEASE	Thu Mar 29 22:35:12 2007 +0000
@@ -48,8 +48,6 @@
 ** flyspell and check-comments
 <http://lists.gnu.org/archive/html/emacs-devel/2007-03/msg00400.html>
 
-** Is it safe to use usleep?  Does configure.in have to check it exists?
-
 * DOCUMENTATION
 
 ** Document some recommendations about use of coding systems in .emacs
diff -r bcf68ba23417 -r 5f487f7cb186 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Mar 29 22:33:22 2007 +0000
+++ b/lisp/ChangeLog	Thu Mar 29 22:35:12 2007 +0000
@@ -1,3 +1,9 @@
+2007-03-29  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-read-internal): When reading file or dir, only override
+	minibuffer-local-filename-completion-map, otherwise only override
+	minibuffer-local-completion-map.
+
 2007-03-29  Glenn Morris  <rgm@gnu.org>
 
 	* complete.el (partial-completion-mode): Set PC-do-completion-end