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 | f37f80ff1014471f6cff8b8569336e907f75fc89 (patch) | |
| tree | 5b62b79d15b3fb0766ef19b5a1e11185ee663d43 /lisp/loadup.el | |
| parent | c2d8986e125619e5f888339f5ae221d964e70c8e (diff) | |
| download | emacs-f37f80ff1014471f6cff8b8569336e907f75fc89.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 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index b20b40bc6c2..8c03610043d 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -212,6 +212,9 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) +(if (eq system-type 'darwin) + (progn + (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if we have float support. (load "emacs-lisp/float-sup"))) |