Mercurial > vim
diff src/normal.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 | 40ae30bc2691 |
| children | 50aa6da392ce |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -892,7 +892,7 @@ getcount: int lit = FALSE; /* get extra character literally */ int langmap_active = FALSE; /* using :lmap mappings */ int lang; /* getting a text character */ -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE int save_smd; /* saved value of p_smd */ #endif @@ -957,7 +957,7 @@ getcount: State = LANGMAP; langmap_active = TRUE; } -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE save_smd = p_smd; p_smd = FALSE; /* Don't let the IM code show the mode here */ if (lang && curbuf->b_p_iminsert == B_IMODE_IM) @@ -973,7 +973,7 @@ getcount: ++allow_keys; State = NORMAL_BUSY; } -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE if (lang) { if (curbuf->b_p_iminsert != B_IMODE_LMAP)