From caf49fb0438e9493456b59cf9eab845e0e568e2a Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 19 May 2007 23:12:46 +0000 Subject: * 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. --- src/frame.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/frame.c') 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 -- cgit v1.2.1