Mercurial > emacs
comparison lisp/startup.el @ 85614:9f3a25157e4f
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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 25 Oct 2007 02:38:41 +0000 |
| parents | 50e4a0be4dcb |
| children | e50a2e215441 4bc33ffdda1a |
comparison
equal
deleted
inserted
replaced
| 85613:ae9da278f53b | 85614:9f3a25157e4f |
|---|---|
| 33 | 33 |
| 34 (setq top-level '(normal-top-level)) | 34 (setq top-level '(normal-top-level)) |
| 35 | 35 |
| 36 (defvar command-line-processed nil | 36 (defvar command-line-processed nil |
| 37 "Non-nil once command line has been processed.") | 37 "Non-nil once command line has been processed.") |
| 38 | |
| 39 (defvar window-system initial-window-system | |
| 40 "Name of window system the selected frame is displaying through. | |
| 41 The value is a symbol--for instance, `x' for X windows. | |
| 42 The value is nil if the selected frame is on a text-only-terminal.") | |
| 43 | |
| 44 (make-variable-frame-local 'window-system) | |
| 45 | 38 |
| 46 (defgroup initialization nil | 39 (defgroup initialization nil |
| 47 "Emacs start-up procedure." | 40 "Emacs start-up procedure." |
| 48 :group 'environment) | 41 :group 'environment) |
| 49 | 42 |