diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fileio.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d2ea1502a98..d5c84d04807 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 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) diff --git a/src/fileio.c b/src/fileio.c index 02bde865644..47736d2b1b7 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -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); |