auto upstream

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 46f872ba29d..05d69382855 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2013-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Minor hashing refactoring.
+        * fns.c (SXHASH_REDUCE): Move to lisp.h.
+        (sxhash_float): Return EMACS_UINT, for consistency with the other
+        hash functions.
+        * lisp.h (INTMASK): Now a macro, since SXHASH_REDUCE is now a
+        non-static inline function and therefore can't use static vars.
+        (SXHASH_REDUCE): Move here from fns.c, and make it inline.
+        * profiler.c (hashfn_profiler): Use SXHASH_REDUCE, to be consistent
+        with the other hash functions.
+
+2013-02-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * callproc.c (Fcall_process_region) [WINDOWSNT]: Make sure the
+        XXXXXX part of the temporary file pattern is not downcased even
+        when w32-downcase-file-names is non-nil.  (Bug#13661)
+
+        * xdisp.c (decode_mode_spec): Remove handling of %t.
+
+        * msdos.c (careadlinkatcwd): Remove.
+
 2013-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lread.c (skip_dyn_bytes): New function (bug#12598).