# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 946271063 0
# Node ID 85c7cda1975f182e10093e73953ea58be053de19
# Parent  be19384265750691fb8648f4d8746f2c2bf4a33c
(CHAR_BYTES): Use ((1 << CHARACTERBITS) - 1) instead
of GLYPH_MASK_CHAR.

diff -r be1938426575 -r 85c7cda1975f src/charset.h
--- a/src/charset.h	Mon Dec 27 05:03:46 1999 +0000
+++ b/src/charset.h	Mon Dec 27 05:04:23 1999 +0000
@@ -489,8 +489,9 @@
 #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)) || ((c) & ~GLYPH_MASK_CHAR)) ? 1 : char_bytes (c))
+#define CHAR_BYTES(c)							\
+  ((SINGLE_BYTE_CHAR_P ((c)) || ((c) & ~((1 << CHARACTERBITS) - 1)))	\
+   ? 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