[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v |
Date: |
Sat, 29 Mar 2008 15:28:57 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/03/29 15:28:57
Index: fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -b -r1.608 -r1.609
--- fileio.c 29 Mar 2008 13:52:13 -0000 1.608
+++ fileio.c 29 Mar 2008 15:28:57 -0000 1.609
@@ -1064,6 +1064,7 @@
int length;
Lisp_Object handler, result;
int multibyte;
+ Lisp_Object hdir;
CHECK_STRING (name);
@@ -1385,8 +1386,12 @@
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