patch 8.2.2656: some command line arguments and regexp errors not tested
Problem: Some command line arguments and regexp errors not tested.
Solution: Add a few test cases. (Dominique Pellé, closes #8013)
diff --git a/src/testdir/test_regexp_latin.vim b/src/testdir/test_regexp_latin.vim
index 0b00244..e53a8da 100644
--- a/src/testdir/test_regexp_latin.vim
+++ b/src/testdir/test_regexp_latin.vim
@@ -924,8 +924,17 @@
call assert_fails("call matchlist('x x', '\\%#=1 \\ze*')", 'E888:')
call assert_fails("call matchlist('x x', '\\%#=2 \\zs*')", 'E888:')
call assert_fails("call matchlist('x x', '\\%#=2 \\ze*')", 'E888:')
- call assert_fails('exe "normal /\\%#=1\\%[x\\%[x]]\<CR>"', 'E369:')
call assert_fails("call matchstr('abcd', '\\%o841\\%o142')", 'E678:')
+ call assert_fails("call matchstr('abcd', '\\%#=2\\%2147483647c')", 'E951:')
+ call assert_fails("call matchstr('abcd', '\\%#=2\\%2147483647l')", 'E951:')
+ call assert_fails("call matchstr('abcd', '\\%#=2\\%2147483647v')", 'E951:')
+ call assert_fails('exe "normal /\\%#=1\\%[x\\%[x]]\<CR>"', 'E369:')
+ call assert_fails('exe "normal /\\%#=2\\%2147483647l\<CR>"', 'E951:')
+ call assert_fails('exe "normal /\\%#=2\\%2147483647c\<CR>"', 'E951:')
+ call assert_fails('exe "normal /\\%#=2\\%102261126v\<CR>"', 'E951:')
+ call assert_fails('exe "normal /\\%#=2\\%2147483646l\<CR>"', 'E486:')
+ call assert_fails('exe "normal /\\%#=2\\%2147483646c\<CR>"', 'E486:')
+ call assert_fails('exe "normal /\\%#=2\\%102261125v\<CR>"', 'E486:')
call assert_equal('', matchstr('abcd', '\%o181\%o142'))
endfunc
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 0817c9e..323b019 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -860,10 +860,12 @@
\ 'Xtags')
call writefile([' first', ' second', ' third'], 'Xfile1')
- if RunVim(before, after, '-t second')
- call assert_equal(['Xfile1:L2C5'], readfile('Xtestout'))
- call delete('Xtestout')
- endif
+ for t_arg in ['-t second', '-tsecond']
+ if RunVim(before, after, '-t second')
+ call assert_equal(['Xfile1:L2C5'], readfile('Xtestout'), t_arg)
+ call delete('Xtestout')
+ endif
+ endfor
call delete('Xtags')
call delete('Xfile1')
@@ -1064,10 +1066,12 @@
" A number argument sets the 'window' option
call writefile(["iwindow \<C-R>=&window\<CR>\<Esc>:wq! Xresult\<CR>"], 'Xscriptin', 'b')
- if RunVim([], [], '-s Xscriptin -w 17')
- call assert_equal(["window 17"], readfile('Xresult'))
- call delete('Xresult')
- endif
+ for w_arg in ['-w 17', '-w17']
+ if RunVim([], [], '-s Xscriptin ' .. w_arg)
+ call assert_equal(["window 17"], readfile('Xresult'), w_arg)
+ call delete('Xresult')
+ endif
+ endfor
call delete('Xscriptin')
endfunc
diff --git a/src/version.c b/src/version.c
index 4cf2c0a..c1e795b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2656,
+/**/
2655,
/**/
2654,