diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:14:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:14:33 +0100 |
| commit | 819edbe078c8579f3620d12dac830f12ccdc5a45 (patch) | |
| tree | 9aeaacf944c52f62fb2caaed49c8319746e3dae6 /src/ex_getln.c | |
| parent | 50d43153a7e3e452cd166cde0d84ecacd316321f (diff) | |
| download | vim-git-819edbe078c8579f3620d12dac830f12ccdc5a45.tar.gz | |
patch 8.0.1338: USE_IM_CONTROL is confusing and incompletev8.0.1338
Problem: USE_IM_CONTROL is confusing and incomplete.
Solution: Just use FEAT_MBYTE. Call 'imactivatefunc' also without GUI.
Diffstat (limited to 'src/ex_getln.c')
| -rw-r--r-- | src/ex_getln.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index f8a193d1d..02d03b4e1 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -359,11 +359,11 @@ getcmdline( b_im_ptr = &curbuf->b_p_imsearch; if (*b_im_ptr == B_IMODE_LMAP) State |= LANGMAP; -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE im_set_active(*b_im_ptr == B_IMODE_IM); #endif } -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE else if (p_imcmdline) im_set_active(TRUE); #endif @@ -1119,7 +1119,7 @@ getcmdline( { /* ":lmap" mappings exists, toggle use of mappings. */ State ^= LANGMAP; -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE im_set_active(FALSE); /* Disable input method */ #endif if (b_im_ptr != NULL) @@ -1130,7 +1130,7 @@ getcmdline( *b_im_ptr = B_IMODE_NONE; } } -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE else { /* There are no ":lmap" mappings, toggle IM. When @@ -2143,7 +2143,7 @@ returncmd: #endif State = save_State; -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE if (b_im_ptr != NULL && *b_im_ptr != B_IMODE_LMAP) im_save_status(b_im_ptr); im_set_active(FALSE); |