1 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a320e22c65c..e5e4fe9edb0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2015-01-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Undo port to hypothetical nonzero Qnil case
+        This mostly undoes the previous change in this area.  See:
+        http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00570.html
+        * alloc.c (allocate_pseudovector):
+        * callint.c (Fcall_interactively):
+        * dispnew.c (realloc_glyph_pool):
+        * fringe.c (init_fringe):
+        * lisp.h (memsetnil):
+        * xdisp.c (init_iterator):
+        Simplify by assuming that Qnil is zero, but verify the assumption.
+        * lisp.h (NIL_IS_ZERO): Revert back to this symbol, removing
+        NIL_IS_NONZERO.  All uses changed.
+
 2015-01-20  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).