projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(char_byte_table): Change name from "char-code-table" to
[chise/xemacs-chise.git]
/
src
/
objects-tty.c
diff --git
a/src/objects-tty.c
b/src/objects-tty.c
index
513349d
..
a7dc78c
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). */
@@
-171,7
+171,7
@@
static void
tty_mark_color_instance (struct Lisp_Color_Instance *c,
void (*markobj) (Lisp_Object))
{
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
}
static void
@@
-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))
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;
@@
-259,7
+259,7
@@
static void
tty_mark_font_instance (struct Lisp_Font_Instance *f,
void (*markobj) (Lisp_Object))
{
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
}
static void