Merge from trunk.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d6fda4fec7..11b82f57108 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2013-04-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (w32_wnd_proc): Add more assertions to investigate
+        bug#14062.
+
+        * frame.h (WINDOW_FRAME): Protect macro and its argument with
+        parentheses.
+
+        * dispextern.h (CURRENT_MODE_LINE_HEIGHT)
+        (CURRENT_HEADER_LINE_HEIGHT, WINDOW_WANTS_MODELINE_P)
+        (WINDOW_WANTS_HEADER_LINE_P): Protect macro arguments with
+        parentheses where appropriate.
+
+2013-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * keyboard.c (timer_start_idle): Remove no-longer-used local.
+
 2013-04-14  Eli Zaretskii  <eliz@gnu.org>
 
         * buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>