emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 541b596: One more attempt to avoid GCC 7 warnings i


From: Eli Zaretskii
Subject: [Emacs-diffs] master 541b596: One more attempt to avoid GCC 7 warnings in dispnew.c
Date: Fri, 15 Sep 2017 14:59:57 -0400 (EDT)

branch: master
commit 541b596bf155ceb17958e1d122920f6bb1a1ab58
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 src/dispnew.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dispnew.c b/src/dispnew.c
index ec9c77d..4a319cc 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);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]