Mercurial > emacs
changeset 35352:42b56dd8986e
(concat): Be sure to avoid putting the same `composition'
property on the adjacent regions.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 17 Jan 2001 05:55:31 +0000 |
| parents | 5e8aeef6d306 |
| children | 6e4d871d265d |
| files | src/fns.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fns.c Wed Jan 17 05:55:12 2001 +0000 +++ b/src/fns.c Wed Jan 17 05:55:31 2001 +0000 @@ -830,6 +830,7 @@ if (num_textprops > 0) { Lisp_Object props; + int last_to_end = -1; for (argnum = 0; argnum < num_textprops; argnum++) { @@ -840,11 +841,11 @@ Qnil); /* If successive arguments have properites, be sure that the value of `composition' property be the copy. */ - if (argnum > 0 - && textprops[argnum - 1].argnum + 1 == textprops[argnum].argnum) + if (last_to_end == textprops[argnum].to) make_composition_value_copy (props); add_text_properties_from_list (val, props, make_number (textprops[argnum].to)); + last_to_end = textprops[argnum].to + XSTRING (this)->size; } } return val;