(file_name_completion): Fix another mixing of encoded

and decoded names.

diff --git a/src/ChangeLog b/src/ChangeLog
index cb96e30094a7f83853f4934f3201151bdb0a25ab..28cf208dc448c783b2b6f4489f70041e8ae3e59f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-28  Andreas Schwab  <schwab@suse.de>
+
+       * dired.c (file_name_completion): Fix another mixing of encoded
+       and decoded names.
+
 2008-04-28  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32fns.c (Fw32_define_rgb_color): Fix typo in docstring.

diff --git a/src/dired.c b/src/dired.c
index 3fa32b474da34ce31550691312b11489d6377cfc..dda5fdeabc6c92462a4efff34e0e53fe3251f661 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -756,7 +756,7 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate)
        bestmatch = DECODE_FILE (bestmatch);
       return bestmatch;
     }
-  if (matchcount == 1 && bestmatchsize == SCHARS (file))
+  if (matchcount == 1 && bestmatchsize == SCHARS (encoded_file))
     return Qt;
   bestmatch = Fsubstring (bestmatch, make_number (0),
                          make_number (bestmatchsize));