(Fexpand_file_name): Fix last change.

diff --git a/src/fileio.c b/src/fileio.c
index 2af8124a8503478f0f8e3954b392dc16930df17e..70b72f52553984b2b3c261a6cd3a78933263ce16 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1064,6 +1064,7 @@ See also the function `substitute-in-file-name'.  */)
   int length;
   Lisp_Object handler, result;
   int multibyte;
+  Lisp_Object hdir;
 
   CHECK_STRING (name);
 
@@ -1385,8 +1386,12 @@ See also the function `substitute-in-file-name'.  */)
          nm++;
          /* egetenv may return a unibyte string, which will bite us since
             we expect the directory to be multibyte.  */
-         tem = string_to_multibyte (build_string (newdir));
-         newdir = SDATA (tem);
+         tem = build_string (newdir);
+         if (!STRING_MULTIBYTE (tem))
+           {
+             hdir = DECODE_FILE (tem);
+             newdir = SDATA (hdir);
+           }
 #ifdef DOS_NT
          collapse_newdir = 0;
 #endif