(VALBITS, GCTYPEBITS): Deleted; default is better.

[bpt/emacs.git] / src / disptab.h

diff --git a/src/disptab.h b/src/disptab.h
index 37f4bc7..649b58c 100644 (file)
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,5 +1,5 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,16 +19,21 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Access the slots of a display-table, according to their purpose.  */
 
-#define DISP_TABLE_SIZE 261
+#define DISP_TABLE_SIZE 262
 #define DISP_TRUNC_GLYPH(dp) ((dp)->contents[256])
 #define DISP_CONTINUE_GLYPH(dp) ((dp)->contents[257])
 #define DISP_ESCAPE_GLYPH(dp) ((dp)->contents[258])
 #define DISP_CTRL_GLYPH(dp) ((dp)->contents[259])
 #define DISP_INVIS_VECTOR(dp) ((dp)->contents[260])
+#define DISP_BORDER_GLYPH(dp) ((dp)->contents[261])
 #define DISP_CHAR_VECTOR(dp, c) ((dp)->contents[c])
 
+/* Defined in window.c.  */
 extern struct Lisp_Vector *window_display_table ();
 
+/* Defined in indent.c.  */
+extern struct Lisp_Vector *buffer_display_table ();
+
 /* Display table to use for vectors that don't specify their own.  */
 extern Lisp_Object Vstandard_display_table;
 
@@ -39,30 +44,32 @@ extern Lisp_Object Vglyph_table;
 /* Return the current length of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_LENGTH  \
-  ((XTYPE (Vglyph_table) == Lisp_Vector) \
-   ? XVECTOR (Vglyph_table)->size : 0)
+  ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0)
 
 /* Return the current base (for indexing) of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_BASE  \
-  ((XTYPE (Vglyph_table) == Lisp_Vector) \
-   ? XVECTOR (Vglyph_table)->contents : 0)
+  ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0)
 
 /* Given BASE and LEN returned by the two previous macros,
    return nonzero if the GLYPH code G should be output as a single
    character with code G.  Return zero if G has a string in the table.  */
-#define GLYPH_SIMPLE_P(base,len,g)  \
-  ((g) >= (len) || XTYPE (base[g]) != Lisp_String)
+#define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g]))
 
 /* Given BASE and LEN returned by the two previous macros,
    return nonzero if GLYPH code G is aliased to a different code.  */
-#define GLYPH_ALIAS_P(base,len,g)  \
-  ((g) < (len) && XTYPE (base[g]) == Lisp_Int)
+#define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g]))
 
 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1,
    return the alias for G.  */
 #define GLYPH_ALIAS(base, g) XINT (base[g])
 
+/* Follow all aliases for G in the glyph table given by (BASE,
+   LENGTH), and set G to the final glyph.  */
+#define GLYPH_FOLLOW_ALIASES(base, length, g)                          \
+  while (GLYPH_ALIAS_P ((base), (length), (g)))                                \
+    (g) = GLYPH_ALIAS ((base), (g));
+  
 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0,
    return the length and the address of the character-sequence
    used for outputting GLYPH G.  */