From 70b8d0a4a3042a7da72f6e8999d39b018ca3520a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 25 Oct 2007 02:38:41 +0000 Subject: Make `window-system' into a keyboard-local variable (rather than frame-local as done originally by multi-tty). * startup.el (window-system): Remove. Don't make it frame-local. * keyboard.h (struct kboard): Add Vwindow_system. * keyboard.c (init_kboard): Set a default for Vwindow_system. (mark_kboards): Mark Vwindow_system. * dispnew.c (syms_of_display) : Declare terminal-local. (init_display): Don't set the obsolete `window-system' frame-param. * xterm.c (x_term_init): * w32term.c (w32_create_terminal): * term.c (init_tty): Set Vwindow_system. * macterm.c (mac_create_terminal): Set a keyboard (missing piece of the multi-tty merge maybe?), copied from w32term.c. Set Vwindow_system. * xfns.c (Fx_create_frame, x_create_tip_frame): * w32fns.c (Fx_create_frame, x_create_tip_frame): * macfns.c (Fx_create_frame): Don't set the obsolete `window-system' frame-param. * frame.h (Qwindow_system): Remove. * frame.c (Qwindow_system): Remove. In `syms_of_frame' as well. (Fmake_terminal_frame): Don't set obsolete `window-system' frame-param. --- src/frame.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/frame.h') diff --git a/src/frame.h b/src/frame.h index d76cc15402a..539b0b7edd0 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1020,8 +1020,6 @@ extern Lisp_Object Qx_resource_name; extern Lisp_Object Qleft, Qright, Qtop, Qbox; extern Lisp_Object Qdisplay; -extern Lisp_Object Qwindow_system; - #ifdef HAVE_WINDOW_SYSTEM /* The class of this X application. */ -- cgit v1.2.1