(Fexpand_file_name): Convert the value of $HOME to a multibyte string.

2 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e41e9be455..5d190d543c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fexpand_file_name): Convert the value of $HOME to a
+        multibyte string.
+
 2008-08-01  Jason Rumney  <jasonr@gnu.org>
 
         * w32term.c (x_draw_composite_glyph_string_foreground): Force
diff --git a/src/fileio.c b/src/fileio.c
index cc6c7c2d3a7..4f703a8a743 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1066,6 +1066,7 @@ See also the function `substitute-in-file-name'.  */)
   int length;
   Lisp_Object handler, result;
   int multibyte;
+  Lisp_Object hdir;
 
   CHECK_STRING (name);
 
@@ -1369,9 +1370,19 @@ See also the function `substitute-in-file-name'.  */)
 #endif /* VMS */
           || nm[1] == 0)        /* ~ by itself */
         {
+          Lisp_Object tem;
+
           if (!(newdir = (unsigned char *) egetenv ("HOME")))
             newdir = (unsigned char *) "";
           nm++;
+          /* egetenv may return a unibyte string, which will bite us since
+             we expect the directory to be multibyte.  */
+          tem = build_string (newdir);
+          if (!STRING_MULTIBYTE (tem))
+            {
+              hdir = DECODE_FILE (tem);
+              newdir = SDATA (hdir);
+            }
 #ifdef DOS_NT
           collapse_newdir = 0;
 #endif