X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fobjects-tty.c;h=ea76e6f3c44379c31c1df996028c0a201e6bd1e8;hb=45d296a62e0a0adaa3a90801f2601bb20e06e993;hp=b598c8d35f0e74887e3017eb54a75974fd38704f;hpb=3e447015251ce6dcde843cbed10d9033d5538622;p=chise%2Fxemacs-chise.git.1 diff --git a/src/objects-tty.c b/src/objects-tty.c index b598c8d..ea76e6f 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). */ @@ -242,7 +242,7 @@ tty_initialize_font_instance (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;