aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Mehne <github@nmehne.de>2014-12-07 14:19:29 +0100
committerJoel Teichroeb <joel@teichroeb.net>2014-12-13 11:43:48 -0800
commita44f39955f232d26076edceb3c5d9f16ffde9cbd (patch)
tree4a09e967d18111c4535525282e20b2b21539415a
parent0ba6cb2f5cfe49ee1ee66c6246a77947af74ae5e (diff)
downloadrneovim-a44f39955f232d26076edceb3c5d9f16ffde9cbd.tar.gz
rneovim-a44f39955f232d26076edceb3c5d9f16ffde9cbd.tar.bz2
rneovim-a44f39955f232d26076edceb3c5d9f16ffde9cbd.zip
Make test29 work with nocompatible.
-rw-r--r--src/nvim/testdir/test29.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/testdir/test29.in b/src/nvim/testdir/test29.in
index 1d6cb6f4d1..83c6acdc1c 100644
--- a/src/nvim/testdir/test29.in
+++ b/src/nvim/testdir/test29.in
@@ -5,7 +5,7 @@ Test for joining lines and marks in them
STARTTEST
:so small.vim
-:set nocompatible viminfo+=nviminfo
+:set viminfo+=nviminfo
:set nojoinspaces
:set cpoptions-=j
/firstline/
@@ -13,7 +13,7 @@ j"td/^STARTTEST/-1
PJjJjJjJjJjJjJjJjJjJjJjJjJjJj05lmx2j06lmy2k4Jy3l$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
+j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpo+=qo
j"tpJjJjJjJjJjJjJjJjJjJjJjJjJjJj4Jy3l$pjd/STARTTEST/-2
ENDTEST
@@ -104,7 +104,7 @@ if (condition) // Remove the next comment leader!
STARTTEST
:" Test with backspace set to the non-compatible setting
/^\d\+ this
-:set cp bs=2
+:set bs=2
Avim1
Avim2u
:set cpo-=<
@@ -118,7 +118,7 @@ A vim5A
A vim6Azweiu
:inoremap <c-u> <left><c-u>
A vim7
-:set cp
+:set noesckeys
ENDTEST
1 this shouldn't be deleted
2 this shouldn't be deleted