(concat): Replace explicit numeric constants with proper macros.

diff --git a/src/fns.c b/src/fns.c
index 286891add6ff5228774bfa803158783b354ac66a..e34d06748e61eacda7b2d45270236563bc807ebc 100644 (file)
--- 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++;