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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4121da0861781e69265bfa8e7cd8070d6128ef42..cd3d5b0ac3c59b81653cb1fc83d50b24f338e360 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/dispnew.c b/src/dispnew.c
index d2f33f0b5e4269cd23444c5d227a682e471ddfae..2c0e74d0dde851efa09b32da6937835533fe900a 100644 (file)
--- 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
                  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;
            }
        }