thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1124: insert completion flags are mixed up

Browse Source 
Problem:    Insert completion flags are mixed up.
Solution:   Clean up flags use of ins_compl_add() and cp_flags.
This commit is contained in:
Bram Moolenaar
2019-04-06 14:22:21 +02:00
parent 73655cf0ca
commit d9eefe3155
5 changed files with 80 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/search.c
View File

@@ -5272,7 +5272,7 @@ search_line:
#ifdef FEAT_INS_EXPAND
if (action == ACTION_EXPAND)
{
int reuse = 0;
int cont_s_ipos = FALSE;
int add_r;
char_u *aux;
@@ -5333,7 +5333,7 @@ search_line:
p = aux + IOSIZE - i - 1;
STRNCPY(IObuff + i, aux, p - aux);
i += (int)(p - aux);
reuse |= CONT_S_IPOS;
cont_s_ipos = TRUE;
}
IObuff[i] = NUL;
aux = IObuff;
@@ -5344,7 +5344,7 @@ search_line:
add_r = ins_compl_add_infercase(aux, i, p_ic,
curr_fname == curbuf->b_fname ? NULL : curr_fname,
dir, reuse);
dir, cont_s_ipos);
if (add_r == OK)
/* if dir was BACKWARD then honor it just once */
dir = FORWARD;