# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 964526769 0
# Node ID e60d22cf57b4b8315b79ba8693299d2c0c671cd1
# Parent  e3fe041c4e252bead4e9d2a59fab32acabc4f9b8
(GLYPH_MASK_CHAR, GLYPH_MASK_FACE): Use 19 bits
for the character code, and the rest for the face id.
(FAST_GLYPH_FACE, FAST_MAKE_GLYPH): Changed accordingly.

diff -r e3fe041c4e25 -r e60d22cf57b4 src/lisp.h
--- a/src/lisp.h	Tue Jul 25 12:05:45 2000 +0000
+++ b/src/lisp.h	Tue Jul 25 12:06:09 2000 +0000
@@ -1182,20 +1182,20 @@
 #define GLYPH int
 
 /* Mask bits for face.  */
-#define GLYPH_MASK_FACE    0x7FFFFF00
+#define GLYPH_MASK_FACE    0x7FF80000
  /* Mask bits for character code.  */
-#define GLYPH_MASK_CHAR    0x000000FF /* The lowest 8 bits */
+#define GLYPH_MASK_CHAR    0x0007FFFF /* The lowest 19 bits */
 
 /* The FAST macros assume that we already know we're in an X window.  */
 
 /* Set a character code and a face ID in a glyph G.  */
-#define FAST_MAKE_GLYPH(char, face) ((char) | ((face) << 8))
+#define FAST_MAKE_GLYPH(char, face) ((char) | ((face) << CHARACTERBITS))
 
 /* Return a glyph's character code.  */
 #define FAST_GLYPH_CHAR(glyph) ((glyph) & GLYPH_MASK_CHAR)
 
 /* Return a glyph's face ID.  */
-#define FAST_GLYPH_FACE(glyph) (((glyph) & GLYPH_MASK_FACE) >> 8)
+#define FAST_GLYPH_FACE(glyph) (((glyph) & GLYPH_MASK_FACE) >> CHARACTERBITS)
 
 /* Slower versions that test the frame type first.  */
 #define MAKE_GLYPH(f, char, face) (FAST_MAKE_GLYPH (char, face))