summaryrefslogtreecommitdiff
path: root/src/fringe.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-01-19 16:49:11 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-01-19 17:17:30 -0800
commit347e01447194e511daaeee8835bcb86d2505e642 (patch)
treea075b2c51308d56221833b5e7d9e8e48e18e472d /src/fringe.c
parentfb6462f056f616f3da8ae18037c7c2137fecb6fd (diff)
downloademacs-347e01447194e511daaeee8835bcb86d2505e642.tar.gz
Port to hypothetical case where Qnil is nonzero
* alloc.c (allocate_pseudovector): * callint.c (Fcall_interactively): * coding.c (syms_of_coding): * dispnew.c (realloc_glyph_pool): * fringe.c (init_fringe): * lisp.h (memsetnil): * xdisp.c (init_iterator): Port to the currently-hypothetical case where Qnil is nonzero. * dispnew.c (adjust_glyph_matrix): Remove unnecessary verification, as there are no Lisp_Object values in the data here. * lisp.h (NIL_IS_NONZERO): New symbol, replacing NIL_IS_ZERO. All uses changed. Define only if not already defined, so that one can debug with -DNIL_IS_NONZERO. * xdisp.c (init_iterator): Remove unnecessary initializations to 0.
Diffstat (limited to 'src/fringe.c')
-rw-r--r--src/fringe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fringe.c b/src/fringe.c
index 464379d0cd0..a494f681cd7 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1727,8 +1727,9 @@ init_fringe (void)
fringe_bitmaps = xzalloc (max_fringe_bitmaps * sizeof *fringe_bitmaps);
- verify (NIL_IS_ZERO);
fringe_faces = xzalloc (max_fringe_bitmaps * sizeof *fringe_faces);
+ if (NIL_IS_NONZERO)
+ memsetnil (fringe_faces, max_fringe_bitmaps);
}
#ifdef HAVE_NTGUI