From: Kenichi Handa <handa@m17n.org>
Date: Mon, 27 Dec 1999 05:04:23 +0000 (+0000)
Subject: (CHAR_BYTES): Use ((1 << CHARACTERBITS) - 1) instead
X-Git-Tag: emacs-pretest-21.0.90~5628
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07129d9eaf88a5b619fec5e44ef7d81cbcf99a01;p=emacs.git

(CHAR_BYTES): Use ((1 << CHARACTERBITS) - 1) instead
of GLYPH_MASK_CHAR.
---

diff --git a/src/charset.h b/src/charset.h
index c0b7e4d9eb4..6b2e25b89dd 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -489,8 +489,9 @@ 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)) || ((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