diff options
| author | Kim F. Storm | 2005-01-07 13:13:05 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-01-07 13:13:05 +0000 |
| commit | 60227bf44ec8a72c2e448adad24b2971f951ea5b (patch) | |
| tree | 408886cbbd185dda080369ad8f51f100ae74542e /src | |
| parent | f9a23a6f5b4642c66181155a9066e293688d77b2 (diff) | |
| download | emacs-60227bf44ec8a72c2e448adad24b2971f951ea5b.tar.gz emacs-60227bf44ec8a72c2e448adad24b2971f951ea5b.zip | |
(set_iterator_to_next): Fix 2004-12-13 change.
Set stop_charpos to current charpos instead of 0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 5187 | it->dpvec = NULL; | 5187 | it->dpvec = NULL; |
| 5188 | it->current.dpvec_index = -1; | 5188 | it->current.dpvec_index = -1; |
| 5189 | 5189 | ||
| 5190 | /* Recheck faces after display vector */ | ||
| 5191 | it->stop_charpos = 0; | ||
| 5192 | |||
| 5193 | /* Skip over characters which were displayed via IT->dpvec. */ | 5190 | /* Skip over characters which were displayed via IT->dpvec. */ |
| 5194 | if (it->dpvec_char_len < 0) | 5191 | if (it->dpvec_char_len < 0) |
| 5195 | reseat_at_next_visible_line_start (it, 1); | 5192 | reseat_at_next_visible_line_start (it, 1); |
| @@ -5198,6 +5195,9 @@ set_iterator_to_next (it, reseat_p) | |||
| 5198 | it->len = it->dpvec_char_len; | 5195 | it->len = it->dpvec_char_len; |
| 5199 | set_iterator_to_next (it, reseat_p); | 5196 | set_iterator_to_next (it, reseat_p); |
| 5200 | } | 5197 | } |
| 5198 | |||
| 5199 | /* Recheck faces after display vector */ | ||
| 5200 | it->stop_charpos = IT_CHARPOS (*it); | ||
| 5201 | } | 5201 | } |
| 5202 | } | 5202 | } |
| 5203 | else if (it->method == next_element_from_string) | 5203 | else if (it->method == next_element_from_string) |