diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-11-27 20:48:51 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-11-27 20:48:51 -0300 |
| commit | e5a386d2f819ee3a357384279d1a7810ec213087 (patch) | |
| tree | cbb173280c736f89523b63a9c28429878131a995 /src/nvim/option.c | |
| parent | 98b11f5db3a99ef633ad77ddc6b22dc428873e95 (diff) | |
| parent | 7b0f7ea87c71ad79dfd9e087b5992761533bef6e (diff) | |
| download | rneovim-e5a386d2f819ee3a357384279d1a7810ec213087.tar.gz rneovim-e5a386d2f819ee3a357384279d1a7810ec213087.tar.bz2 rneovim-e5a386d2f819ee3a357384279d1a7810ec213087.zip | |
Merge PR #1568 'Remove code defined under USE_IM_CONTROL #ifdefs'
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 1d3281e952..ee70b5bf8a 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -912,18 +912,10 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"imcmdline", "imc", P_BOOL|P_VI_DEF, -#ifdef USE_IM_CONTROL - (char_u *)&p_imcmdline, PV_NONE, -#else (char_u *)NULL, PV_NONE, -#endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"imdisable", "imd", P_BOOL|P_VI_DEF, -#ifdef USE_IM_CONTROL - (char_u *)&p_imdisable, PV_NONE, -#else (char_u *)NULL, PV_NONE, -#endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"iminsert", "imi", P_NUM|P_VI_DEF, @@ -5134,18 +5126,6 @@ set_bool_option ( foldUpdateAll(curwin); } -#ifdef USE_IM_CONTROL - /* 'imdisable' */ - else if ((int *)varp == &p_imdisable) { - /* Only de-activate it here, it will be enabled when changing mode. */ - if (p_imdisable) - im_set_active(FALSE); - else if (State & INSERT) - /* When the option is set from an autocommand, it may need to take - * effect right away. */ - im_set_active(curbuf->b_p_iminsert == B_IMODE_IM); - } -#endif /* 'spell' */ else if ((int *)varp == &curwin->w_p_spell) { |