# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1023840773 0
# Node ID 55e36a0cf0ee6ad2852b3c68e837cc34952a7984
# Parent  a93a8b796b91f07c632198cac2b3292c91445ff9
(MAYBE_UNIFY_CHAR): Adjusted for the change of
Vchar_unify_table.  The default value of the table is now nil.

diff -r a93a8b796b91 -r 55e36a0cf0ee src/character.h
--- a/src/character.h	Wed Jun 12 00:12:34 2002 +0000
+++ b/src/character.h	Wed Jun 12 00:12:53 2002 +0000
@@ -448,23 +448,27 @@
   } while (0)
 
 
-#define MAYBE_UNIFY_CHAR(c)				\
-  if (CHAR_TABLE_P (Vchar_unify_table))			\
-    {							\
-      Lisp_Object val;					\
-      int unified;					\
-							\
-      val = CHAR_TABLE_REF (Vchar_unify_table, c);	\
-      if (SYMBOLP (val))				\
-	{						\
-	  Funify_charset (val, Qnil);			\
-	  val = CHAR_TABLE_REF (Vchar_unify_table, c);	\
-	}						\
-      if ((unified = XINT (val)) >= 0)			\
-	c = unified;					\
-    }							\
+#define MAYBE_UNIFY_CHAR(c)					\
+  if (CHAR_TABLE_P (Vchar_unify_table))				\
+    {								\
+      Lisp_Object val;						\
+      int unified;						\
+								\
+      val = CHAR_TABLE_REF (Vchar_unify_table, c);		\
+      if (! NILP (val))						\
+	{							\
+	  if (SYMBOLP (val))					\
+	    {							\
+	      Funify_charset (val, Qnil);			\
+	      val = CHAR_TABLE_REF (Vchar_unify_table, c);	\
+	    }							\
+	  if ((unified = XINT (val)) >= 0)			\
+	    c = unified;					\
+	}							\
+    }								\
   else
 
+
 /* Return the width of ASCII character C.  The width is measured by
    how many columns occupied on the screen when displayed in the
    current buffer.  */