diff options
| author | Eli Zaretskii | 2017-09-15 21:59:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-15 21:59:08 +0300 |
| commit | 541b596bf155ceb17958e1d122920f6bb1a1ab58 (patch) | |
| tree | 461fa199637cfeecb205f9597feeea101adbc172 | |
| parent | 6e38b9253e3d67def0e16f90da574b4622d962a3 (diff) | |
| download | emacs-541b596bf155ceb17958e1d122920f6bb1a1ab58.tar.gz emacs-541b596bf155ceb17958e1d122920f6bb1a1ab58.zip | |
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.
| -rw-r--r-- | src/dispnew.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 386 | Do nothing if MATRIX' size, position, vscroll, and marginal areas | 386 | Do nothing if MATRIX' size, position, vscroll, and marginal areas |
| 387 | haven't changed. This optimization is important because preserving | 387 | haven't changed. This optimization is important because preserving |
| 388 | the matrix means preventing redisplay. */ | 388 | the matrix means preventing redisplay. */ |
| 389 | eassert (w != NULL || matrix->pool != NULL); | 389 | eassume (w != NULL || matrix->pool != NULL); |
| 390 | if (matrix->pool == NULL) | 390 | if (matrix->pool == NULL) |
| 391 | { | 391 | { |
| 392 | left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols); | 392 | left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols); |