Mercurial > vim
changeset 12469:61d910f0999d v8.0.1114
patch 8.0.1114: default for 'iminsert' is annoying
commit https://github.com/vim/vim/commit/4cf56bbc85f77846aeb378cfb071677336dfad6d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 16 15:50:32 2017 +0200
patch 8.0.1114: default for 'iminsert' is annoying
Problem: Default for 'iminsert' is annoying.
Solution: Make the default always zero. (Yasuhiro Matsumoto, closes https://github.com/vim/vim/issues/2071)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 16 Sep 2017 16:00:04 +0200 |
parents | 59348fe5c3ec |
children | 2ed396c31eda |
files | runtime/doc/options.txt src/option.c src/version.c |
diffstat | 3 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4299,7 +4299,7 @@ A jump table for the options with a shor may change in later releases. *'iminsert'* *'imi'* -'iminsert' 'imi' number (default 0, 2 when an input method is supported) +'iminsert' 'imi' number (default 0) local to buffer {not in Vi} Specifies whether :lmap or an Input Method (IM) is to be used in @@ -4322,7 +4322,7 @@ A jump table for the options with a shor methods. Use 'imdisable' to disable XIM then. *'imsearch'* *'ims'* -'imsearch' 'ims' number (default 0, 2 when an input method is supported) +'imsearch' 'ims' number (default -1) local to buffer {not in Vi} Specifies whether :lmap or an Input Method (IM) is to be used when
--- a/src/option.c +++ b/src/option.c @@ -1591,19 +1591,11 @@ static struct vimoption options[] = SCRIPTID_INIT}, {"iminsert", "imi", P_NUM|P_VI_DEF, (char_u *)&p_iminsert, PV_IMI, -#ifdef B_IMODE_IM - {(char_u *)B_IMODE_IM, (char_u *)0L} -#else {(char_u *)B_IMODE_NONE, (char_u *)0L} -#endif SCRIPTID_INIT}, {"imsearch", "ims", P_NUM|P_VI_DEF, (char_u *)&p_imsearch, PV_IMS, -#ifdef B_IMODE_IM - {(char_u *)B_IMODE_IM, (char_u *)0L} -#else - {(char_u *)B_IMODE_NONE, (char_u *)0L} -#endif + {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L} SCRIPTID_INIT}, {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE, #if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK)