comparison src/disptab.h @ 91375:4bb19b57806d

Merge unicode branch Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1037
author Miles Bader <miles@gnu.org>
date Fri, 01 Feb 2008 16:01:31 +0000
parents 606f2d163a64
children d86b04f18152
comparison
equal deleted inserted replaced
88119:70ca9e418f5d 91375:4bb19b57806d
34 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) 34 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4])
35 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) 35 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5])
36 36
37 extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int)); 37 extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int));
38 38
39 #define DISP_CHAR_VECTOR(dp, c) \ 39 #define DISP_CHAR_VECTOR(dp, c) \
40 (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : disp_char_vector ((dp), (c))) 40 (ASCII_CHAR_P(c) \
41 ? (NILP ((dp)->ascii) \
42 ? (dp)->defalt \
43 : (SUB_CHAR_TABLE_P ((dp)->ascii) \
44 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c] \
45 : (dp)->ascii)) \
46 : disp_char_vector ((dp), (c)))
41 47
42 /* Defined in window.c. */ 48 /* Defined in window.c. */
43 extern struct Lisp_Char_Table *window_display_table P_ ((struct window *)); 49 extern struct Lisp_Char_Table *window_display_table P_ ((struct window *));
44 50
45 /* Defined in indent.c. */ 51 /* Defined in indent.c. */