auto upstream

1 files changed, 30 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ffa4bdf927f..e147889f796 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2013-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32notify.c (Fw32notify_add_watch): Doc fix.  (Bug#13540)
+
+2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (num_fonts): Remove the leftover from old
+        debugging code.  Adjust comment style here and there.
+        * insdel.c (insert_1): Remove.
+        * lisp.h (insert_1): Remove prototype.
+        * xdisp.c (message_dolog): Adjust users to call insert_1_both.
+
+2013-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (max_filename_mbslen): New function.
+        (normalize_filename, readdir): Use it to detect locales where ANSI
+        encoding of file names uses a double-byte character set (DBCS).
+        If a DBCS encoding is used, advance by characters using
+        CharNextExA, instead of incrementing a 'char *' pointer.  Use
+        _mbslwr instead of _strlwr.  (Bug#13515)
+
+        * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
+        request of memory reservation to 1.7GB.  (Bug#13065)
+
+2013-01-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * coding.c (detect_coding_iso_2022): Move back mis-reordered code
+        at check_extra_latin label.  (Bug#13505)
+
 2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
@@ -19,7 +48,7 @@
         (w32_read_socket): Save iconified state to generate DEICONIFY_EVENT
         properly.  Likewise for obscured.
         * xterm.c: Ditto.
-        (handle_one_xevent): Save visible state go generate ICONIFY_EVENT
+        (handle_one_xevent): Save visible state to generate ICONIFY_EVENT
         properly.
         * nsterm.m: Ditto.
         (windowDidDeminiaturize): Generate DEICONIFY_EVENT.