From 839e000cfb2af1abddcd99530b27e820db439f88 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/term.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/term.c') diff --git a/src/term.c b/src/term.c index b97e77b2320..cdf84eef091 100644 --- a/src/term.c +++ b/src/term.c @@ -3487,6 +3487,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", #ifdef MULTI_KBOARD terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (terminal->kboard); + terminal->kboard->Vwindow_system = Qnil; terminal->kboard->next_kboard = all_kboards; all_kboards = terminal->kboard; terminal->kboard->reference_count++; -- cgit v1.2.1