Mercurial > vim
changeset 9909:3ee84d270ea7 v7.4.2228
commit https://github.com/vim/vim/commit/9e4d8215d386100ab660d7d11e6620fd148b605e
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 18 23:04:48 2016 +0200
patch 7.4.2228
Problem: Test files have inconsistant modelines.
Solution: Don't set 'tabstop' to 2, use 'sts' and 'sw'.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 18 Aug 2016 23:15:05 +0200 |
| parents | 2b6654519a7c |
| children | 48fbbc83e702 |
| files | src/testdir/README.txt src/testdir/test_backspace_opt.vim src/testdir/test_digraph.vim src/testdir/test_gn.vim src/testdir/test_help_tagjump.vim src/testdir/test_increment.vim src/testdir/test_increment_dbcs.vim src/testdir/test_match.vim src/testdir/test_regexp_latin.vim src/testdir/test_tagjump.vim src/testdir/test_timers.vim src/testdir/test_window_cmd.vim src/version.c |
| diffstat | 13 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/README.txt +++ b/src/testdir/README.txt @@ -3,11 +3,12 @@ This directory contains tests for variou If it makes sense, add a new test method to an already existing file. You may want to separate it from other tests with comment lines. -The numbered tests are older, we have switched to named tests. +The numbered tests are older, we have switched to named tests. Don't add any +more numbered tests. And then you can choose between a new style test, which is a Vim script, or an old style test, which uses Normal mode commands. Use a new style test if you -can. +can. Use an old style test when it needs to run without the +eval feature. TO ADD A NEW STYLE TEST:
--- a/src/testdir/test_backspace_opt.vim +++ b/src/testdir/test_backspace_opt.vim @@ -56,4 +56,4 @@ func Test_backspace_option() set nocompatible viminfo+=nviminfo endfunc -" vim: tabstop=2 shiftwidth=0 expandtab +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_digraph.vim +++ b/src/testdir/test_digraph.vim @@ -458,4 +458,4 @@ func! Test_digraph_cmndline() call assert_equal("€", s) endfunc -" vim: tabstop=2 shiftwidth=0 sts=-1 expandtab +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_gn.vim +++ b/src/testdir/test_gn.vim @@ -90,4 +90,4 @@ func Test_gn_command() sil! %d _ endfu -" vim: tabstop=2 shiftwidth=0 expandtab +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_help_tagjump.vim +++ b/src/testdir/test_help_tagjump.vim @@ -150,4 +150,4 @@ func Test_help_complete() endtry endfunc -" vim: et sw=2: +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_increment.vim +++ b/src/testdir/test_increment.vim @@ -757,4 +757,4 @@ func Test_normal_increment_03() endfunc -" vim: tabstop=2 shiftwidth=2 expandtab +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_increment_dbcs.vim +++ b/src/testdir/test_increment_dbcs.vim @@ -27,4 +27,4 @@ func Test_increment_dbcs_1() call assert_equal([0, 1, 10, 0], getpos('.')) endfunc -" vim: shiftwidth=2 expandtab +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_match.vim +++ b/src/testdir/test_match.vim @@ -186,4 +186,4 @@ func Test_matchaddpos() set hlsearch& endfunc -" vim: et ts=2 sw=2 +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_regexp_latin.vim +++ b/src/testdir/test_regexp_latin.vim @@ -38,4 +38,3 @@ func Test_recursive_substitute() call setwinvar(1, 'myvar', 1) bwipe! endfunc -
--- a/src/testdir/test_tagjump.vim +++ b/src/testdir/test_tagjump.vim @@ -7,4 +7,4 @@ func Test_ptag_with_notagstack() set tagstack&vim endfunc -" vim: sw=2 et +" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -112,4 +112,4 @@ func Test_paused() call assert_inrange(0, 10, slept) endfunc -" vim: ts=2 sw=0 et +" vim: shiftwidth=2 sts=2 expandtab