Commit 33f37824 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(concat): While copying text properties, make each composition

property value a copy.
parent be17069b
...@@ -826,12 +826,22 @@ concat (nargs, args, target_type, last_special) ...@@ -826,12 +826,22 @@ concat (nargs, args, target_type, last_special)
if (num_textprops > 0) if (num_textprops > 0)
{ {
Lisp_Object props;
for (argnum = 0; argnum < num_textprops; argnum++) for (argnum = 0; argnum < num_textprops; argnum++)
{ {
this = args[textprops[argnum].argnum]; this = args[textprops[argnum].argnum];
copy_text_properties (make_number (textprops[argnum].from), props = text_property_list (this,
make_number (XSTRING (this)->size), this, make_number (0),
make_number (textprops[argnum].to), val, Qnil); make_number (XSTRING (this)->size),
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)
make_composition_value_copy (props);
add_text_properties_from_list (val, props,
make_number (textprops[argnum].to));
} }
} }
return val; return val;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment