Commit 06f57aa7 authored by Richard M. Stallman's avatar Richard M. Stallman

(concat): Use unibyte_char_to_multibyte.

Fix lossage in installing previous patch.
parent d0628b06
...@@ -473,7 +473,7 @@ concat (nargs, args, target_type, last_special) ...@@ -473,7 +473,7 @@ concat (nargs, args, target_type, last_special)
} }
else if (STRINGP (this)) else if (STRINGP (this))
{ {
result_len_byte += XSTRING (this)->size_byte; if (STRING_MULTIBYTE (this))
{ {
some_multibyte = 1; some_multibyte = 1;
result_len_byte += XSTRING (this)->size_byte; result_len_byte += XSTRING (this)->size_byte;
...@@ -572,17 +572,9 @@ concat (nargs, args, target_type, last_special) ...@@ -572,17 +572,9 @@ concat (nargs, args, target_type, last_special)
{ {
unsigned char c; unsigned char c;
XSETFASTINT (elt, XSTRING (this)->data[thisindex++]); XSETFASTINT (elt, XSTRING (this)->data[thisindex++]);
if (some_multibyte && XINT (elt) >= 0200 if (some_multibyte)
&& XINT (elt) < 0400) XSETINT (elt,
{ unibyte_char_to_multibyte (XINT (elt)));
c = XINT (elt);
if (nonascii_insert_offset > 0)
c += nonascii_insert_offset;
else
c += DEFAULT_NONASCII_INSERT_OFFSET;
XSETINT (elt, c);
}
} }
} }
else if (BOOL_VECTOR_P (this)) else if (BOOL_VECTOR_P (this))
......
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