Commit 801a4313 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix bug #10164 with assertion violations in linum-mode.

 src/dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
 attributes are tested _before_ calling verify_row_hash, to protect
 against GCC re-ordering of the tests.
parent e7308292
2011-11-30 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
attributes are tested _before_ calling verify_row_hash, to protect
against GCC re-ordering of the tests. (Bug#10164)
2011-11-29 Jan Djärv <jan.h.d@swipnet.se>
* xterm.h (struct x_output): net_wm_state_hidden_seen is new.
......
......@@ -608,9 +608,10 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
row->glyphs[LAST_AREA]
= row->glyphs[LEFT_MARGIN_AREA] + dim.width;
}
xassert (!row->enabled_p
|| row->mode_line_p
|| verify_row_hash (row));
#if XASSERTS
if (row->enabled_p && !row->mode_line_p)
verify_row_hash (row));
#endif
++row;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment