X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fobjects-tty.c;h=a7dc78cd3c9a836a01a557a2a237f8babf6d5596;hb=313d1c4d8bd1f94564e5edda76ee6aac3ecb70fd;hp=7e02318c32c27cac12248057c376ee2ce82b5c01;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git- diff --git a/src/objects-tty.c b/src/objects-tty.c index 7e02318..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). */ @@ -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;