Commit db50ad5f authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug with conditionals in expand-file-name on MS-Windows.

 src/fileio.c (Fexpand_file_name) [WINDOWSNT]: Fix conditionals.
 Reported by Juanma Barranquero <lekktu@gmail.com>.
parent 1014b1dc
2013-12-15 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Fexpand_file_name) [WINDOWSNT]: Fix conditionals.
Reported by Juanma Barranquero <lekktu@gmail.com>.
* process.c (Fprocess_send_eof): Don't crash if someone tries to
open a pty on MS-Windows. (Bug#16152)
......
......@@ -1168,9 +1168,8 @@ filesystem tree, not (expand-file-name ".." dirname). */)
tem = build_string (newdir_utf8);
}
else
#else
tem = build_string (newdir);
#endif
tem = build_string (newdir);
if (multibyte && !STRING_MULTIBYTE (tem))
{
hdir = DECODE_FILE (tem);
......
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