patch 9.1.1685: Missing changes from PR 18068

Problem:  Missing changes from PR 18068
Solution: Include the missing changes
          (Girish Palya)

Co-authored-by: Girish Palya <girishji@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 860fe08ebe279b3913120777e586ef83b12e14f2..f127d3dbc1c63693aef2b1ccce174484fb6cd4ce 100644 (file)
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 9.1.  Last change: 2025 Aug 23
+*insert.txt*    For Vim version 9.1.  Last change: 2025 Aug 25
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1147,8 +1147,8 @@ time slice.
 
 This mode is fully compatible with other completion modes.  You can invoke
 any of them at any time by typing |CTRL-X|, which temporarily suspends
-autocompletion.  To use |i_CTRL-N| specifically, press |CTRL-E| first to
-dismiss the popup menu (see |complete_CTRL-E|).
+autocompletion.  To use |i_CTRL-N| or |i_CTRL-X_CTRL-N| specifically, press
+|CTRL-E| first to dismiss the popup menu (see |complete_CTRL-E|).
 
 See also 'autocomplete', 'autocompletetimeout' and 'autocompletedelay'.
 

diff --git a/src/insexpand.c b/src/insexpand.c
index 3ca6e23e6597c2936aa38b612e1985e62911c1b4..54d42aaf85989aac61c9aa819c97bf5c8654d8a7 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -310,7 +310,7 @@ ins_ctrl_x(void)
     if (!ctrl_x_mode_cmdline())
     {
        // if the next ^X<> won't ADD nothing, then reset compl_cont_status
-       if ((compl_cont_status & CONT_N_ADDS) && !p_ac)
+       if (compl_cont_status & CONT_N_ADDS)
            compl_cont_status |= CONT_INTRPT;
        else
            compl_cont_status = 0;

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index f7a5c263755948a33b3e6dd603a51d488dfb72bb..b0ed072371424e20761c9b37511755a366e39c23 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -5199,7 +5199,7 @@ func Test_autocomplete_trigger()
 
   " Test 4a: When autocomplete menu is active, ^X^N completes buffer keywords
   let g:CallCount = 0
-  call feedkeys("S#a\<C-X>\<C-N>\<F2>\<Esc>0", 'tx!')
+  call feedkeys("S#a\<C-E>\<C-X>\<C-N>\<F2>\<Esc>0", 'tx!')
   call assert_equal(['abc', 'abcd'], b:matches->mapnew('v:val.word'))
   call assert_equal(2, g:CallCount)
 
@@ -5226,6 +5226,14 @@ func Test_autocomplete_trigger()
   call assert_equal(['afoo bar', 'and'], b:matches->mapnew('v:val.word'))
   call assert_equal(1, g:CallCount)
 
+  " Issue #18044
+  %d
+  call setline(1, ["first line", "second line"])
+  call feedkeys("Gof\<C-X>\<C-L>\<Esc>", 'tx!')
+  call assert_equal("first line", getline(3))
+  call feedkeys("Sf\<C-X>\<C-L>\<C-X>\<C-L>\<Esc>", 'tx!')
+  call assert_equal("second line", getline(4))
+
   " Test 5: When invalid prefix stops completion, backspace should restart it
   %d
   set complete&

diff --git a/src/version.c b/src/version.c
index 712a3e637cfd3be4f9c337d091686141224c56ed..7d265ab64123206c4ce9f375a132bf2223328b25 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1685,
 /**/
     1684,
 /**/