aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Teichroeb <joel@teichroeb.net>2014-05-02 11:04:17 -0700
committerJulian Mehne <github@nmehne.de>2014-12-06 13:43:14 +0100
commit62bd20b72603c900e1dc70df9f3dac0b58733cbf (patch)
treed13d426a16e3a059f20618e96cc8dc50b908fabb
parentb574cb6422c839610e18b4b01f809c756084e83c (diff)
downloadrneovim-62bd20b72603c900e1dc70df9f3dac0b58733cbf.tar.gz
rneovim-62bd20b72603c900e1dc70df9f3dac0b58733cbf.tar.bz2
rneovim-62bd20b72603c900e1dc70df9f3dac0b58733cbf.zip
Allow most old tests to pass with nocp.
test69.in: because 'nocp' sets 'esckeys', add an extra <esc> to avoid 'tm' pause.
-rw-r--r--src/nvim/testdir/dotest.in2
-rw-r--r--src/nvim/testdir/test48.in2
-rw-r--r--src/nvim/testdir/test68.in4
-rw-r--r--src/nvim/testdir/test69.in8
4 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/testdir/dotest.in b/src/nvim/testdir/dotest.in
index b2a0e1a68e..a0b7a5b2f8 100644
--- a/src/nvim/testdir/dotest.in
+++ b/src/nvim/testdir/dotest.in
@@ -1,3 +1,3 @@
-:set cp
+:set nocp
:map dotest /^STARTTEST j:set ff=unix cpo-=A :.,/ENDTEST/-1w! Xdotest :set ff& cpo+=A nj0:so! Xdotest dotest
dotest
diff --git a/src/nvim/testdir/test48.in b/src/nvim/testdir/test48.in
index 48f4abbf75..25ea2fa154 100644
--- a/src/nvim/testdir/test48.in
+++ b/src/nvim/testdir/test48.in
@@ -4,7 +4,7 @@ STARTTEST
:so small.vim
:set noswf
:set ve=all
--dgg
+j-dgg
:"
:" Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword".
:" Repeating CTRL-N fixes it. (Mary Ellen Foster)
diff --git a/src/nvim/testdir/test68.in b/src/nvim/testdir/test68.in
index ceaf9af1ab..ca54e942b5 100644
--- a/src/nvim/testdir/test68.in
+++ b/src/nvim/testdir/test68.in
@@ -30,7 +30,7 @@ STARTTEST
/^{/+1
:set tw=3 fo=t
gqgqo
-a 
+a 
ENDTEST
{
@@ -99,7 +99,7 @@ ENDTEST
STARTTEST
/^{/+2
:set tw& fo=a
-I^^
+I^^
ENDTEST
{
diff --git a/src/nvim/testdir/test69.in b/src/nvim/testdir/test69.in
index 674dc32812..26f41e8a29 100644
--- a/src/nvim/testdir/test69.in
+++ b/src/nvim/testdir/test69.in
@@ -15,7 +15,7 @@ STARTTEST
:set tw=2 fo=t
gqgqjgqgqo
XYZ
-abc XYZ
+abc XYZ
ENDTEST
{
@@ -31,7 +31,7 @@ gqgqjgqgqjgqgqjgqgqjgqgqo
Xa
X a
XY
-X Y
+X Y
ENDTEST
{
@@ -55,7 +55,7 @@ aX
abX
abcX
abX c
-abXY
+abXY
ENDTEST
{
@@ -110,7 +110,7 @@ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
X YZ
XX
XXa
-XXY
+XXY
ENDTEST
{