X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fobjects-tty.c;h=376b6bf1d4fc7c4f71bf789874d6d4ecc6fdc983;hb=82da33b61c3e2dd2937db17b75b2838188793053;hp=909542e452d00c647a9bd6f9c4b11583589d74af;hpb=f64b6b450c25bc91059807ccce1121464a15d89a;p=chise%2Fxemacs-chise.git-

diff --git a/src/objects-tty.c b/src/objects-tty.c
index 909542e..376b6bf 100644
--- a/src/objects-tty.c
+++ b/src/objects-tty.c
@@ -168,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
@@ -243,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;
@@ -256,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