Mercurial > hg > xemacs-beta

comparison src/console-stream.c @ 4990:8f0cf4fd3d2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Sat, 06 Feb 2010 04:01:46 -0600
parents 16112448d484
children 5502045ec510 b5df3737028a
comparison
equal deleted inserted replaced
4989:d2ec55325515 4990:8f0cf4fd3d2c
136 } 136 }
137 if (stream_con->in != stdin) 137 if (stream_con->in != stdin)
138 retry_fclose (stream_con->in); 138 retry_fclose (stream_con->in);
139 139
140 #ifndef NEW_GC 140 #ifndef NEW_GC
141 xfree (stream_con, struct stream_console *); 141 xfree (stream_con);
142 #endif /* not NEW_GC */ 142 #endif /* not NEW_GC */
143 CONSOLE_STREAM_DATA (con) = NULL; 143 CONSOLE_STREAM_DATA (con) = NULL;
144 } 144 }
145 } 145 }
146 146
192 struct device *d = XDEVICE (FRAME_DEVICE (f)); 192 struct device *d = XDEVICE (FRAME_DEVICE (f));
193 if (!NILP (DEVICE_FRAME_LIST (d))) 193 if (!NILP (DEVICE_FRAME_LIST (d)))
194 invalid_operation ("Only one frame allowed on stream devices", Qunbound); 194 invalid_operation ("Only one frame allowed on stream devices", Qunbound);
195 #endif 195 #endif
196 if (frame_name_is_defaulted) 196 if (frame_name_is_defaulted)
197 f->name = build_string ("stream"); 197 f->name = build_ascstring ("stream");
198 f->height = 80; 198 f->height = 80;
199 f->width = 24; 199 f->width = 24;
200 f->visible = 0; /* so redisplay doesn't try to do anything */ 200 f->visible = 0; /* so redisplay doesn't try to do anything */
201 } 201 }
202 202
203 203
204 static int 204 static int
205 stream_text_width (struct frame *UNUSED (f), 205 stream_text_width (struct window *UNUSED (w),
206 struct face_cachel *UNUSED (cachel), 206 struct face_cachel *UNUSED (cachel),
207 const Ichar *UNUSED (str), Charcount len) 207 const Ichar *UNUSED (str), Charcount len)
208 { 208 {
209 return len; 209 return len;
210 } 210 }
372 The initial frame object, which represents XEmacs' stdout. 372 The initial frame object, which represents XEmacs' stdout.
373 */ ); 373 */ );
374 Vterminal_frame = Qnil; 374 Vterminal_frame = Qnil;
375 375
376 /* Moved from console-tty.c */ 376 /* Moved from console-tty.c */
377 Vstdio_str = build_string ("stdio"); 377 Vstdio_str = build_ascstring ("stdio");
378 staticpro (&Vstdio_str); 378 staticpro (&Vstdio_str);
379 } 379 }
380 380
381 #ifndef PDUMP 381 #ifndef PDUMP
382 void 382 void