# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1706981403 -3600
# Node ID f4ae2a159bdefc6bb9bc205f0e4f2c6dbf19e4ed
# Parent  13a3a1d87512d650f500fc926f7de11249956808
patch 9.1.0075: insert completion not correct when adding new leader

Commit: https://github.com/vim/vim/commit/cbb46b439888e10f87baaca504eafd191723c44b
Author: glepnir <glephunter@gmail.com>
Date:   Sat Feb 3 18:11:13 2024 +0100

    patch 9.1.0075: insert completion not correct when adding new leader

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

    closes: #13957

    Co-authored-by: glepnir <glephunter@gmail.com>
    Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/insexpand.c b/src/insexpand.c
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -1363,6 +1363,10 @@ ins_compl_show_pum(void)
     pum_display(compl_match_array, compl_match_arraysize, cur);
     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;
+
 #ifdef FEAT_EVAL
     if (has_completechanged())
 	trigger_complete_changed_event(cur);
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1159,9 +1159,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
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    75,
+/**/
     74,
 /**/
     73,