Mercurial > emacs

diff lib-src/emacsclient.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 a5651b79b31b
children 3b1222f7b28a
line wrap: on
line diff
--- a/lib-src/emacsclient.c	Sat May 19 19:08:02 2007 +0000
+++ b/lib-src/emacsclient.c	Sat May 19 23:12:46 2007 +0000
@@ -458,7 +458,7 @@
 
   if (!tty && display)
     window_system = 1;
-#ifndef WINDOWSNT
+#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
   else
     tty = 1;
 #endif