Sync with r21-2-44-utf-2000-m0_18-jc3-8.

[chise/xemacs-chise.git-] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 7684d0b..2fffa70 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -2,7 +2,6 @@
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2002 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -28,7 +27,6 @@ Boston, MA 02111-1307, USA.  */
    FSF: long ago.
    JWZ: separated out bufslots.h, early in Lemacs.
    Ben Wing: almost completely rewritten for Mule, 19.12.
-   MORIOKA Tomohiko: modified for UTF-2000.
  */
 
 #ifndef INCLUDED_buffer_h_
@@ -1380,43 +1378,14 @@ INLINE_HEADER Emchar
 TRT_TABLE_CHAR_1 (Lisp_Object table, Emchar ch)
 {
   Lisp_Object TRT_char;
-#ifdef UTF2000
-  if (CHAR_TABLEP (table))
-    TRT_char = get_char_table (ch, XCHAR_TABLE (table));
-  else
-    {
-      TRT_char = Fget_char_attribute (make_char (ch), table, Qnil);
-      if (CONSP (TRT_char))
-       {
-         TRT_char = XCAR (TRT_char);
-         if (CONSP (TRT_char))
-           TRT_char = Ffind_char (TRT_char);
-       }
-    }
-#else
-    TRT_char = get_char_table (ch, XCHAR_TABLE (table));
-#endif
+  TRT_char = get_char_table (ch, XCHAR_TABLE (table));
   if (NILP (TRT_char))
     return ch;
   else
     return XCHAR (TRT_char);
 }
-#ifdef UTF2000
-INLINE_HEADER Lisp_Object
-SET_TRT_TABLE_CHAR_1 (Lisp_Object table, Emchar ch1, Emchar ch2);
-INLINE_HEADER Lisp_Object
-SET_TRT_TABLE_CHAR_1 (Lisp_Object table, Emchar ch1, Emchar ch2)
-{
-  if (CHAR_TABLEP (table))
-    return Fput_char_table (make_char (ch1), make_char (ch2), table);
-  else
-    return Fput_char_attribute (make_char (ch1), table,
-                               list1 (make_char (ch2)));
-}
-#else
 #define SET_TRT_TABLE_CHAR_1(table, ch1, ch2)  \
   Fput_char_table (make_char (ch1), make_char (ch2), table);
-#endif
 
 INLINE_HEADER Emchar TRT_TABLE_OF (Lisp_Object trt, Emchar c);
 INLINE_HEADER Emchar