auto upstream

1 files changed, 65 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4c3195973c..092302d6492 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,68 @@
+2013-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Avoid file time stamp bug on MS-Windows (Bug#13149).
+        * fileio.c (Fwrite_region): Don't use the heuristic on empty files,
+        as FAT32 doesn't update time stamps when truncating them.
+        Also, check that a file time stamp is not a multiple of 100 ns;
+        this should catch all instances of the problem on MS-Windows,
+        as its native file system resolution is 100 ns or worse, and
+        checking for a non-multiple of 100 ns should impose only a small
+        overhead on systems with ns resolution.
+
+2013-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+        Avoid encoding file names on MS-Windows when they need to be run
+        through dostounix_filename.
+        * w32.c (normalize_filename): Accept an additional argument
+        MULTIBYTE; if non-zero, traverse the file name by bytes and don't
+        downcase it even if w32-downcase-file-names is non-nil.
+        (dostounix_filename): Accept an additional argument MULTIBYTE and
+        pass it to normalize_filename.
+        (emacs_root_dir): Adjust.
+
+        * msdos.h (dostounix_filename): Adjust prototype.
+
+        * w32.h (dostounix_filename): Adjust prototype.
+
+        * msdos.c (dostounix_filename): Accept an additional argument and
+        ignore it.
+        (init_environment): Adjust callers of dostounix_filename.
+
+        * fileio.c (Ffile_name_directory, file_name_as_directory)
+        (directory_file_name, Fexpand_file_name)
+        (Fsubstitute_in_file_name): [DOS_NT] Adjust call to
+        dostounix_filename.
+        [WINDOWSNT]: Downcase file names if w32-downcase-file-names is
+        non-nil.
+        (Fsubstitute_in_file_name): [DOS_NT] Don't downcase environment
+        variables, as egetenv is case-insensitive for DOS_NT.
+
+        * dired.c (file_name_completion): Don't call Fdirectory_file_name
+        with an encoded file name.
+
+        * w32proc.c (Fw32_short_file_name, Fw32_long_file_name): Adjust
+        calls to dostounix_filename.
+
+        * w32fns.c (Fx_file_dialog): Adjust call to dostounix_filename.
+
+        * unexw32.c (unexec): Adjust call to dostounix_filename.
+
+        * termcap.c (tgetent) [MSDOS]: Adjust call to dostounix_filename.
+
+        * emacs.c (decode_env_path) [DOS_NT]: Adjust call to
+        dostounix_filename.
+
+        * callproc.c (Fcall_process) [MSDOS]: Adjust call to
+        dostounix_filename.
+
+        * callproc.c (Fcall_process): Make sure program name in PATH and
+        new_argv[0] is encoded, if needed.  Otherwise, un-encoded string
+        is passed to exec/spawnve, which fails unless the file-name
+        encoding is UTF-8.
+
+        * w32proc.c (sys_spawnve): Make sure escape_char is initialized,
+        even if w32-quote-process-args is nil.
+
 2013-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix timestamp bug when write-region appends nothing (Bug#13149).