Mercurial > emacs
comparison src/macterm.c @ 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 | 0bc184c59770 |
children | 4f5de444e723 4bc33ffdda1a |
comparison
equal
deleted
inserted
replaced
85613:ae9da278f53b | 85614:9f3a25157e4f |
---|---|
12819 terminal->memory_below_frame = 0; /* We don't remember what scrolls | 12819 terminal->memory_below_frame = 0; /* We don't remember what scrolls |
12820 off the bottom. */ | 12820 off the bottom. */ |
12821 | 12821 |
12822 #endif | 12822 #endif |
12823 | 12823 |
12824 /* FIXME: This keyboard setup is 100% untested, just copied from | |
12825 w32_create_terminal in order to set window-system now that it's | |
12826 a keyboard object. */ | |
12827 #ifdef MULTI_KBOARD | |
12828 /* We don't yet support separate terminals on Mac, so don't try to share | |
12829 keyboards between virtual terminals that are on the same physical | |
12830 terminal like X does. */ | |
12831 terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); | |
12832 init_kboard (terminal->kboard); | |
12833 terminal->kboard->Vwindow_system = intern ("mac"); | |
12834 terminal->kboard->next_kboard = all_kboards; | |
12835 all_kboards = terminal->kboard; | |
12836 /* Don't let the initial kboard remain current longer than necessary. | |
12837 That would cause problems if a file loaded on startup tries to | |
12838 prompt in the mini-buffer. */ | |
12839 if (current_kboard == initial_kboard) | |
12840 current_kboard = terminal->kboard; | |
12841 terminal->kboard->reference_count++; | |
12842 #endif | |
12843 | |
12824 return terminal; | 12844 return terminal; |
12825 } | 12845 } |
12826 | 12846 |
12827 static void | 12847 static void |
12828 mac_initialize () | 12848 mac_initialize () |