Allow the rest of the old tests to pass with nocp.

test40.in, test60.in, test_breakindent.in, test_listlbr.in, test_listlbr_utf8.in:
    To avoid <tab> triggering wildmode, set wildchar to 'cp' default.

test_breakindent.ok:
    Modify expectations to avoid cpoptions+=n
This commit is contained in:
Julian Mehne
2014-11-21 12:11:39 +01:00
parent 62bd20b726
commit 6cba2eef21
7 changed files with 10 additions and 5 deletions

View File

@@ -1,3 +1,3 @@
:set nocp :set nocp nomore
:map dotest /^STARTTEST :map dotest /^STARTTEST
j:set ff=unix cpo-=A j:set ff=unix cpo-=A

View File

@@ -2,6 +2,7 @@ Test for "*Cmd" autocommands
STARTTEST STARTTEST
:so small.vim :so small.vim
:set wildchar=^E
:/^start/,$w! Xxx " write lines below to Xxx :/^start/,$w! Xxx " write lines below to Xxx
:au BufReadCmd XtestA 0r Xxx|$del :au BufReadCmd XtestA 0r Xxx|$del
:e XtestA " will read text of Xxd instead :e XtestA " will read text of Xxd instead

View File

@@ -2,6 +2,7 @@ Tests for the exists() and has() functions. vim: set ft=vim ts=8 sw=2 :
STARTTEST STARTTEST
:so small.vim :so small.vim
:set wildchar=^E
:function! RunTest(str, result) :function! RunTest(str, result)
if exists(a:str) == a:result if exists(a:str) == a:result
echo "OK" echo "OK"

View File

@@ -3,6 +3,7 @@ Test for breakindent
STARTTEST STARTTEST
:so small.vim :so small.vim
:if !exists("+breakindent") | e! test.ok | w! test.out | qa! | endif :if !exists("+breakindent") | e! test.ok | w! test.out | qa! | endif
:set wildchar=^E
:10new|:vsp|:vert resize 20 :10new|:vsp|:vert resize 20
:put =\"\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP\" :put =\"\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP\"
:set ts=4 sw=4 sts=4 breakindent :set ts=4 sw=4 sts=4 breakindent

View File

@@ -33,13 +33,13 @@ Test 4: Simple breakindent + min width: 18
Test 7: breakindent + shift by +1 + nu + sbr=? briopt:sbr Test 7: breakindent + shift by +1 + nu + sbr=? briopt:sbr
2 ab 2 ab
? m ? m
? x ? x
Test 8: breakindent + shift:1 + nu + sbr=# list briopt:sbr Test 8: breakindent + shift:1 + nu + sbr=# list briopt:sbr
2 ^Iabcd 2 ^Iabcd
# opq # opq
# BCD # BCD
Test 9: breakindent + shift by +1 + 'nu' + sbr=# list Test 9: breakindent + shift by +1 + 'nu' + sbr=# list
2 ^Iabcd 2 ^Iabcd

View File

@@ -3,6 +3,7 @@ Test for linebreak and list option (non-utf8)
STARTTEST STARTTEST
:so small.vim :so small.vim
:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif :if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
:set wildchar=^E
:10new|:vsp|:vert resize 20 :10new|:vsp|:vert resize 20
:put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \" :put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"
:norm! zt :norm! zt

View File

@@ -3,6 +3,7 @@ Test for linebreak and list option in utf-8 mode
STARTTEST STARTTEST
:so small.vim :so small.vim
:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif :if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
:set wildchar=^E
:so mbyte.vim :so mbyte.vim
:if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif :if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif
:10new|:vsp|:vert resize 20 :10new|:vsp|:vert resize 20