aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.1.1161: preinsert requires bot "menu" and "menuone" to be set

Browse Source 
Problem:  preinsert requires bot "menu" and "menuone" to be set,
          but "menu" is redundant (after v9.1.1160)
Solution: preinsert only requires menuone (glepnir)

closes: #16763

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
glepnir
2025-03-01 16:12:23 +01:00
committed by Christian Brabandt
parent 56957ed410
commit 94a045ed56
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/insexpand.c
View File

@@ -1985,15 +1985,15 @@ ins_compl_len(void)
}
/*
* Return TRUE when preinsert is set AND both 'menu' and 'menuone' flags
* are also set, otherwise return FALSE.
* Return TRUE when the 'completeopt' "preinsert" flag is in effect,
* otherwise return FALSE.
*/
static int
ins_compl_has_preinsert(void)
{
int cur_cot_flags = get_cot_flags();
return (cur_cot_flags & (COT_PREINSERT | COT_FUZZY | COT_MENU | COT_MENUONE))
== (COT_PREINSERT | COT_MENU | COT_MENUONE);
return (cur_cot_flags & (COT_PREINSERT | COT_FUZZY | COT_MENUONE))
== (COT_PREINSERT | COT_MENUONE);
}
/*

5
src/testdir/test_ins_complete.vim
View File

@@ -3223,6 +3223,11 @@ function Test_completeopt_preinsert()
call assert_equal("foo1bar", getline('.'))
call assert_equal(7, col('.'))
set cot=preinsert,menuone
call feedkeys("Sfoo1 foo2\<CR>f\<C-X>\<C-N>", 'tx')
call assert_equal("foo1", getline('.'))
call assert_equal(1, col('.'))
bw!
set cot&
set omnifunc&

2
src/version.c
View File

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