Improve test for joining lines. (Milan Vancura)

diff --git a/src/testdir/test29.in b/src/testdir/test29.in
index de93ccc22e04db880c3200db9e06ad5a7a04542f..829961c4de5200f759c202f065d59746f7cdb281 100644 (file)
--- a/src/testdir/test29.in
+++ b/src/testdir/test29.in
@@ -1,10 +1,18 @@
-Test for joining lines with 'joinspaces' set or not
+Test for joining lines and marks in them
+ in compatible and nocompatible modes
+ and with 'joinspaces' set or not
+ and with 'cpoptions' flag 'j' set or not
 
 STARTTEST
+:set nocompatible
 :set nojoinspaces
+:set cpoptions-=j
 /firstline/
-jJjJjJjJjJjJjJjJjJjJjJjJjJjJ:set joinspaces
-jJjJjJjJjJjJjJjJjJjJjJjJjJjJ:?firstline?+1,$w! test.out
+j"tdGpJjJjJjJjJjJjJjJjJjJjJjJjJjJj05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions+=j
+j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions-=j joinspaces
+j"tpJjJjJjJjJjJjJjJjJjJjJjJjJjJj05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions+=j
+j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions-=j nojoinspaces compatible
+j"tpJjJjJjJjJjJjJjJjJjJjJjJjJjJj4Jy3l$pjdG:?firstline?+1,$w! test.out
 :qa!
 ENDTEST
 
@@ -37,31 +45,12 @@ asdfasdf
 asdf
 asdfasdf               
 asdf
-asdfasdf.
-asdf
-asdfasdf. 
-asdf
-asdfasdf.  
-asdf
-asdfasdf.      
-asdf
-asdfasdf.      
-asdf
-asdfasdf.       
-asdf
-asdfasdf.              
-asdf
-asdfasdf
-asdf
-asdfasdf 
-asdf
-asdfasdf  
-asdf
-asdfasdf       
-asdf
-asdfasdf        
-asdf
-asdfasdf       
-asdf
-asdfasdf               
-asdf
+zx cvn.
+as dfg?
+hjkl iop!
+ert
+zx cvn.
+as dfg?
+hjkl iop!
+ert
+

diff --git a/src/testdir/test29.ok b/src/testdir/test29.ok
index 076f77c98ca0d5dae0900902288316933803d8e5..97abf082afe0f4457a48e7cedd2114e2312ed06a 100644 (file)
--- a/src/testdir/test29.ok
+++ b/src/testdir/test29.ok
@@ -12,6 +12,9 @@ asdfasdf      asdf
 asdfasdf        asdf
 asdfasdf       asdf
 asdfasdf               asdf
+zx cvn. as dfg? hjkl iop! ert ernop
+zx cvn. as dfg? hjkl iop! ert ernop
+
 asdfasdf.  asdf
 asdfasdf.  asdf
 asdfasdf.  asdf
@@ -26,3 +29,21 @@ asdfasdf     asdf
 asdfasdf        asdf
 asdfasdf       asdf
 asdfasdf               asdf
+zx cvn.  as dfg?  hjkl iop!  ert  enop
+zx cvn.  as dfg? hjkl iop! ert ernop
+
+asdfasdf.  asdf
+asdfasdf.  asdf
+asdfasdf.  asdf
+asdfasdf.      asdf
+asdfasdf.      asdf
+asdfasdf.       asdf
+asdfasdf.              asdf
+asdfasdf asdf
+asdfasdf asdf
+asdfasdf  asdf
+asdfasdf       asdf
+asdfasdf        asdf
+asdfasdf       asdf
+asdfasdf               asdf
+zx cvn.  as dfg? hjkl iop! ert  a