From: Kim F. Storm <storm@cua.dk>
Date: Fri, 7 Jan 2005 13:13:05 +0000 (+0000)
Subject: (set_iterator_to_next): Fix 2004-12-13 change.
X-Git-Tag: ttn-vms-21-2-B4~2876
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60227bf44ec8a72c2e448adad24b2971f951ea5b;p=emacs.git

(set_iterator_to_next): Fix 2004-12-13 change.
Set stop_charpos to current charpos instead of 0.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index a7802d5321b..e4c231c3083 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5187,9 +5187,6 @@ set_iterator_to_next (it, reseat_p)
 	  it->dpvec = NULL;
 	  it->current.dpvec_index = -1;
 
-	  /* Recheck faces after display vector */
-	  it->stop_charpos = 0;
-
 	  /* Skip over characters which were displayed via IT->dpvec.  */
 	  if (it->dpvec_char_len < 0)
 	    reseat_at_next_visible_line_start (it, 1);
@@ -5198,6 +5195,9 @@ set_iterator_to_next (it, reseat_p)
 	      it->len = it->dpvec_char_len;
 	      set_iterator_to_next (it, reseat_p);
 	    }
+
+	  /* Recheck faces after display vector */
+	  it->stop_charpos = IT_CHARPOS (*it);
 	}
     }
   else if (it->method == next_element_from_string)