[Emacs-diffs] /srv/bzr/emacs/trunk r106478: Fix bug #10098 with assertion violation during frame resize.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106478
fixes bug(s): http://debbugs.gnu.org/10098
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-22 20:00:38 +0200
message:
  Fix bug #10098 with assertion violation during frame resize.
  
   src/dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode-
   and header-lines, as they don't have one computed for them.
   src/.gdbinit (prow): Make displayed values more self-explaining.
   Add row's hash code.
modified:
  src/.gdbinit
  src/ChangeLog
  src/dispnew.c

=== modified file 'src/.gdbinit'
--- a/src/.gdbinit      2011-10-29 13:35:23 +0000
+++ b/src/.gdbinit      2011-11-22 18:00:38 +0000
@@ -311,9 +311,8 @@
   printf "y=%d x=%d pwid=%d", $row->y, $row->x, $row->pixel_width
   printf " a+d=%d+%d=%d", $row->ascent, $row->height-$row->ascent, $row->height
   printf " phys=%d+%d=%d", $row->phys_ascent, 
$row->phys_height-$row->phys_ascent, $row->phys_height
-  printf " vis=%d", $row->visible_height
-  printf "  L=%d T=%d R=%d", $row->used[0], $row->used[1], $row->used[2]
-  printf "\n"
+  printf " vis=%d\n", $row->visible_height
+  printf "used=(LMargin=%d,Text=%d,RMargin=%d) Hash=%d\n", $row->used[0], 
$row->used[1], $row->used[2], $row->hash
   printf "start=%d end=%d", $row->start.pos.charpos, $row->end.pos.charpos
   if ($row->enabled_p)
     printf " ENA"

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-21 20:39:44 +0000
+++ b/src/ChangeLog     2011-11-22 18:00:38 +0000
@@ -1,3 +1,12 @@
+2011-11-22  Eli Zaretskii  <address@hidden>
+
+       * dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode-
+       and header-lines, as they don't have one computed for them.
+       (Bug#10098)
+
+       * .gdbinit (prow): Make displayed values more self-explaining.
+       Add row's hash code.
+
 2011-11-21  Lars Magne Ingebrigtsen  <address@hidden>
 
        * process.c (wait_reading_process_output): Fix asynchrounous

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-11-19 08:39:42 +0000
+++ b/src/dispnew.c     2011-11-22 18:00:38 +0000
@@ -608,7 +608,9 @@
                  row->glyphs[LAST_AREA]
                    = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
                }
-             xassert (!row->enabled_p || verify_row_hash (row));
+             xassert (!row->enabled_p
+                      || row->mode_line_p
+                      || verify_row_hash (row));
              ++row;
            }
        }