* loadup.el: Load mac-win on a Mac. Avoid loading both x-win and

mac-win.
* term/mac-win.el:
(mac-initialize-window-system): New function. Move global setup
here.

* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
(SYSTEM_PURESIZE_EXTRA): Only define on Carbon.

* emacsclient.c (decode_options): Don't use a tty on mac carbon.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty
index 4f173a3962d..8a1a1dbd1db 100644
--- a/src/ChangeLog.multi-tty
+++ b/src/ChangeLog.multi-tty
@@ -1,6 +1,9 @@
 2007-05-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * frame.c (Fmake_terminal_frame): Disable output method test. 
+
         * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
+        (SYSTEM_PURESIZE_EXTRA): Only define on Carbon.
 
         * termhooks.h (union display_info): Add mac_display_info.
 
@@ -32,6 +35,7 @@
         (Fx_open_connection): Remove window-system check.
         (start_hourglass): Likewise.
         (x_create_tip_frame): Get the keyboard from the terminal.
+        (Fx_create_frame): Don't use FRAME_MAC_DISPLAY_INFO.
 
         * w32fns.c (Fx_create_frame): Use kboard from the terminal.