Merge from emacs--devo--0

[gnu-emacs] / src / macgui.h

diff --git a/src/macgui.h b/src/macgui.h
index 690840c6c33ef3f77a7feb919a53958ba14a896a..90688e5703ebfee0d1a50fa6f221419834f54c90 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -112,6 +112,13 @@ typedef unsigned long Time;
 #endif
 #endif
 
+/* Whether to use Text Services Manager.  */
+#ifndef USE_MAC_TSM
+#ifdef MAC_OSX
+#define USE_MAC_TSM 1
+#endif
+#endif
+
 typedef WindowPtr Window;
 typedef GWorldPtr Pixmap;