From 21df0cdb886c09fccafb392949c690ca4af03987 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Sun, 4 Feb 2024 11:12:31 +0800
Subject: vim-patch:9.1.0075: insert completion not correct when adding new
 leader (#27332)

Problem:  insert completion not correct when adding new leader
Solution: Reset compl_curr_match to compl_shown_match
          (glepnir)

closes: vim/vim#13957

https://github.com/vim/vim/commit/cbb46b439888e10f87baaca504eafd191723c44b
---
 src/nvim/insexpand.c            |  5 +++++
 test/old/testdir/test_popup.vim | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c
index 82b26ba802..2f54250392 100644
--- a/src/nvim/insexpand.c
+++ b/src/nvim/insexpand.c
@@ -1294,6 +1294,11 @@ void ins_compl_show_pum(void)
   pum_display(compl_match_array, compl_match_arraysize, cur, array_changed, 0);
   curwin->w_cursor.col = col;
 
+  // After adding leader, set the current match to shown match.
+  if (compl_started && compl_curr_match != compl_shown_match) {
+    compl_curr_match = compl_shown_match;
+  }
+
   if (has_event(EVENT_COMPLETECHANGED)) {
     trigger_complete_changed_event(cur);
   }
diff --git a/test/old/testdir/test_popup.vim b/test/old/testdir/test_popup.vim
index fa0df77ab5..ca6a4c0728 100644
--- a/test/old/testdir/test_popup.vim
+++ b/test/old/testdir/test_popup.vim
@@ -1162,9 +1162,21 @@ func Test_CompleteChanged()
   call feedkeys("a\<C-N>\<C-N>\<C-N>\<C-N>\<C-P>", 'tx')
   call assert_equal('foobar', g:word)
 
+  func Omni_test(findstart, base)
+    if a:findstart
+      return col(".")
+    endif
+    return [#{word: "one"}, #{word: "two"}, #{word: "five"}]
+  endfunc
+  set omnifunc=Omni_test
+  set completeopt=menu,menuone
+  call feedkeys("i\<C-X>\<C-O>\<BS>\<BS>\<BS>f", 'tx')
+  call assert_equal('five', g:word)
+
   autocmd! AAAAA_Group
   set complete& completeopt&
   delfunc! OnPumChange
+  delfunc! Omni_test
   bw!
 endfunc
 
-- 
cgit