Commit 37dcfea0 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix crashes in GC in "emacs -nw".

 xdisp.c (display_line): Don't write beyond the last glyph row in
 the desired matrix.  Fixes crashes in "emacs -nw", see
 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00075.html
 and http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00213.html
parent 98923800
2010-04-19 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (display_line): Don't write beyond the last glyph row in
the desired matrix. Fixes a crash in "emacs -nw", see
http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00075.html
and
http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00213.html
2010-04-18 Stefan Monnier <monnier@iro.umontreal.ca>
* alloc.c (Fpurecopy): Hash-cons if requested.
......
......@@ -17808,10 +17808,12 @@ display_line (it)
it->current_y += row->height;
++it->vpos;
++it->glyph_row;
/* The next row should use same value of the reversed_p flag as this
one. set_iterator_to_next decides when it's a new paragraph, and
PRODUCE_GLYPHS recomputes the value of the flag accordingly. */
it->glyph_row->reversed_p = row->reversed_p;
/* The next row should by default use the same value of the
reversed_p flag as this one. set_iterator_to_next decides when
it's a new paragraph, and PRODUCE_GLYPHS recomputes the value of
the flag accordingly. */
if (it->glyph_row < MATRIX_BOTTOM_TEXT_ROW (it->w->desired_matrix, it->w))
it->glyph_row->reversed_p = row->reversed_p;
it->start = row_end;
return row->displays_text_p;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment