Mercurial > emacs

diff src/disptab.h @ 91375:4bb19b57806d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/disptab.h	Fri Feb 01 14:44:44 2008 +0000
+++ b/src/disptab.h	Fri Feb 01 16:01:31 2008 +0000
@@ -36,8 +36,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 *));