X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3046d6fcf7e4e64ed1528eb839edf04aae72b260..5bcf005469998ba44f13880e68c918bd7bc96053:/src/disptab.h

diff --git a/src/disptab.h b/src/disptab.h
index 6ee008453d..1fb6307a73 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define DISP_TABLE_P(obj)						    \
   (CHAR_TABLE_P (obj)							    \
-   && XCHAR_TABLE (obj)->purpose == Qdisplay_table			    \
+   && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table)			    \
    && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS)
 
 #define DISP_TABLE_EXTRA_SLOTS 6
@@ -33,14 +33,16 @@ Boston, MA 02111-1307, USA.  */
 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4])
 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5])
 
+extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int));
+
 #define DISP_CHAR_VECTOR(dp, c) \
-  (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : Qnil)
+  (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : disp_char_vector ((dp), (c)))
 
 /* Defined in window.c.  */
-extern struct Lisp_Char_Table *window_display_table ();
+extern struct Lisp_Char_Table *window_display_table P_ ((struct window *));
 
 /* Defined in indent.c.  */
-extern struct Lisp_Char_Table *buffer_display_table ();
+extern struct Lisp_Char_Table *buffer_display_table P_ ((void));
 
 /* Display table to use for vectors that don't specify their own.  */
 extern Lisp_Object Vstandard_display_table;
@@ -77,10 +79,14 @@ extern Lisp_Object Vglyph_table;
 
 /* 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));
-  
+#define GLYPH_FOLLOW_ALIASES(base, length, g)		\
+  do {							\
+    while (GLYPH_ALIAS_P ((base), (length), (g)))	\
+      (g) = GLYPH_ALIAS ((base), (g));			\
+    if (!GLYPH_CHAR_VALID_P (FAST_GLYPH_CHAR (g)))	\
+      g = FAST_MAKE_GLYPH (' ', FAST_GLYPH_FACE (g));	\
+  } while (0)
+
 /* 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.  */
@@ -93,8 +99,3 @@ extern Lisp_Object Vglyph_table;
 #define NULL_GLYPH 00
 
 #define GLYPH_FROM_CHAR(c) (c)
-
-extern int glyphlen ();
-extern void str_to_glyph_cpy ();
-extern void str_to_glyph_ncpy ();
-extern void glyph_to_str_cpy ();