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-stream.c
diff --git
a/src/console-stream.c
b/src/console-stream.c
index
33daa91
..
5e099b2
100644
(file)
--- a/
src/console-stream.c
+++ b/
src/console-stream.c
@@
-69,7
+69,9
@@
stream_init_console (struct console *con, Lisp_Object params)
{
CHECK_STRING (tty);
stream_con->in = stream_con->out = stream_con->err =
{
CHECK_STRING (tty);
stream_con->in = stream_con->out = stream_con->err =
- fopen ((char *) XSTRING_DATA (tty), "r+");
+ /* #### We don't currently do coding-system translation on
+ this descriptor. */
+ fopen ((char *) XSTRING_DATA (tty), READ_PLUS_TEXT);
if (!stream_con->in)
error ("Unable to open tty %s", XSTRING_DATA (tty));
}
if (!stream_con->in)
error ("Unable to open tty %s", XSTRING_DATA (tty));
}
@@
-171,7
+173,7
@@
stream_init_frame_1 (struct frame *f, Lisp_Object props)
\f
static int
stream_text_width (struct frame *f, struct face_cachel *cachel,
\f
static int
stream_text_width (struct frame *f, struct face_cachel *cachel,
- const Emchar *str, Charcount len)
+ const Charc *str, Charcount len)
{
return len;
}
{
return len;
}
@@
-277,17
+279,17
@@
void
vars_of_console_stream (void)
{
DEFVAR_LISP ("terminal-console", &Vterminal_console /*
vars_of_console_stream (void)
{
DEFVAR_LISP ("terminal-console", &Vterminal_console /*
-The initial console-object, which represents XEmacs' stdout.
+The initial console object, which represents XEmacs' stdout.
*/ );
Vterminal_console = Qnil;
DEFVAR_LISP ("terminal-device", &Vterminal_device /*
*/ );
Vterminal_console = Qnil;
DEFVAR_LISP ("terminal-device", &Vterminal_device /*
-The initial device-object, which represents XEmacs' stdout.
+The initial device object, which represents XEmacs' stdout.
*/ );
Vterminal_device = Qnil;
DEFVAR_LISP ("terminal-frame", &Vterminal_frame /*
*/ );
Vterminal_device = Qnil;
DEFVAR_LISP ("terminal-frame", &Vterminal_frame /*
-The initial frame-object, which represents XEmacs' stdout.
+The initial frame object, which represents XEmacs' stdout.
*/ );
Vterminal_frame = Qnil;
*/ );
Vterminal_frame = Qnil;