diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-07-07 12:18:25 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-07-07 12:18:25 -0400 |
| commit | 412f24b9ddf1e07022f8c5fe05f0717f130c4c02 (patch) | |
| tree | cf8450140b0907d14ac4dbdcf025f033a992bc98 /src/composite.c | |
| parent | af0905c84a232b034b4f792847aa05531f8cdefc (diff) | |
| parent | 15fa4783a39e7a8d99cc6b5e783307c08b25a823 (diff) | |
| download | emacs-412f24b9ddf1e07022f8c5fe05f0717f130c4c02.tar.gz emacs-412f24b9ddf1e07022f8c5fe05f0717f130c4c02.tar.bz2 emacs-412f24b9ddf1e07022f8c5fe05f0717f130c4c02.zip | |
Merge from emacs-23 branch
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/composite.c b/src/composite.c index 577640f6fb7..cf1e053f027 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1026,6 +1026,7 @@ composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos, /* FIXME: Bidi is not yet handled well in static composition. */ if (charpos < endpos && find_composition (charpos, endpos, &start, &end, &prop, string) + && start >= charpos && COMPOSITION_VALID_P (start, end, prop)) { cmp_it->stop_pos = endpos = start; |