patch 7.4.2228

Problem:    Test files have inconsistant modelines.
Solution:   Don't set 'tabstop' to 2, use 'sts' and 'sw'.

diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index 534f05fd5333a6913a01eb0c7b20f16b8e882d90..3b2e101c8f8e57cc63608b45a6a83133c928180d 100644 (file)
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -3,11 +3,12 @@ This directory contains tests for various Vim features.
 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:

diff --git a/src/testdir/test_backspace_opt.vim b/src/testdir/test_backspace_opt.vim
index 7fbba96c6669ce3c50d41ddc45b0751df2afdef4..fd81f42b66cd9392dd2b83e65fb329511616c7e8 100644 (file)
--- 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

diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 95500853f2f56c873530c17e9b8b5aa2764a9e6b..6290680305c48e3843355596aff487fdad717c8b 100644 (file)
--- 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

diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index 3eca99bd99f3eb11758107b3445001bda121f7db..7a5cdabaa324832487bfe65b585ca74123018129 100644 (file)
--- 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

diff --git a/src/testdir/test_help_tagjump.vim b/src/testdir/test_help_tagjump.vim
index 0f14ade6baea0d1f86f8479365507cda468242e9..778bd9c71f43182c5b26c187f986a797dc897349 100644 (file)
--- 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

diff --git a/src/testdir/test_increment.vim b/src/testdir/test_increment.vim
index e53b5697169965184f0a755cfbca09f8f0a6283a..8bfd95d8109137e313ac9fb2b5aaa8b6c8ec8980 100644 (file)
--- 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

diff --git a/src/testdir/test_increment_dbcs.vim b/src/testdir/test_increment_dbcs.vim
index e1b663293eaffc67357bfe5b069c9442119e42be..dea405c63373bbe889d4a0c35ad3b5dc6f469e62 100644 (file)
--- 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

diff --git a/src/testdir/test_match.vim b/src/testdir/test_match.vim
index 67f3ea737393ec115f16e7ae10b9e293215c5f16..000893673b82976fcf22c0d2cb90f4f6a8f1fe82 100644 (file)
--- 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

diff --git a/src/testdir/test_regexp_latin.vim b/src/testdir/test_regexp_latin.vim
index ea3b2e73920b09c7cb7607fa05a18d1412e01157..b3d258e0976b3f4da345cfdc61182f060a7062c0 100644 (file)
--- 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
-

diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim
index 97d86e6ecba56510985e7b210d36cbe309dbbb69..b22bde8047cbb3849e8006536b632fb0ba1291ce 100644 (file)
--- 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

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index f334c17464a242666d5a6b7ffb14a4036d8222ac..46777d1ea5993b59bc09357eb9cb59172ade1c30 100644 (file)
--- 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

diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index b7f41a711b0339492f48c0b4a904a83a830b62d1..569a78a0ed748de58912ec0b8c54932885313e1a 100644 (file)
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -67,4 +67,4 @@ function Test_window_cmd_wincmd_gf()
   augroup! test_window_cmd_wincmd_gf
 endfunc
 
-" vim: sw=2 et
+" vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 06aeb290eb9dad1f5a72fefe58b06d32e7bb9000..6486e6a67facae8db791aaaa75db563ca026e674 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2228,
 /**/
     2227,
 /**/