aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-14 23:04:02 -05:00
Code Activity

patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete

Browse Source 
Problem:    USE_IM_CONTROL is confusing and incomplete.
Solution:   Just use FEAT_MBYTE.  Call 'imactivatefunc' also without GUI.
This commit is contained in:
Bram Moolenaar
2017-11-25 17:14:33 +01:00
parent 50d43153a7
commit 819edbe078
14 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui_mac.c
View File

@@ -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 file)
#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) */