[Emacs-diffs] /srv/bzr/emacs/trunk r106561: REALLY fix bug #10164 with crashes when linum-mode is turned on.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106561
fixes bug(s): http://debbugs.gnu.org/10164
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-30 18:50:38 +0200
message:
  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.
modified:
  src/ChangeLog
  src/dispnew.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-30 16:33:05 +0000
+++ b/src/ChangeLog     2011-11-30 16:50:38 +0000
@@ -1,3 +1,9 @@
+2011-11-30  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-11-30 12:58:42 +0000
+++ b/src/dispnew.c     2011-11-30 16:50:38 +0000
@@ -608,10 +608,6 @@
                  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;
            }
        }