summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-09-24 14:08:23 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-24 14:08:23 +0100
commit75f4bafabdcc6bce5cf3e09fee29c634bf102c17 (patch)
treeb8279da1d7ba5717740ab707efab124c76aac389
parentf7e7302acb20b6ef6caa0740da1450b677ac91fb (diff)
downloadvim-git-75f4bafabdcc6bce5cf3e09fee29c634bf102c17.tar.gz
patch 9.0.0572: insert complete tests leave a mapping behindv9.0.0572
Problem: Insert complete tests leave a mapping behind. Solution: Use a buffer-local mapping. (closes #11211)
-rw-r--r--src/testdir/test_ins_complete.vim5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index aca97d047..379db7fe7 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -701,8 +701,8 @@ endfunc
" Test for using complete() with completeopt+=longest
func Test_complete_with_longest()
- inoremap <f3> <cmd>call complete(1, ["iaax", "iaay", "iaaz"])<cr>
new
+ inoremap <buffer> <f3> <cmd>call complete(1, ["iaax", "iaay", "iaaz"])<cr>
" default: insert first match
set completeopt&
@@ -716,6 +716,7 @@ func Test_complete_with_longest()
exe "normal Aa\<f3>\<esc>"
call assert_equal('iaa', getline(1))
set completeopt&
+ bwipe!
endfunc
@@ -1272,7 +1273,7 @@ endfunc
" A mapping is not used for the key after CTRL-X.
func Test_no_mapping_for_ctrl_x_key()
new
- inoremap <C-K> <Cmd>let was_mapped = 'yes'<CR>
+ inoremap <buffer> <C-K> <Cmd>let was_mapped = 'yes'<CR>
setlocal dictionary=README.txt
call feedkeys("aexam\<C-X>\<C-K> ", 'xt')
call assert_equal('example ', getline(1))
diff --git a/src/version.c b/src/version.c
index ad6a9edfe..b07c0131d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 572,
+/**/
571,
/**/
570,