[Emacs-diffs] trunk r115539: Fix bug with conditionals in expand-file-name on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 115539
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-15 22:39:36 +0200
message:
  Fix bug with conditionals in expand-file-name on MS-Windows.
  
   src/fileio.c (Fexpand_file_name) [WINDOWSNT]: Fix conditionals.
   Reported by Juanma Barranquero <address@hidden>.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-15 18:37:48 +0000
+++ b/src/ChangeLog     2013-12-15 20:39:36 +0000
@@ -1,5 +1,8 @@
 2013-12-15  Eli Zaretskii  <address@hidden>
 
+       * fileio.c (Fexpand_file_name) [WINDOWSNT]: Fix conditionals.
+       Reported by Juanma Barranquero <address@hidden>.
+
        * process.c (Fprocess_send_eof): Don't crash if someone tries to
        open a pty on MS-Windows.  (Bug#16152)
 

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2013-12-14 21:36:44 +0000
+++ b/src/fileio.c      2013-12-15 20:39:36 +0000
@@ -1168,9 +1168,8 @@
              tem = build_string (newdir_utf8);
            }
          else
-#else
+#endif
            tem = build_string (newdir);
-#endif
          if (multibyte && !STRING_MULTIBYTE (tem))
            {
              hdir = DECODE_FILE (tem);