projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
console-tty.c
diff --git
a/src/console-tty.c
b/src/console-tty.c
index
f4196b8
..
c57c0f7
100644
(file)
--- a/
src/console-tty.c
+++ b/
src/console-tty.c
@@
-32,7
+32,7
@@
Boston, MA 02111-1307, USA. */
#include "faces.h"
#include "frame.h"
#include "lstream.h"
#include "faces.h"
#include "frame.h"
#include "lstream.h"
-#include "redisplay.h"
+#include "glyphs.h"
#include "sysdep.h"
#include "sysfile.h"
#ifdef FILE_CODING
#include "sysdep.h"
#include "sysfile.h"
#ifdef FILE_CODING
@@
-43,6
+43,10
@@
Boston, MA 02111-1307, USA. */
#endif
DEFINE_CONSOLE_TYPE (tty);
#endif
DEFINE_CONSOLE_TYPE (tty);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (string);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (formatted_string);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (inherit);
Lisp_Object Qterminal_type;
Lisp_Object Qcontrolling_process;
Lisp_Object Qterminal_type;
Lisp_Object Qcontrolling_process;
@@
-165,9
+169,9
@@
static void
tty_mark_console (struct console *con, void (*markobj) (Lisp_Object))
{
struct tty_console *tty_con = CONSOLE_TTY_DATA (con);
tty_mark_console (struct console *con, void (*markobj) (Lisp_Object))
{
struct tty_console *tty_con = CONSOLE_TTY_DATA (con);
- ((markobj) (tty_con->terminal_type));
- ((markobj) (tty_con->instream));
- ((markobj) (tty_con->outstream));
+ markobj (tty_con->terminal_type);
+ markobj (tty_con->instream);
+ markobj (tty_con->outstream);
}
static int
}
static int
@@
-234,7
+238,7
@@
Return the controlling process of tty console CONSOLE.
return CONSOLE_TTY_DATA (decode_tty_console (console))->controlling_process;
}
return CONSOLE_TTY_DATA (decode_tty_console (console))->controlling_process;
}
-#ifdef MULE
+#ifdef FILE_CODING
\f
DEFUN ("console-tty-input-coding-system", Fconsole_tty_input_coding_system,
0, 1, 0, /*
\f
DEFUN ("console-tty-input-coding-system", Fconsole_tty_input_coding_system,
0, 1, 0, /*
@@
-299,7
+303,7
@@
output coding systems of CONSOLE.
Fset_console_tty_output_coding_system (console, codesys);
return Qnil;
}
Fset_console_tty_output_coding_system (console, codesys);
return Qnil;
}
-#endif /* MULE */
+#endif /* FILE_CODING */
\f
Lisp_Object
\f
Lisp_Object
@@
-342,13
+346,13
@@
syms_of_console_tty (void)
DEFSUBR (Fconsole_tty_controlling_process);
defsymbol (&Qterminal_type, "terminal-type");
defsymbol (&Qcontrolling_process, "controlling-process");
DEFSUBR (Fconsole_tty_controlling_process);
defsymbol (&Qterminal_type, "terminal-type");
defsymbol (&Qcontrolling_process, "controlling-process");
-#ifdef MULE
+#ifdef FILE_CODING
DEFSUBR (Fconsole_tty_output_coding_system);
DEFSUBR (Fset_console_tty_output_coding_system);
DEFSUBR (Fconsole_tty_input_coding_system);
DEFSUBR (Fset_console_tty_input_coding_system);
DEFSUBR (Fset_console_tty_coding_system);
DEFSUBR (Fconsole_tty_output_coding_system);
DEFSUBR (Fset_console_tty_output_coding_system);
DEFSUBR (Fconsole_tty_input_coding_system);
DEFSUBR (Fset_console_tty_input_coding_system);
DEFSUBR (Fset_console_tty_coding_system);
-#endif /* MULE */
+#endif /* FILE_CODING */
}
void
}
void
@@
-368,6
+372,15
@@
console_type_create_tty (void)
}
void
}
void
+image_instantiator_format_create_glyphs_tty (void)
+{
+ IIFORMAT_VALID_CONSOLE (tty, nothing);
+ IIFORMAT_VALID_CONSOLE (tty, string);
+ IIFORMAT_VALID_CONSOLE (tty, formatted_string);
+ IIFORMAT_VALID_CONSOLE (tty, inherit);
+}
+
+void
vars_of_console_tty (void)
{
Fprovide (Qtty);
vars_of_console_tty (void)
{
Fprovide (Qtty);