vim-patch:7.4.2228

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

9e4d8215d3

src/nvim/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

src/nvim/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

src/nvim/testdir/test_help_tagjump.vim

@@ -162,4 +162,4 @@ func Test_help_complete()
   endtry
 endfunc
 
-" vim: et sw=2:
+" vim: shiftwidth=2 sts=2 expandtab

src/nvim/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

src/nvim/testdir/test_increment_dbcs.vim

@@ -26,4 +26,4 @@ func Test_increment_dbcs_1()
   call assert_equal([0, 1, 13, 0], getpos('.'))
 endfunc
 
-" vim: shiftwidth=2 expandtab
+" vim: shiftwidth=2 sts=2 expandtab

src/nvim/testdir/test_match.vim

@@ -231,4 +231,4 @@ func Test_matchaddpos_using_negative_priority()
   set hlsearch&
 endfunc
 
-" vim: et ts=2 sw=2
+" vim: shiftwidth=2 sts=2 expandtab

src/nvim/testdir/test_tagjump.vim

@@ -6,4 +6,5 @@ func Test_ptag_with_notagstack()
   call assert_fails('ptag does_not_exist_tag_name', 'E426')
   set tagstack&vim
 endfunc
-" vim: sw=2 et
+
+" vim: shiftwidth=2 sts=2 expandtab

src/nvim/testdir/test_timers.vim

@@ -52,4 +52,5 @@ func Test_retain_partial()
   call garbagecollect()
   sleep 200m
 endfunc
-" vim: ts=2 sw=0 et
+
+" vim: shiftwidth=2 sts=2 expandtab

src/nvim/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

src/nvim/version.c

@@ -213,7 +213,7 @@ static int included_patches[] = {
   // 2231,
   2230,
   // 2229,
-  // 2228,
+  2228,
   2227,
   2226,
   2225,