diff options
| -rw-r--r-- | src/.gdbinit | 5 | ||||
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/dispnew.c | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/.gdbinit b/src/.gdbinit index 80415abe40d..2051475bea0 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -311,9 +311,8 @@ define prowx 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" diff --git a/src/ChangeLog b/src/ChangeLog index a0f83560603..51fa3b65be1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2011-11-22 Eli Zaretskii <eliz@gnu.org> + + * 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 <larsi@gnus.org> * process.c (wait_reading_process_output): Fix asynchrounous diff --git a/src/dispnew.c b/src/dispnew.c index d6bf6666ee2..8abf5782a88 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -608,7 +608,9 @@ 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; } - xassert (!row->enabled_p || verify_row_hash (row)); + xassert (!row->enabled_p + || row->mode_line_p + || verify_row_hash (row)); ++row; } } |