From 3d074c725507d130eea81600a7d5c3664436edef Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 27 Jul 2008 18:24:48 +0000
Subject: Remove support for Mac Carbon. * mactoolbox.c: * macterm.h: *
 macterm.c: * macselect.c: * macmenu.c: * macgui.h: * macfns.c: * mac.c:
 Remove file. * s/darwin.h: * m/intel386.h: * xfaces.c: * xdisp.c: * window.c:
 * tparam.c: * termhooks.h: * termcap.c: * term.c: * syssignal.h: *
 sysselect.h: * sysdep.c: * process.c: * lread.c: * lisp.h: * keyboard.c: *
 image.c: * fringe.c: * frame.h: * frame.c: * fontset.c: * font.h: * font.c: *
 fns.c: * fileio.c: * emacs.c: * dispnew.c: * dispextern.h: * config.in: *
 atimer.c: * Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.
---
 lib-src/emacsclient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib-src/emacsclient.c')

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index ef146699781..279dd40b864 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -569,7 +569,7 @@ decode_options (argc, argv)
 
   if (!tty && display)
     window_system = 1;
-#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
+#if !defined (WINDOWSNT)
   else if (!current_frame)
     tty = 1;
 #endif
-- 
cgit v1.2.1