From: Chris Feng <chris.w.feng@gmail.com>
Date: Thu, 25 Feb 2016 01:34:55 +0000 (+0800)
Subject: Fix an assertion
X-Git-Tag: emacs-25.0.92~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8be32cf45cd8b39ff6c8dc431b0ac04a0959786d;p=emacs.git

Fix an assertion

* src/dispnew.c (clear_glyph_matrix_rows): Test matrix->nrows == 0 (which
implies start == 0) separately.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index f96db302781..f834f359ec5 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -683,7 +683,9 @@ void
 clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end)
 {
   eassert (start <= end);
-  eassert (start >= 0 && start <= matrix->nrows);
+  eassert (start >= 0 && (start < matrix->nrows
+			  /* matrix->nrows can be 0 for the initial frame.  */
+			  || (matrix->nrows == 0)));
   eassert (end >= 0 && end <= matrix->nrows);
 
   for (; start < end; ++start)