#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). */
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
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;
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