2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 35c81a87ac9..0c2b34a4ee6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.c (file_name_completion): Disable the first optimization just
+        installed, since it is not implemented correctly.
+
 2009-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * dired.c (file_name_completion): Check completion-ignored-extensions
diff --git a/src/dired.c b/src/dired.c
index b6bc7067736..4beac6e50e4 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -538,6 +538,7 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate)
         {
           int skip;
 
+#if 0 /* FIXME: The `scmp' call compares an encoded and a decoded string. */
           /* If this entry matches the current bestmatch, the only
              thing it can do is increase matchcount, so don't bother
              investigating it any further.  */
@@ -548,6 +549,7 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate)
               && len >= bestmatchsize
               && 0 > scmp (dp->d_name, SDATA (bestmatch), bestmatchsize))
             continue;
+#endif
 
           if (directoryp)
             {