X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-stream.c;h=5e099b2e897c6a42a9649b146074e04c4295064c;hb=7547744ec10a5cf621667f72330940372f0b6532;hp=33daa914e155e68c067f81deaecac25e1512eeec;hpb=76759ab036458c54499a454399e19602b8ae6ce3;p=chise%2Fxemacs-chise.git.1

diff --git a/src/console-stream.c b/src/console-stream.c
index 33daa91..5e099b2 100644
--- 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 =
-	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));
     }
@@ -171,7 +173,7 @@ stream_init_frame_1 (struct frame *f, Lisp_Object props)
 
 static int
 stream_text_width (struct frame *f, struct face_cachel *cachel,
-		   const Emchar *str, Charcount len)
+		   const Charc *str, Charcount len)
 {
   return len;
 }
@@ -277,17 +279,17 @@ void
 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 /*
-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 /*
-The initial frame-object, which represents XEmacs' stdout.
+The initial frame object, which represents XEmacs' stdout.
 */ );
   Vterminal_frame = Qnil;