projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(complex_vars_of_mule_charset): Specify `Vcharset_ucs' as the mother
[chise/xemacs-chise.git-]
/
src
/
objects-tty.c
diff --git
a/src/objects-tty.c
b/src/objects-tty.c
index
b598c8d
..
ea76e6f
100644
(file)
--- 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 "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). */
#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))
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;
else
#endif
f->width = 1;