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

4 files changed, 10 insertions, 6 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.
 
diff --git a/src/frame.c b/src/frame.c
index 859802995af..5b8f9acaf0c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -702,7 +702,9 @@ affects all frames on the same terminal device.  */)
     abort ();
 #else /* not MSDOS */
 
-#ifdef MAC_OS
+#if 0 /* #ifdef MAC_OS */
+  /* This can happen for multi-tty when using both terminal frames and
+     Carbon frames. */
   if (sf->output_method != output_mac)
     error ("Not running on a Macintosh screen; cannot make a new Macintosh frame");
 #else
diff --git a/src/macfns.c b/src/macfns.c
index 382259e2fce..4c454399afb 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2590,7 +2590,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
     f->icon_name = Qnil;
 
   /* XXX Is this needed? */
-  FRAME_MAC_DISPLAY_INFO (f) = dpyinfo;
+  /*FRAME_MAC_DISPLAY_INFO (f) = dpyinfo;*/
 
   /* With FRAME_MAC_DISPLAY_INFO set up, this unwind-protect is safe.  */
 #if GLYPH_DEBUG
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 72ed8964a7d..2cc6ef1cdf1 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -50,12 +50,10 @@ Boston, MA 02110-1301, USA.  */
 #ifdef MAC_OSX
 #ifdef HAVE_CARBON
 #define MAC_OS
-#endif
-#endif
-
 /* We need a little extra space, see ../../lisp/loadup.el. */
 #define SYSTEM_PURESIZE_EXTRA 30000
-
+#endif
+#endif
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */