Merge branch 'master' into xwidget

1 files changed, 36 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 16e2fa19626..f6a5f3837a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+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
+        * alloc.c (allocate_pseudovector): Catch more bogus values.
+        * alloc.c (allocate_pseudovector):
+        * callint.c (Fcall_interactively):
+        * coding.c (syms_of_coding):
+        * fringe.c (init_fringe):
+        Verify that Qnil == 0.
+        * callint.c (Fcall_interactively):
+        * eval.c (Fapply, Ffuncall):
+        * fns.c (mapcar1, larger_vector):
+        * font.c (font_expand_wildcards):
+        * fringe.c (init_fringe):
+        Prefer memset to assigning zeros by hand.
+        * callint.c (Fcall_interactively):
+        Remove duplicate assignment of Qnil to args[i].
+        * coding.c (syms_of_coding):
+        Prefer LISP_INITIALLY_ZERO to assigning zeros by hand.
+        * fileio.c (Ffile_selinux_context):
+        Rewrite to avoid need for Lisp_Object array.
+        * lisp.h (XLI_BUILTIN_LISPSYM): New macro.
+        (DEFINE_LISP_SYMBOL_END): Use it.
+        (NIL_IS_ZERO): New constant.
+        (memsetnil): New function.
+
 2015-01-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Tune pseudovector allocation assuming Qnil == 0.