(find_charsets_in_bufbyte_string): Use `CHAR_CHARSET_ID' instead of

`CHAR_LEADING_BYTE' in UTF-2000.
(find_charsets_in_emchar_string): Likewise.

diff --git a/src/insdel.c b/src/insdel.c
index 95e59dc..b54678a 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -3119,8 +3119,14 @@ find_charsets_in_bufbyte_string (Charset_ID *charsets, CONST Bufbyte *str,
 
   while (str < strend)
     {
+#ifdef UTF2000
+      charsets[CHAR_CHARSET_ID (charptr_emchar (str))
+             - MIN_LEADING_BYTE] = 1;
+#else /* I'm not sure the definition for UTF2000 works with leading-byte
+        representation. */
       charsets[CHAR_LEADING_BYTE (charptr_emchar (str))
              - MIN_LEADING_BYTE] = 1;
+#endif
       INC_CHARPTR (str);
     }
 #endif
@@ -3139,7 +3145,12 @@ find_charsets_in_emchar_string (Charset_ID *charsets, CONST Emchar *str,
   memset (charsets, 0, NUM_LEADING_BYTES * sizeof(Charset_ID));
   for (i = 0; i < len; i++)
     {
+#ifdef UTF2000
+      charsets[CHAR_CHARSET_ID (str[i]) - MIN_LEADING_BYTE] = 1;
+#else /* I'm not sure the definition for UTF2000 works with leading-byte
+        representation. */
       charsets[CHAR_LEADING_BYTE (str[i]) - MIN_LEADING_BYTE] = 1;
+#endif
     }
 #endif
 }