Mercurial > emacs

diff src/frame.c @ 83620:ce4352d8bee9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 19 May 2007 23:12:46 +0000
parents d7ab14bae858
children 4c726a40604c
line wrap: on
line diff
--- a/src/frame.c	Sat May 19 19:08:02 2007 +0000
+++ b/src/frame.c	Sat May 19 23:12:46 2007 +0000
@@ -702,7 +702,9 @@
     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