summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-06-16 08:44:05 +0200
committerChristian Brabandt <cb@256bit.org>2024-06-16 08:44:05 +0200
commitacc87469415ba10283e5a53a8a11424f4867bbcf (patch)
treed81e452bf8db98a539f0f55ecb5445b96d4a61c5
parent371bab05947b32f26d1b32922e5dc38343a875bc (diff)
patch 9.1.0493: Test for patch 9.1.0489 doesn't fail without the fixv9.1.0493
Problem: Test for patch 9.1.0489 doesn't fail without the fix. Solution: Use "!" flag of feedkeys() so that ex_normal_busy is not set and ins_compl_check_keys() is not skipped (zeertzjq). closes: #15018 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/testdir/test_ins_complete.vim9
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 51e3c1b5b6..48589ce188 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -2573,14 +2573,17 @@ func Test_complete_fuzzy_match()
call feedkeys("S\<C-x>\<C-o>fb\<C-n>", 'tx')
call assert_equal('fooBaz', g:word)
- " avoid break default completion behavior
+ " avoid breaking default completion behavior
set completeopt=fuzzy,menu
call setline(1, ['hello help hero h'])
- exe "norm! A\<C-X>\<C-N>"
+ " Use "!" flag of feedkeys() so that ex_normal_busy is not set and
+ " ins_compl_check_keys() is not skipped.
+ " Add a "0" after the <Esc> to avoid waiting for an escape sequence.
+ call feedkeys("A\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('hello help hero hello', getline('.'))
set completeopt+=noinsert
call setline(1, ['hello help hero h'])
- exe "norm! A\<C-X>\<C-N>"
+ call feedkeys("A\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('hello help hero h', getline('.'))
" clean up
diff --git a/src/version.c b/src/version.c
index abfcf3f568..3817c9b1b4 100644
--- 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 */
/**/
+ 493,
+/**/
492,
/**/
491,