diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-12-15 22:39:36 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-15 22:39:36 +0200 |
| commit | db50ad5f11cc5809c27091181a13ee7aa34ec5ed (patch) | |
| tree | d6a471d3c654361bd1ad399a0c3fd0821e28559d | |
| parent | 1014b1dc34ed9717c48a089f45423235f09b1101 (diff) | |
| download | emacs-db50ad5f11cc5809c27091181a13ee7aa34ec5ed.tar.gz emacs-db50ad5f11cc5809c27091181a13ee7aa34ec5ed.tar.bz2 emacs-db50ad5f11cc5809c27091181a13ee7aa34ec5ed.zip | |
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>.
| -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); |