*** empty log message ***

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d053a079ea15287b1b54b906c73e0def79921842..f2b91df6a666f8af4591eb7b12186bb28b069963 100644 (file)
--- 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 9306da36f648454c087adf05e446094230863ef3..6ca56b482e31bbc99d6347249994860fa76e222a 100644 (file)
--- 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