[Emacs-diffs] Changes to emacs/src/fileio.c,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/03/29 13:52:13

Index: fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -b -r1.607 -r1.608
--- fileio.c    20 Mar 2008 18:13:11 -0000      1.607
+++ fileio.c    29 Mar 2008 13:52:13 -0000      1.608
@@ -1378,9 +1378,15 @@
 #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 = string_to_multibyte (build_string (newdir));
+         newdir = SDATA (tem);
 #ifdef DOS_NT
          collapse_newdir = 0;
 #endif