X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fobjects-tty.c;h=a7dc78cd3c9a836a01a557a2a237f8babf6d5596;hb=667a2b3a2dbea07c3c228e17d986110cc6a33084;hp=45225ddae0460356fca4c9d49ccda96d039ceaed;hpb=9e7d97ff1c37067026d843162584e47792968e36;p=chise%2Fxemacs-chise.git

diff --git a/src/objects-tty.c b/src/objects-tty.c
index 45225dd..a7dc78c 100644
--- 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). */
@@ -247,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;