Commit 9c06a1f3 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(Fexpand_file_name): Fix last change.

parent 6d557778
...@@ -1064,6 +1064,7 @@ See also the function `substitute-in-file-name'. */) ...@@ -1064,6 +1064,7 @@ See also the function `substitute-in-file-name'. */)
int length; int length;
Lisp_Object handler, result; Lisp_Object handler, result;
int multibyte; int multibyte;
Lisp_Object hdir;
CHECK_STRING (name); CHECK_STRING (name);
...@@ -1385,8 +1386,12 @@ See also the function `substitute-in-file-name'. */) ...@@ -1385,8 +1386,12 @@ See also the function `substitute-in-file-name'. */)
nm++; nm++;
/* egetenv may return a unibyte string, which will bite us since /* egetenv may return a unibyte string, which will bite us since
we expect the directory to be multibyte. */ we expect the directory to be multibyte. */
tem = string_to_multibyte (build_string (newdir)); tem = build_string (newdir);
newdir = SDATA (tem); if (!STRING_MULTIBYTE (tem))
{
hdir = DECODE_FILE (tem);
newdir = SDATA (hdir);
}
#ifdef DOS_NT #ifdef DOS_NT
collapse_newdir = 0; collapse_newdir = 0;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment