summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-24 18:58:46 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-24 18:58:46 +0000
commit679140c56bbabf12a199d94f584b1b9dfc9809fd (patch)
tree5f11d87f6e44050d7577fdf806a551cb169ff32d
parent6f98371532fcff911b462d51bc64f2ce8a6ae682 (diff)
downloadvim-git-8.2.3885.tar.gz
patch 8.2.3885: arglist test failsv8.2.3885
Problem: Arglist test fails. Solution: Adjust for locking the arglist for ":all".
-rw-r--r--src/testdir/test_arglist.vim16
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 10 deletions
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index d29a228e6..ca7e2f8e2 100644
--- a/src/testdir/test_arglist.vim
+++ b/src/testdir/test_arglist.vim
@@ -484,18 +484,14 @@ func Test_arglist_autocmd()
new
" redefine arglist; go to Xxx1
next! Xxx1 Xxx2 Xxx3
- " open window for all args; Reading Xxx2 will change the arglist and the
- " third window will get Xxx1:
- " win 1: Xxx1
- " win 2: Xxx2
- " win 3: Xxx1
- all
+ " open window for all args; Reading Xxx2 will try to change the arglist and
+ " that will fail
+ call assert_fails("all", "E1156:")
call assert_equal('test file Xxx1', getline(1))
wincmd w
- wincmd w
- call assert_equal('test file Xxx1', getline(1))
- rewind
call assert_equal('test file Xxx2', getline(1))
+ wincmd w
+ call assert_equal('test file Xxx3', getline(1))
autocmd! BufReadPost Xxx2
enew! | only
@@ -586,7 +582,7 @@ endfunc
func Test_clear_arglist_in_all()
n 0 00 000 0000 00000 000000
au! * 0 n 0
- all
+ call assert_fails("all", "E1156")
au! *
endfunc
diff --git a/src/version.c b/src/version.c
index 7277d2f09..b7b5441e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3885,
+/**/
3884,
/**/
3883,