Mercurial > vim
diff src/gui_mac.c @ 12924:85a601f985ab v8.0.1338
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
commit https://github.com/vim/vim/commit/819edbe078c8579f3620d12dac830f12ccdc5a45
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 25 17:14:33 2017 +0100
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 25 Nov 2017 17:15:05 +0100 |
| parents | 351cf7c67bbe |
| children | f4c3a7f410f4 |
line wrap: on
line diff
--- a/src/gui_mac.c +++ b/src/gui_mac.c @@ -2024,15 +2024,15 @@ gui_mac_handle_window_activate( 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 @@ char_u *FullPathFromFSSpec_save(FSSpec f #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 @@ im_set_active(int active) ScriptLanguageRecord *slptr = NULL; OSStatus err; - if (! gui.in_use) + if (!gui.in_use) return; if (im_initialized == 0) @@ -6379,7 +6379,7 @@ im_get_status(void) return im_is_active; } -#endif /* defined(USE_IM_CONTROL) || defined(PROTO) */ +#endif /* defined(FEAT_MBYTE) || defined(PROTO) */