changeset 24230:ed0fc4787392 v8.2.2656

patch 8.2.2656: some command line arguments and regexp errors not tested Commit: https://github.com/vim/vim/commit/a2b3e7dc9201fb3d8782c6b4ab53862160e254da Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 26 17:24:34 2021 +0100 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 https://github.com/vim/vim/issues/8013)
author Bram Moolenaar <Bram@vim.org>
date Fri, 26 Mar 2021 17:30:03 +0100
parents 4d37f1051de6
children 5b44b4399829
files src/testdir/test_regexp_latin.vim src/testdir/test_startup.vim src/version.c
diffstat 3 files changed, 24 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_regexp_latin.vim
+++ b/src/testdir/test_regexp_latin.vim
@@ -924,8 +924,17 @@ func Test_regexp_error()
   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
 
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -860,10 +860,12 @@ func Test_t_arg()
         \ '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 @@ func Test_w_arg()
 
   " 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
 
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2656,
+/**/
     2655,
 /**/
     2654,