diff options
| author | Kenichi Handa | 2012-10-17 22:30:56 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-17 22:30:56 +0900 |
| commit | fe0b1ec40988638025db569a936b09f0295749a1 (patch) | |
| tree | 91ec7c7e37fae90c1d46e000a4c9dd59160d1695 /src | |
| parent | 9fe32d61c5655878f877522ac4bcc251d092f732 (diff) | |
| download | emacs-fe0b1ec40988638025db569a936b09f0295749a1.tar.gz emacs-fe0b1ec40988638025db569a936b09f0295749a1.zip | |
xdisp.c (reseat_1): Make the information stored in it->cmp_it invalidate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 346fe0e86b3..21d13a04e77 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-17 Kenichi Handa <handa@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (reseat_1): Make the information stored in it->cmp_it | ||
| 4 | invalidate. | ||
| 5 | |||
| 1 | 2012-10-13 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2012-10-13 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612). | 8 | * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612). |
diff --git a/src/xdisp.c b/src/xdisp.c index 1e61a74068b..6964719f958 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -6302,6 +6302,8 @@ reseat_1 (struct it *it, struct text_pos pos, int set_stop_p) | |||
| 6302 | it->stop_charpos = CHARPOS (pos); | 6302 | it->stop_charpos = CHARPOS (pos); |
| 6303 | it->base_level_stop = CHARPOS (pos); | 6303 | it->base_level_stop = CHARPOS (pos); |
| 6304 | } | 6304 | } |
| 6305 | /* This make the information stored in it->cmp_it invalidate. */ | ||
| 6306 | it->cmp_it.id = -1; | ||
| 6305 | } | 6307 | } |
| 6306 | 6308 | ||
| 6307 | 6309 | ||