Commit 483de32b authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(set_iterator_to_next): Reset box start and flags of the

iterator at the beginning, so that they can be set later on, for
instance in reseat_at_next_visible_line_start without being
overwritten.
parent 7ccd82bd
2000-10-16 Gerd Moellmann <gerd@gnu.org>
* display.texi (Other Image Types): Add description of :foreground
and :background properties of mono PBM images.
2000-08-17 Werner LEMBERG <wl@gnu.org>
* .cvsignore: New file.
......
2000-10-16 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (set_iterator_to_next): Reset box start and end flags of
the iterator at the beginning, so that they can be set later on,
for instance in reseat_at_next_visible_line_start, without being
overwritten.
* xfns.c (pbm_format): Add :foreground and :background keywords.
(PBM_FOREGROUND, PBM_BACKGROUND): New enumerators.
(xbm_load): Recoghnize foreground and background color
(xbm_load): Recognize foreground and background color
specifications.
2000-10-16 Eli Zaretskii <eliz@is.elta.co.il>
......
......@@ -3789,6 +3789,11 @@ set_iterator_to_next (it, reseat_p)
struct it *it;
int reseat_p;
{
/* Reset flags indicating start and end of a sequence of characters
with box. Reset them at the start of this function because
moving the iterator to a new position might set them. */
it->start_of_box_run_p = it->end_of_box_run_p = 0;
if (it->method == next_element_from_buffer)
{
/* The current display element of IT is a character from
......@@ -3912,10 +3917,6 @@ set_iterator_to_next (it, reseat_p)
/* There are no other methods defined, so this should be a bug. */
abort ();
/* Reset flags indicating start and end of a sequence of
characters with box. */
it->start_of_box_run_p = it->end_of_box_run_p = 0;
xassert (it->method != next_element_from_string
|| (STRINGP (it->string)
&& IT_STRING_CHARPOS (*it) >= 0));
......
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