# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1471554905 -7200
# Node ID 3ee84d270ea75d4ed3d8ab8ba035c3bab27c860c
# Parent  2b6654519a7c0792ef2d413c33faf1ba6b1839bd
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'.

diff --git a/src/testdir/README.txt b/src/testdir/README.txt
--- 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:
diff --git a/src/testdir/test_backspace_opt.vim b/src/testdir/test_backspace_opt.vim
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2228,
+/**/
     2227,
 /**/
     2226,