aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.0.1114: default for 'iminsert' is annoying

Browse Source 
Problem:    Default for 'iminsert' is annoying.
Solution:   Make the default always zero. (Yasuhiro Matsumoto, closes #2071)
This commit is contained in:
Bram Moolenaar
2017-09-16 15:50:32 +02:00
parent eef9adddab
commit 4cf56bbc85
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/options.txt
View File

@@ -4299,7 +4299,7 @@ A jump table for the options with a short description can be found at |Q_op|.
may change in later releases. may change in later releases.
*'iminsert'* *'imi'* *'iminsert'* *'imi'*
'iminsert' 'imi' number (default 0, 2 when an input method is supported) 'iminsert' 'imi' number (default 0)
local to buffer local to buffer
{not in Vi} {not in Vi}
Specifies whether :lmap or an Input Method (IM) is to be used in 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 short description can be found at |Q_op|.
methods. Use 'imdisable' to disable XIM then. methods. Use 'imdisable' to disable XIM then.
*'imsearch'* *'ims'* *'imsearch'* *'ims'*
'imsearch' 'ims' number (default 0, 2 when an input method is supported) 'imsearch' 'ims' number (default -1)
local to buffer local to buffer
{not in Vi} {not in Vi}
Specifies whether :lmap or an Input Method (IM) is to be used when Specifies whether :lmap or an Input Method (IM) is to be used when

10
src/option.c
View File

@@ -1591,19 +1591,11 @@ static struct vimoption options[] =
SCRIPTID_INIT}, SCRIPTID_INIT},
{"iminsert", "imi", P_NUM|P_VI_DEF, {"iminsert", "imi", P_NUM|P_VI_DEF,
(char_u *)&p_iminsert, PV_IMI, (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} {(char_u *)B_IMODE_NONE, (char_u *)0L}
#endif
SCRIPTID_INIT}, SCRIPTID_INIT},
{"imsearch", "ims", P_NUM|P_VI_DEF, {"imsearch", "ims", P_NUM|P_VI_DEF,
(char_u *)&p_imsearch, PV_IMS, (char_u *)&p_imsearch, PV_IMS,
#ifdef B_IMODE_IM {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L}
{(char_u *)B_IMODE_IM, (char_u *)0L}
#else
{(char_u *)B_IMODE_NONE, (char_u *)0L}
#endif
SCRIPTID_INIT}, SCRIPTID_INIT},
{"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE, {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE,
#if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK) #if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK)

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1114,
/**/ /**/
1113, 1113,
/**/ /**/