From 483de32b26e18356955f9453a1d992b12fda271d Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Mon, 16 Oct 2000 21:05:03 +0000 Subject: [PATCH] (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. --- lispref/ChangeLog | 5 +++++ src/ChangeLog | 7 ++++++- src/xdisp.c | 9 +++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 15daf963e5d..7d09a366ff4 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2000-10-16 Gerd Moellmann + + * display.texi (Other Image Types): Add description of :foreground + and :background properties of mono PBM images. + 2000-08-17 Werner LEMBERG * .cvsignore: New file. diff --git a/src/ChangeLog b/src/ChangeLog index 0c85ed03323..a12519a96c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,13 @@ 2000-10-16 Gerd Moellmann + * 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 diff --git a/src/xdisp.c b/src/xdisp.c index bc69ef3d9f7..9b6d3806444 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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)); -- 2.39.2