summaryrefslogtreecommitdiff
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-07-10 14:10:50 +0200
committerBram Moolenaar <Bram@vim.org>2010-07-10 14:10:50 +0200
commit06a108f34ccfffcf21481aad7743717672f2fd56 (patch)
tree462a310532a51ceb695408e3c9429c6ff66e81f2 /src/testdir
parent0bc380a96b87ee02b01a7d4677ad4d973563a84e (diff)
downloadvim-git-06a108f34ccfffcf21481aad7743717672f2fd56.tar.gz
Improve test for joining lines. (Milan Vancura)
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/test29.in51
-rw-r--r--src/testdir/test29.ok21
2 files changed, 41 insertions, 31 deletions
diff --git a/src/testdir/test29.in b/src/testdir/test29.in
index de93ccc22..829961c4d 100644
--- 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 076f77c98..97abf082a 100644
--- 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