diff options
| author | K. Handa | 2014-12-28 22:18:39 +0900 |
|---|---|---|
| committer | K. Handa | 2014-12-28 22:18:39 +0900 |
| commit | c2f9c07aa02d1c8cba4efdd503463642a910cd6b (patch) | |
| tree | 8e25338f25fe6d71a72cddff77f4c368192379ef /src/composite.c | |
| parent | 5979af512bf5d6a28acea24299b67c7939d9e703 (diff) | |
| parent | e092accb6bb8aea08dab1796d707b3adce55a38c (diff) | |
| download | emacs-c2f9c07aa02d1c8cba4efdd503463642a910cd6b.tar.gz emacs-c2f9c07aa02d1c8cba4efdd503463642a910cd6b.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/composite.c b/src/composite.c index 8982c904096..0b52a9fcd2b 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -1032,7 +1032,8 @@ composition_compute_stop_pos (struct composition_it *cmp_it, ptrdiff_t charpos, | |||
| 1032 | } | 1032 | } |
| 1033 | } | 1033 | } |
| 1034 | } | 1034 | } |
| 1035 | if (charpos == endpos) | 1035 | if (charpos == endpos |
| 1036 | && !(STRINGP (string) && endpos == SCHARS (string))) | ||
| 1036 | { | 1037 | { |
| 1037 | /* We couldn't find a composition point before ENDPOS. But, | 1038 | /* We couldn't find a composition point before ENDPOS. But, |
| 1038 | some character after ENDPOS may be composed with | 1039 | some character after ENDPOS may be composed with |