(file_name_completion): Disable the first optimization just

installed, since it is not implemented correctly.

diff --git a/src/ChangeLog b/src/ChangeLog
index 35c81a87ac9c3ab012303a9f4f23f0efb6855cad..0c2b34a4ee67357fdbb9538ae94531b628b4a5b7 100644 (file)
--- 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 b6bc706773631fb91209c1bfd7211729e58999e2..4beac6e50e43da73b1898695918121a147185983 100644 (file)
--- 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)
            {