Sync with r21-2-26.

[chise/xemacs-chise.git-] / src / objects-tty.c

diff --git a/src/objects-tty.c b/src/objects-tty.c
index 45225dd..376b6bf 100644 (file)
--- a/src/objects-tty.c
+++ b/src/objects-tty.c
@@ -29,11 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #include "objects-tty.h"
 #ifdef MULE
 #include "device.h"
-#ifdef CHAR_IS_UCS4
 #include "character.h"
-#else
-#include "mule-charset.h"
-#endif
 #endif
 
 /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
@@ -172,10 +168,9 @@ tty_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
 }
 
 static void
-tty_mark_color_instance (struct Lisp_Color_Instance *c,
-                        void (*markobj) (Lisp_Object))
+tty_mark_color_instance (struct Lisp_Color_Instance *c)
 {
-  markobj (COLOR_INSTANCE_TTY_SYMBOL (c));
+  mark_object (COLOR_INSTANCE_TTY_SYMBOL (c));
 }
 
 static void
@@ -247,7 +242,7 @@ tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
   FONT_INSTANCE_TTY_CHARSET (f) = charset;
 #ifdef MULE
   if (CHARSETP (charset))
-    f->width = XCHARSET_COLUMNS (charset);
+    f->width = CHARSET_COLUMNS (XCHARSET (charset));
   else
 #endif
     f->width = 1;
@@ -260,10 +255,9 @@ tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
 }
 
 static void
-tty_mark_font_instance (struct Lisp_Font_Instance *f,
-                       void (*markobj) (Lisp_Object))
+tty_mark_font_instance (struct Lisp_Font_Instance *f)
 {
-  markobj (FONT_INSTANCE_TTY_CHARSET (f));
+  mark_object (FONT_INSTANCE_TTY_CHARSET (f));
 }
 
 static void