commit 819edbe078c8579f3620d12dac830f12ccdc5a45
author Bram Moolenaar <Bram@vim.org> Sat Nov 25 17:14:33 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Nov 25 17:14:33 2017 +0100
tree 9aeaacf944c52f62fb2caaed49c8319746e3dae6
parent 50d43153a7e3e452cd166cde0d84ecacd316321f

patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete

Problem:    USE_IM_CONTROL is confusing and incomplete.
Solution:   Just use FEAT_MBYTE.  Call 'imactivatefunc' also without GUI.

src/gui_mac.c

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 93feabe..97cbf80 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2024,15 +2024,15 @@
 	switch (eventKind)
 	{
 	    case kEventWindowActivated:
-#if defined(USE_IM_CONTROL)
+# if defined(FEAT_MBYTE)
 		im_on_window_switch(TRUE);
-#endif
+# endif
 		return noErr;
 
 	    case kEventWindowDeactivated:
-#if defined(USE_IM_CONTROL)
+# if defined(FEAT_MBYTE)
 		im_on_window_switch(FALSE);
-#endif
+# endif
 		return noErr;
 	}
     }
@@ -6230,7 +6230,7 @@
 #endif
 }
 
-#if (defined(USE_IM_CONTROL) || defined(PROTO)) && defined(USE_CARBONKEYHANDLER)
+#if (defined(FEAT_MBYTE) || defined(PROTO)) && defined(USE_CARBONKEYHANDLER)
 /*
  * Input Method Control functions.
  */
@@ -6317,7 +6317,7 @@
     ScriptLanguageRecord *slptr = NULL;
     OSStatus err;
 
-    if (! gui.in_use)
+    if (!gui.in_use)
 	return;
 
     if (im_initialized == 0)
@@ -6379,7 +6379,7 @@
     return im_is_active;
 }
 
-#endif /* defined(USE_IM_CONTROL) || defined(PROTO) */
+#endif /* defined(FEAT_MBYTE) || defined(PROTO) */