Merge from emacs--rel--22

[gnu-emacs] / src / macgui.h

diff --git a/src/macgui.h b/src/macgui.h
index 1f4e454c714fff0e66aa5da3363a9d10e43833cc..c549a885f48a1c1bde5850b104ee24109bbcafea 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -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.  */