diff options
| author | Eli Zaretskii | 2011-11-30 18:50:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-11-30 18:50:38 +0200 |
| commit | 73d6c093dc3b6363835f53edac65799c6422493b (patch) | |
| tree | d620d437913eee62052a585c91009e85d0c6891d /src | |
| parent | 5c32d3f2f93edced9c004698eaa2234d809fee02 (diff) | |
| download | emacs-73d6c093dc3b6363835f53edac65799c6422493b.tar.gz emacs-73d6c093dc3b6363835f53edac65799c6422493b.zip | |
REALLY fix bug #10164 with crashes when linum-mode is turned on.
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dispnew.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4121da08617..cd3d5b0ac3c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-11-30 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * dispnew.c (adjust_glyph_matrix): Remove the assertion that | ||
| 4 | verifies glyph row's hash code--we have just reallocated the | ||
| 5 | glyphs, so their contents can be complete garbage. (Bug#10164) | ||
| 6 | |||
| 1 | 2011-11-30 Juanma Barranquero <lekktu@gmail.com> | 7 | 2011-11-30 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. | 9 | * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. |
diff --git a/src/dispnew.c b/src/dispnew.c index d2f33f0b5e4..2c0e74d0dde 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -608,10 +608,6 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y | |||
| 608 | row->glyphs[LAST_AREA] | 608 | row->glyphs[LAST_AREA] |
| 609 | = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | 609 | = row->glyphs[LEFT_MARGIN_AREA] + dim.width; |
| 610 | } | 610 | } |
| 611 | #if XASSERTS | ||
| 612 | if (row->enabled_p && !row->mode_line_p) | ||
| 613 | xassert (verify_row_hash (row)); | ||
| 614 | #endif | ||
| 615 | ++row; | 611 | ++row; |
| 616 | } | 612 | } |
| 617 | } | 613 | } |