X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fobjects-tty.c;h=a7dc78cd3c9a836a01a557a2a237f8babf6d5596;hb=079de2b7d3d365f90c1f46a6f1a089511ae24cac;hp=513349d4c1d194fdf508db30eca26b5f65163f58;hpb=2e3e3f9ee27fec50f45c282d71eaddf7c673bc56;p=chise%2Fxemacs-chise.git

diff --git a/src/objects-tty.c b/src/objects-tty.c
index 513349d..a7dc78c 100644
--- a/src/objects-tty.c
+++ b/src/objects-tty.c
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #include "objects-tty.h"
 #ifdef MULE
 #include "device.h"
-#include "mule-charset.h"
+#include "character.h"
 #endif
 
 /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
@@ -171,7 +171,7 @@ static void
 tty_mark_color_instance (struct Lisp_Color_Instance *c,
 			 void (*markobj) (Lisp_Object))
 {
-  ((markobj) (COLOR_INSTANCE_TTY_SYMBOL (c)));
+  markobj (COLOR_INSTANCE_TTY_SYMBOL (c));
 }
 
 static void
@@ -243,7 +243,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;
@@ -259,7 +259,7 @@ static void
 tty_mark_font_instance (struct Lisp_Font_Instance *f,
 			void (*markobj) (Lisp_Object))
 {
-  ((markobj) (FONT_INSTANCE_TTY_CHARSET (f)));
+  markobj (FONT_INSTANCE_TTY_CHARSET (f));
 }
 
 static void