Mercurial > hg > xemacs-beta

comparison src/console-stream.c @ 5125:b5df3737028a ben-lisp-object

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