procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REALLY fix bug #10164 with crashes when linum-mode is turned on.

Browse source 
src/dispnew.c (adjust_glyph_matrix): Remove the assertion that
 verifies glyph row's hash code--we have just reallocated the
 glyphs, so their contents can be complete garbage.
This commit is contained in:
Eli Zaretskii 2011-11-30 18:50:38 +02:00
parent 5c32d3f2f9
commit 73d6c093dc
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2011-11-30 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (adjust_glyph_matrix): Remove the assertion that
verifies glyph row's hash code--we have just reallocated the
glyphs, so their contents can be complete garbage. (Bug#10164)
2011-11-30 Juanma Barranquero <lekktu@gmail.com>
* dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check.

4
src/dispnew.c
View file

@ -608,10 +608,6 @@ 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;
}
#if XASSERTS
if (row->enabled_p && !row->mode_line_p)
xassert (verify_row_hash (row));
#endif
++row;
}
}