From 133d79a3584edfd1fa546ebe823580e3caac6c87 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Wed, 12 May 2021 14:19:43 +0900
Subject: vim-patch:8.2.3616: arglist test does not clear the argument list
 consistently

Problem:    Arglist test does not clear the argument list consistently.
Solution:   Call Reset_arglist(). (Shougo Matsushita, closes vim/vim#9154)
https://github.com/vim/vim/commit/3cad47038547e694cfa26ba39c399f610d2054bd
---
 src/nvim/testdir/test_arglist.vim | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/nvim/testdir/test_arglist.vim')

diff --git a/src/nvim/testdir/test_arglist.vim b/src/nvim/testdir/test_arglist.vim
index 8fd60d6a5a..9f1e6ef044 100644
--- a/src/nvim/testdir/test_arglist.vim
+++ b/src/nvim/testdir/test_arglist.vim
@@ -1,5 +1,10 @@
 " Test argument list commands
 
+func Reset_arglist()
+  cd
+  args a | %argd
+endfunc
+
 func Test_argidx()
   args a b c
   last
@@ -26,6 +31,8 @@ func Test_argidx()
 endfunc
 
 func Test_argadd()
+  call Reset_arglist()
+
   %argdelete
   argadd a b c
   call assert_equal(0, argidx())
@@ -115,8 +122,7 @@ endfunc
 " Test for [count]argument and [count]argdelete commands
 " Ported from the test_argument_count.in test script
 func Test_argument()
-  " Clean the argument list
-  arga a | %argd
+  call Reset_arglist()
 
   let save_hidden = &hidden
   set hidden
@@ -244,8 +250,7 @@ endfunc
 " Test for 0argadd and 0argedit
 " Ported from the test_argument_0count.in test script
 func Test_zero_argadd()
-  " Clean the argument list
-  arga a | %argd
+  call Reset_arglist()
 
   arga a b c d
   2argu
@@ -272,10 +277,6 @@ func Test_zero_argadd()
   call assert_equal('file with spaces', expand('%'))
 endfunc
 
-func Reset_arglist()
-  args a | %argd
-endfunc
-
 " Test for argc()
 func Test_argc()
   call Reset_arglist()
@@ -408,6 +409,7 @@ endfunc
 " Test for the :argdelete command
 func Test_argdelete()
   call Reset_arglist()
+
   args aa a aaa b bb
   argdelete a*
   call assert_equal(['b', 'bb'], argv())
-- 
cgit 


From a11cec08e5a5bfc2bd9f6f3d72d3ef6225c32efc Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sun, 23 May 2021 14:20:59 +0900
Subject: fix: for reviews

---
 src/nvim/testdir/test_arglist.vim | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/nvim/testdir/test_arglist.vim')

diff --git a/src/nvim/testdir/test_arglist.vim b/src/nvim/testdir/test_arglist.vim
index 9f1e6ef044..7215677e2d 100644
--- a/src/nvim/testdir/test_arglist.vim
+++ b/src/nvim/testdir/test_arglist.vim
@@ -1,7 +1,6 @@
 " Test argument list commands
 
 func Reset_arglist()
-  cd
   args a | %argd
 endfunc
 
-- 
cgit 


From 18d7ec36f3a664174b46845d01bccab4eba6fc5b Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sun, 23 May 2021 14:25:06 +0900
Subject: fix: remove unnecessary changes

---
 src/nvim/testdir/test_arglist.vim | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/nvim/testdir/test_arglist.vim')

diff --git a/src/nvim/testdir/test_arglist.vim b/src/nvim/testdir/test_arglist.vim
index 7215677e2d..164149476f 100644
--- a/src/nvim/testdir/test_arglist.vim
+++ b/src/nvim/testdir/test_arglist.vim
@@ -408,7 +408,6 @@ endfunc
 " Test for the :argdelete command
 func Test_argdelete()
   call Reset_arglist()
-
   args aa a aaa b bb
   argdelete a*
   call assert_equal(['b', 'bb'], argv())
-- 
cgit