aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-23 08:44:20 -04:00
Code Activity

patch 9.1.1685: Missing changes from PR 18068

Browse Source 
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>
This commit is contained in:
Girish Palya
2025-08-25 17:33:39 -04:00
committed by Christian Brabandt
parent 3b3b936125
commit c6a0f42cdb
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/insert.txt
View File

@@ -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 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1147,8 +1147,8 @@ time slice.
This mode is fully compatible with other completion modes. You can invoke 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 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 autocompletion. To use |i_CTRL-N| or |i_CTRL-X_CTRL-N| specifically, press
dismiss the popup menu (see |complete_CTRL-E|). |CTRL-E| first to dismiss the popup menu (see |complete_CTRL-E|).
See also 'autocomplete', 'autocompletetimeout' and 'autocompletedelay'. See also 'autocomplete', 'autocompletetimeout' and 'autocompletedelay'.

2
src/insexpand.c
View File

@@ -310,7 +310,7 @@ ins_ctrl_x(void)
if (!ctrl_x_mode_cmdline()) if (!ctrl_x_mode_cmdline())
{ {
// if the next ^X<> won't ADD nothing, then reset compl_cont_status // 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; compl_cont_status |= CONT_INTRPT;
else else
compl_cont_status = 0; compl_cont_status = 0;

10
src/testdir/test_ins_complete.vim
View File

@@ -5199,7 +5199,7 @@ func Test_autocomplete_trigger()
" Test 4a: When autocomplete menu is active, ^X^N completes buffer keywords " Test 4a: When autocomplete menu is active, ^X^N completes buffer keywords
let g:CallCount = 0 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(['abc', 'abcd'], b:matches->mapnew('v:val.word'))
call assert_equal(2, g:CallCount) 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(['afoo bar', 'and'], b:matches->mapnew('v:val.word'))
call assert_equal(1, g:CallCount) 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 " Test 5: When invalid prefix stops completion, backspace should restart it
%d %d
set complete& set complete&

2
src/version.c
View File

@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1685,
/**/ /**/
1684, 1684,
/**/ /**/