From 8b542479bbbcf55d55f478fe809ad7d4e69086ee Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 8 Jul 1998 02:19:14 +0000 Subject: [PATCH] (concat): Replace explicit numeric constants with proper macros. --- src/fns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fns.c b/src/fns.c index 286891add6f..e34d06748e6 100644 --- a/src/fns.c +++ b/src/fns.c @@ -667,8 +667,8 @@ concat (nargs, args, target_type, last_special) STRING_BYTES (XSTRING (this))); if (some_multibyte && toindex_byte > 0 - && XSTRING (val)->data[toindex_byte - 1] >= 0x80 - && XSTRING (this)->data[0] >= 0xA0) + && !ASCII_BYTE_P (XSTRING (val)->data[toindex_byte - 1]) + && !CHAR_HEAD_P (XSTRING (this)->data[0] >= 0xA0)) maybe_combine_byte = 1; toindex_byte += thislen_byte; toindex += thisleni; @@ -744,8 +744,8 @@ concat (nargs, args, target_type, last_special) { if (some_multibyte && toindex_byte > 0 - && XSTRING (val)->data[toindex_byte - 1] >= 0x80 - && XINT (elt) >= 0xA0) + && !ASCII_BYTE_P (XSTRING (val)->data[toindex_byte - 1]) + && !CHAR_HEAD_P (XINT (elt))) maybe_combine_byte = 1; XSTRING (val)->data[toindex_byte++] = XINT (elt); toindex++; -- 2.39.2