Mercurial > hg > xemacs-beta
diff src/console-stream.c @ 4959:bd169a24a554
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 28 Jan 2010 04:27:30 -0600 |
| parents | 19a72041c5ed |
| children | 16112448d484 |
line wrap: on
line diff
--- a/src/console-stream.c Thu Jan 28 04:02:14 2010 -0600 +++ b/src/console-stream.c Thu Jan 28 04:27:30 2010 -0600 @@ -194,7 +194,7 @@ invalid_operation ("Only one frame allowed on stream devices", Qunbound); #endif if (frame_name_is_defaulted) - f->name = build_string ("stream"); + f->name = build_ascstring ("stream"); f->height = 80; f->width = 24; f->visible = 0; /* so redisplay doesn't try to do anything */ @@ -202,7 +202,7 @@ static int -stream_text_width (struct frame *UNUSED (f), +stream_text_width (struct window *UNUSED (w), struct face_cachel *UNUSED (cachel), const Ichar *UNUSED (str), Charcount len) { @@ -374,7 +374,7 @@ Vterminal_frame = Qnil; /* Moved from console-tty.c */ - Vstdio_str = build_string ("stdio"); + Vstdio_str = build_ascstring ("stdio"); staticpro (&Vstdio_str); }
