1 files changed, 21 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c0e26760c7..04a6c353619 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2013-04-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (Ftest_completion): Silence compiler warning.
+
+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.
@@ -1244,7 +1261,7 @@
         (Fcommand_execute): Remove, replace by an Elisp implementation.
         (syms_of_keyboard): Adjust accordingly.
 
-2013-02-19  Daniel Colascione <dancol@dancol.org>
+2013-02-19  Daniel Colascione  <dancol@dancol.org>
 
         * sheap.c (report_sheap_usage): Use message, not message1, so
         that we don't try to create a buffer while we're in the middle
@@ -12068,9 +12085,9 @@
         to denote vector blocks.  Adjust users (live_vector_p,
         mark_maybe_pointer, valid_lisp_object_p) accordingly.
         (COMMON_MULTIPLE): Move outside #if USE_LSB_TAG.
-        (VECTOR_BLOCK_SIZE, vroundup, VECTOR_BLOCK_BYTES),
-        (VBLOCK_BYTES_MIN, VBLOCK_BYTES_MAX, VECTOR_MAX_FREE_LIST_INDEX),
-        (VECTOR_FREE_LIST_FLAG, ADVANCE, VINDEX, SETUP_ON_FREE_LIST),
+        (VECTOR_BLOCK_SIZE, vroundup, VECTOR_BLOCK_BYTES)
+        (VBLOCK_BYTES_MIN, VBLOCK_BYTES_MAX, VECTOR_MAX_FREE_LIST_INDEX)
+        (VECTOR_FREE_LIST_FLAG, ADVANCE, VINDEX, SETUP_ON_FREE_LIST)
         (VECTOR_SIZE, VECTOR_IN_BLOCK): New macros.
         (roundup_size): New constant.
         (struct vector_block): New data type.