From: Kim F. Storm <storm@cua.dk>
Date: Thu, 29 Mar 2007 22:35:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.97~125
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d95fae7749d5366d8a4feec76e5b35bbb2dfdf9d;p=emacs.git

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

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d053a079ea1..f2b91df6a66 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -48,8 +48,6 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9306da36f64..6ca56b482e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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