(MAX_CHAR_COMPOSITION): Defined as (GLYPH_MASK_CHAR -

1), one less than the previous value.
(GENERIC_COMPOSITION_CHAR): New macro.

diff --git a/src/charset.h b/src/charset.h
index a3989d9623b3915f13b6d4313c41e99e26b27a6e..34540c3d20150252cab44f96b0340847da0e9f56 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -244,7 +244,10 @@ extern int charset_big5_2; /* Big5 Level 2 (Chinese Traditional) */
   ((MIN_CHARSET_PRIVATE_DIMENSION2 - 0xE0) << 14)
 #define MIN_CHAR_COMPOSITION \
   (0x1F << 14)
-#define MAX_CHAR_COMPOSITION GLYPH_MASK_CHAR
+#define MAX_CHAR_COMPOSITION (GLYPH_MASK_CHAR - 1)
+
+/* A generic character for composition characters.  */
+#define GENERIC_COMPOSITION_CHAR (GLYPH_MASK_CHAR)
 
 /* 1 if C is an ASCII character, else 0.  */
 #define SINGLE_BYTE_CHAR_P(c) ((c) < 0x100)