kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-31 17:13:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

edit.c: fix incorrect redo buffer

Browse Source
This commit is contained in:
solawing 2016-01-05 11:23:41 +08:00
parent b55726b350
commit edb5fb88aa
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/edit.c
View File

@ -2464,6 +2464,14 @@ void ins_compl_show_pum(void)
/* Need to build the popup menu list. */
compl_match_arraysize = 0;
compl = compl_first_match;
/*
* If it's user complete function and refresh_always,
* not use "compl_leader" as prefix filter.
*/
if (ins_compl_need_restart()){
xfree(compl_leader);
compl_leader = NULL;
}
if (compl_leader != NULL)
lead_len = (int)STRLEN(compl_leader);
do {
@ -2929,15 +2937,8 @@ static void ins_compl_new_leader(void)
spell_bad_len = 0; /* need to redetect bad word */
/*
* Matches were cleared, need to search for them now.
* If it's user complete function and refresh_always,
* not use "compl_leader" as prefix filter.
* Set "compl_restarting" to avoid that the first match is inserted.
*/
if ((ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
&& compl_opt_refresh_always){
xfree(compl_leader);
compl_leader = NULL;
}
compl_restarting = TRUE;
if (ins_complete(Ctrl_N) == FAIL)
compl_cont_status = 0;
@ -2949,8 +2950,9 @@ static void ins_compl_new_leader(void)
/* Show the popup menu with a different set of matches. */
ins_compl_show_pum();
/* Don't let Enter select the original text when there is no popup menu. */
if (compl_match_array == NULL)
/* Don't let Enter select the original text when there is no popup menu.
* Don't let Enter select when use user function and refresh_always is set */
if (compl_match_array == NULL || ins_compl_need_restart())
compl_enter_selects = FALSE;
}
@ -2981,14 +2983,8 @@ static void ins_compl_addleader(int c)
(*mb_char2bytes)(c, buf);
buf[cc] = NUL;
ins_char_bytes(buf, cc);
if ((ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
&& compl_opt_refresh_always)
AppendToRedobuff(buf);
} else {
ins_char(c);
if ((ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
&& compl_opt_refresh_always)
AppendCharToRedobuff(c);
}
/* If we didn't complete finding matches we must search again. */
@ -3009,7 +3005,7 @@ static void ins_compl_restart(void)
{
/* update screen before restart.
* so if complete is blocked,
* will stay to the last popup menu and reduce flick */
* will stay to the last popup menu and reduce flicker */
update_screen(0);
ins_compl_free();
compl_started = FALSE;