(CHAR_BYTES): If C has modifier bits, return 1.

diff --git a/src/charset.h b/src/charset.h
index 44955fa3ac4f2fb6bb6d876b212a8d00364a029a..710291a77fc62fe128b84227d6f3636c6ec40464 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -554,7 +554,8 @@ extern int iso_charset_table[2][2][128];
 #define BASE_LEADING_CODE_P(c) (BYTES_BY_CHAR_HEAD ((unsigned char) (c)) > 1)
 
 /* Return how many bytes C will occupy in a multibyte buffer.  */
-#define CHAR_BYTES(c) (SINGLE_BYTE_CHAR_P (c) ? 1 : char_bytes (c))
+#define CHAR_BYTES(c) \
+  ((SINGLE_BYTE_CHAR_P ((c)) || ((c) & ~GLYPH_MASK_CHAR)) ? 1 : char_bytes (c))
 
 /* The following two macros CHAR_STRING and STRING_CHAR are the main
    entry points to convert between Emacs two types of character