mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-09 10:59:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40523 from zeertzjq/vim-9.1.1540

Browse Source 
vim-patch:9.1.{1540,1542}
This commit is contained in:
zeertzjq
2026-07-01 17:50:33 +08:00
committed by GitHub
parent 8a845104c8 3fd0ed3176
commit 0d81f257af
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/insexpand.c
View File

@@ -2343,6 +2343,8 @@ static void ins_compl_new_leader(void)
ui_flush();
}
int save_w_wrow = curwin->w_wrow;
int save_w_leftcol = curwin->w_leftcol;
if (compl_started) {
ins_compl_set_original_text(compl_leader.data, compl_leader.size);
if (is_cpt_func_refresh_always()) {
@@ -2361,7 +2363,7 @@ static void ins_compl_new_leader(void)
} else {
compl_autocomplete = false;
}
if (ins_complete(Ctrl_N, true) == FAIL) {
if (ins_complete(Ctrl_N, false) == FAIL) {
compl_cont_status = 0;
}
compl_restarting = false;
@@ -2370,7 +2372,9 @@ static void ins_compl_new_leader(void)
compl_enter_selects = !compl_used_match && compl_selected_item != -1;
// Show the popup menu with a different set of matches.
ins_compl_show_pum();
if (!compl_interrupted) {
show_pum(save_w_wrow, save_w_leftcol);
}
// Don't let Enter select the original text when there is no popup menu.
if (compl_match_array == NULL) {