Mercurial > emacs
changeset 88370:533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
table structure.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 01 Mar 2002 01:25:51 +0000 |
| parents | 8f5d9817e9d3 |
| children | 6416d2c35321 |
| files | src/disptab.h |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 *));