* 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.

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index f118b0b2d7c..f8eedb5d756 100644
--- a/lib-src/ChangeLog.multi-tty
+++ b/lib-src/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-05-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacsclient.c (decode_options): Don't use a tty on mac carbon.
+
 2007-05-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * emacsclient.c (handle_sigtstp): Use the new name for the
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index c7c2f00c326..8e8cb9b379a 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -458,7 +458,7 @@ decode_options (argc, argv)
 
   if (!tty && display)
     window_system = 1;
-#ifndef WINDOWSNT
+#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
   else
     tty = 1;
 #endif