Make `window-system' into a keyboard-local variable (rather than
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 25 Oct 2007 02:38:41 +0000 (02:38 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 25 Oct 2007 02:38:41 +0000 (02:38 +0000)
commit70b8d0a4a3042a7da72f6e8999d39b018ca3520a
tree18fc35f1591c5a08cc223893af158b7b0888958d
parent5656d1bfaf6aff3a1d0b783460f0b304de0be900
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.
15 files changed:
lisp/ChangeLog
lisp/startup.el
src/ChangeLog
src/dispnew.c
src/frame.c
src/frame.h
src/keyboard.c
src/keyboard.h
src/macfns.c
src/macterm.c
src/term.c
src/w32fns.c
src/w32term.c
src/xfns.c
src/xterm.c