From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 15 Sep 2017 18:59:08 +0000 (+0300)
Subject: One more attempt to avoid GCC 7 warnings in dispnew.c
X-Git-Tag: emacs-26.0.90~173^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=541b596bf155ceb17958e1d122920f6bb1a1ab58;p=emacs.git

One more attempt to avoid GCC 7 warnings in dispnew.c

* src/dispnew.c (adjust_glyph_matrix): Use eassume instead of
eassert, to avoid compilation warnings about NULL pointer
dereferences.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index ec9c77ded51..4a319ccc11b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -386,7 +386,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
      Do nothing if MATRIX' size, position, vscroll, and marginal areas
      haven't changed.  This optimization is important because preserving
      the matrix means preventing redisplay.  */
-  eassert (w != NULL || matrix->pool != NULL);
+  eassume (w != NULL || matrix->pool != NULL);
   if (matrix->pool == NULL)
     {
       left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols);