X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Finsdel.c;h=b54678ad731c0dc021e46e294b56250456316dad;hb=72321376c53ccddd182d9e94fafd1ae1e6f98921;hp=9da59ca2a1263d53510102baa2791716acc44b3f;hpb=a51355e1841ebba898cf97676554b5636afe1ccc;p=chise%2Fxemacs-chise.git

diff --git a/src/insdel.c b/src/insdel.c
index 9da59ca..b54678a 100644
--- 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
 }
@@ -3154,7 +3165,7 @@ bufbyte_string_displayed_columns (CONST Bufbyte *str, Bytecount len)
     {
 #ifdef MULE
       Emchar ch = charptr_emchar (str);
-      cols += XCHARSET_COLUMNS (CHAR_CHARSET (ch));
+      cols += CHAR_COLUMNS (ch);
 #else
       cols++;
 #endif
@@ -3172,7 +3183,7 @@ emchar_string_displayed_columns (CONST Emchar *str, Charcount len)
   int i;
 
   for (i = 0; i < len; i++)
-    cols += XCHARSET_COLUMNS (CHAR_CHARSET (str[i]));
+    cols += CHAR_COLUMNS (str[i]);
 
   return cols;
 #else  /* not MULE */