[Emacs-diffs] emacs/src character.h

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/11/27 07:59:35

Modified files:
        src            : character.h 

Log message:
        (MAYBE_UNIFY_CHAR): Call maybe_unify_char instead of
        Funify_charset.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/character.h?cvsroot=emacs&r1=1.12&r2=1.13

Patches:
Index: character.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/character.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- character.h 6 Sep 2008 09:57:15 -0000       1.12
+++ character.h 27 Nov 2008 07:59:35 -0000      1.13
@@ -575,25 +575,17 @@
    the unified Unicode character.  */
 
 #define MAYBE_UNIFY_CHAR(c)                                    \
-  if (c > MAX_UNICODE_CHAR                                     \
-      && CHAR_TABLE_P (Vchar_unify_table))                     \
+  do {                                                 \
+    if (c > MAX_UNICODE_CHAR && c <= MAX_5_BYTE_CHAR)  \
     {                                                          \
       Lisp_Object val;                                         \
-      int unified;                                             \
-                                                               \
-      val = CHAR_TABLE_REF (Vchar_unify_table, c);             \
-      if (! NILP (val))                                                \
-       {                                                       \
-         if (SYMBOLP (val))                                    \
-           {                                                   \
-             Funify_charset (val, Qnil, Qnil);                 \
              val = CHAR_TABLE_REF (Vchar_unify_table, c);      \
+       if (INTEGERP (val))                             \
+         c = XINT (val);                               \
+       else if (! NILP (val))                          \
+         c = maybe_unify_char (c, val);                \
            }                                                   \
-         if ((unified = XINT (val)) >= 0)                      \
-           c = unified;                                        \
-       }                                                       \
-    }                                                          \
-  else
+  } while (0)
 
 
 /* Return the width of ASCII character C.  The width is measured by