X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7d5989e14aacad4aa0775339dab645db80ab7144..5371d722ecd94db9d5b3b21f4b91d073a38bd73b:/src/macgui.h

diff --git a/src/macgui.h b/src/macgui.h
index 2990537076..755bffbd46 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -1,12 +1,12 @@
 /* Definitions and headers for communication on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -81,11 +81,13 @@ typedef unsigned long Time;
 
 /* Whether to use ATSUI (Apple Type Services for Unicode Imaging) for
    text drawing.  */
+#if 0 /* Don't enable by default on the emacs-unicode-2 branch.  */
 #ifndef USE_ATSUI
 #ifdef MAC_OSX
 #define USE_ATSUI 1
 #endif
 #endif
+#endif
 
 /* Whether to use low-level Quartz 2D (aka Core Graphics) text drawing
    in preference to ATSUI for ASCII and Latin-1 characters.  */