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>.

diff --git a/src/ChangeLog b/src/ChangeLog
index d2ea1502a98cbbdb71d6bf75e33668b34d6f91ef..d5c84d0480791c87650c3bec44266c61697f10ab 100644 (file)
--- 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 02bde86564474a00b22ae7ea71b13d6cd5ce4d3d..47736d2b1b7232340562c4b8121f7212b8c16544 100644 (file)
--- 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);