1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 04b952cae60..f6a5f3837a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix, realloc_glyph_pool): Verify that
+        Qnil is represented as zero, before using that to initialize parts
+        of the glyph structure.
+
+        * xdisp.c (init_iterator): Verify that Qnil is represented as
+        zero, before using that to initialize parts of the iterator
+        structure.
+
 2015-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer memset to repeatedly assigning Qnil