diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-05-19 19:08:02 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-05-19 19:08:02 +0000 |
| commit | 80ca7302d820bd3460a06db39165bbc35144c684 (patch) | |
| tree | 9cbfeba96180f4d60e44037a71bf4a1fff4a2022 /src/term.c | |
| parent | 696758702fa8eae3cfa46859cc260398b15d71bd (diff) | |
| download | emacs-80ca7302d820bd3460a06db39165bbc35144c684.tar.gz | |
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.
* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.
* macterm.h (struct mac_display_info): Add terminal.
* w32term.c (w32_initialize): Make static.
* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.
* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.
* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.
* loadup.el: Load mac-win on a Mac.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index 04d5f74fc2c..53727a975ea 100644 --- a/src/term.c +++ b/src/term.c @@ -2732,9 +2732,8 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", prompt in the mini-buffer. */ if (current_kboard == initial_kboard) current_kboard = terminal->kboard; -#endif - term_get_fkeys (address, terminal->kboard); +#endif /* Get frame size from system, or else from termcap. */ { |