1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2654abd32d4..4e01e155c2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-09-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero,
+        always make sure the marginal areas of the row are in sync with
+        what the window wants.  (Bug#18419)
+
+        * data.c (set_internal): Use assq_no_quit, not Fassq, to find an
+        existing binding of a variable, to avoid silently aborting
+        commands that use specbind.  (Bug#18331)
+
 2014-09-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix bug uncovered by changing alloca to auto buffer (Bug#18410).