diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-25 02:38:41 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-25 02:38:41 +0000 |
| commit | 839e000cfb2af1abddcd99530b27e820db439f88 (patch) | |
| tree | 5fff0f9c7ad775b68f4e6c1ee16b775aa13e1967 /src/keyboard.c | |
| parent | 0497915bfa0c180849b458407b65133d565a10ae (diff) | |
| download | emacs-839e000cfb2af1abddcd99530b27e820db439f88.tar.gz | |
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) <window-system>: 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.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 527cc9c6338..cc6b46a6ba4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11489,6 +11489,7 @@ init_kboard (kb) kb->reference_count = 0; kb->Vsystem_key_alist = Qnil; kb->system_key_syms = Qnil; + kb->Vwindow_system = Qt; /* Unset. */ kb->Vinput_decode_map = Fmake_sparse_keymap (Qnil); kb->Vlocal_function_key_map = Fmake_sparse_keymap (Qnil); Fset_keymap_parent (kb->Vlocal_function_key_map, Vfunction_key_map); @@ -11571,6 +11572,7 @@ init_keyboard () #endif wipe_kboard (current_kboard); init_kboard (current_kboard); + /* Leave Vwindow_system at its `t' default for now. */ if (!noninteractive) { @@ -12466,6 +12468,7 @@ mark_kboards () mark_object (kb->Vlast_kbd_macro); mark_object (kb->Vsystem_key_alist); mark_object (kb->system_key_syms); + mark_object (kb->Vwindow_system); mark_object (kb->Vinput_decode_map); mark_object (kb->Vlocal_function_key_map); mark_object (kb->Vdefault_minibuffer_frame); |