# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1014945951 0
# Node ID 533b26683ad8318f4fde52da6a4e7b3b72656e50
# Parent  8f5d9817e9d38ca4183afda0f7f41fd03cc8235f
(DISP_CHAR_VECTOR): Adjusted for the change of char
table structure.

diff -r 8f5d9817e9d3 -r 533b26683ad8 src/disptab.h
--- a/src/disptab.h	Fri Mar 01 01:25:27 2002 +0000
+++ b/src/disptab.h	Fri Mar 01 01:25:51 2002 +0000
@@ -35,8 +35,14 @@
 
 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] : disp_char_vector ((dp), (c)))
+#define DISP_CHAR_VECTOR(dp, c)				\
+  (ASCII_CHAR_P(c)					\
+   ? (NILP ((dp)->ascii)				\
+      ? (dp)->defalt					\
+      : (SUB_CHAR_TABLE_P ((dp)->ascii)			\
+	 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c]	\
+	 : (dp)->ascii))				\
+   : disp_char_vector ((dp), (c)))
 
 /* Defined in window.c.  */
 extern struct Lisp_Char_Table *window_display_table P_ ((struct window *));