Mercurial > emacs
comparison lisp/loadup.el @ 83619:5da6a46ddbd6
* 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.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 19 May 2007 19:08:02 +0000 |
parents | 46d454fde388 |
children | ce4352d8bee9 |
comparison
equal
deleted
inserted
replaced
83618:fe83377d2247 | 83619:5da6a46ddbd6 |
---|---|
210 (load "international/codepage") ; internal.el uses cpNNN coding systems | 210 (load "international/codepage") ; internal.el uses cpNNN coding systems |
211 (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el | 211 (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el |
212 (if (eq system-type 'macos) | 212 (if (eq system-type 'macos) |
213 (progn | 213 (progn |
214 (load "ls-lisp"))) | 214 (load "ls-lisp"))) |
215 (if (eq system-type 'darwin) | |
216 (progn | |
217 (load "term/mac-win"))) | |
215 (if (fboundp 'atan) ; preload some constants and | 218 (if (fboundp 'atan) ; preload some constants and |
216 (progn ; floating pt. functions if we have float support. | 219 (progn ; floating pt. functions if we have float support. |
217 (load "emacs-lisp/float-sup"))) | 220 (load "emacs-lisp/float-sup"))) |
218 (message "%s" (garbage-collect)) | 221 (message "%s" (garbage-collect)) |
219 | 222 |