comparison src/xfns.c @ 83016:1d7467694692

Fix initialization of the window-system variable. lisp/faces.el (x-create-frame-with-faces) (tty-create-frame-with-faces): Don't set the window-system parameter here, it seems to be unreliable. lisp/frame.el (make-frame): Don't forget to return the new frame (d'oh). src/frame.c (Qwindow_system): New symbol. (syms_of_frame): Intern it. (Fmake_terminal_frame): Initialize window-system frame parameter. src/frame.h (Qwindow_system): New declaration. src/xfns.c (Fx_create_frame, x_create_tip_frame): Initialize window-system frame parameter. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-56
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 12 Jan 2004 00:45:42 +0000
parents f5cadabb36dd
children 03a73693678e
comparison
equal deleted inserted replaced
83015:ae6d0d2ecb1d 83016:1d7467694692
3332 f->explicit_name = 1; 3332 f->explicit_name = 1;
3333 /* use the frame's title when getting resources for this frame. */ 3333 /* use the frame's title when getting resources for this frame. */
3334 specbind (Qx_resource_name, name); 3334 specbind (Qx_resource_name, name);
3335 } 3335 }
3336 3336
3337 Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qx), Qnil));
3338
3337 /* Extract the window parameters from the supplied values 3339 /* Extract the window parameters from the supplied values
3338 that are needed to determine window geometry. */ 3340 that are needed to determine window geometry. */
3339 { 3341 {
3340 Lisp_Object font; 3342 Lisp_Object font;
3341 3343
10208 if (!EQ (bg, Fframe_parameter (frame, Qbackground_color))) 10210 if (!EQ (bg, Fframe_parameter (frame, Qbackground_color)))
10209 Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg), 10211 Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg),
10210 Qnil)); 10212 Qnil));
10211 } 10213 }
10212 10214
10215 Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qx), Qnil));
10216
10213 f->no_split = 1; 10217 f->no_split = 1;
10214 10218
10215 UNGCPRO; 10219 UNGCPRO;
10216 10220
10217 /* It is now ok to make the frame official even if we get an error 10221 /* It is now ok to make the frame official even if we get an error