From: Andreas Schwab <schwab@suse.de>
Date: Mon, 28 Apr 2008 18:33:06 +0000 (+0000)
Subject: (file_name_completion): Fix another mixing of encoded
X-Git-Tag: emacs-pretest-23.0.90~5980
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb4a622af4f461c101c5d7a78481f58f7cbdae74;p=emacs.git

(file_name_completion): Fix another mixing of encoded
and decoded names.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cb96e30094a..28cf208dc44 100644
--- 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 3fa32b474da..dda5fdeabc6 100644
--- 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));