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 | 70b8d0a4a3042a7da72f6e8999d39b018ca3520a (patch) | |
| tree | 18fc35f1591c5a08cc223893af158b7b0888958d /src/term.c | |
| parent | 5656d1bfaf6aff3a1d0b783460f0b304de0be900 (diff) | |
| download | emacs-70b8d0a4a3042a7da72f6e8999d39b018ca3520a.tar.gz emacs-70b8d0a4a3042a7da72f6e8999d39b018ca3520a.tar.bz2 emacs-70b8d0a4a3042a7da72f6e8999d39b018ca3520a.zip | |
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/term.c')
| -rw-r--r-- | src/term.c | 1 |
1 files changed, 1 insertions, 0 deletions
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++; |