(byte_char_debug_check): Call multibyte_chars_in_text

instead of chars_in_text because we must ignore
enable-multibyte-characters here.

diff --git a/src/marker.c b/src/marker.c
index dcdadd705add7465f022850744f8ed4a286fe441..86951edd2f302be77329a9f8dadc36ef0a442279 100644 (file)
--- a/src/marker.c
+++ b/src/marker.c
@@ -105,13 +105,14 @@ byte_char_debug_check (b, charpos, bytepos)
 
   if (bytepos > BUF_GPT_BYTE (b))
     {
-      nchars = chars_in_text (BUF_BEG_ADDR (b),
-                             BUF_GPT_BYTE (b) - BUF_BEG_BYTE (b));
-      nchars += chars_in_text (BUF_GAP_END_ADDR (b),
-                              bytepos - BUF_GPT_BYTE (b));
+      nchars = multibyte_chars_in_text (BUF_BEG_ADDR (b),
+                                       BUF_GPT_BYTE (b) - BUF_BEG_BYTE (b));
+      nchars += multibyte_chars_in_text (BUF_GAP_END_ADDR (b),
+                                        bytepos - BUF_GPT_BYTE (b));
     }
   else
-    nchars = chars_in_text (BUF_BEG_ADDR (b), bytepos - BUF_BEG_BYTE (b));
+    nchars = multibyte_chars_in_text (BUF_BEG_ADDR (b),
+                                     bytepos - BUF_BEG_BYTE (b));
 
   if (charpos - 1 != nchars)
     abort ();