projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with r21-2-26.
[chise/xemacs-chise.git-]
/
src
/
objects-tty.c
diff --git
a/src/objects-tty.c
b/src/objects-tty.c
index
909542e
..
376b6bf
100644
(file)
--- a/
src/objects-tty.c
+++ b/
src/objects-tty.c
@@
-168,10
+168,9
@@
tty_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
}
static void
}
static void
-tty_mark_color_instance (struct Lisp_Color_Instance *c,
- void (*markobj) (Lisp_Object))
+tty_mark_color_instance (struct Lisp_Color_Instance *c)
{
{
- markobj (COLOR_INSTANCE_TTY_SYMBOL (c));
+ mark_object (COLOR_INSTANCE_TTY_SYMBOL (c));
}
static void
}
static void
@@
-243,7
+242,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;
@@
-256,10
+255,9
@@
tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
}
static void
}
static void
-tty_mark_font_instance (struct Lisp_Font_Instance *f,
- void (*markobj) (Lisp_Object))
+tty_mark_font_instance (struct Lisp_Font_Instance *f)
{
{
- markobj (FONT_INSTANCE_TTY_CHARSET (f));
+ mark_object (FONT_INSTANCE_TTY_CHARSET (f));
}
static void
}
static void