patch 7.4.1572

Problem:    Setting 'compatible' in test influences following tests.
Solution:   Turn 'compatible' off again.

diff --git a/src/testdir/test_backspace_opt.vim b/src/testdir/test_backspace_opt.vim
index 5793e348668d0cbf010bff50163a4d5fd5c2e569..f80e831e9aa1ba22b481c3cb71fee400c656cf8b 100644 (file)
--- a/src/testdir/test_backspace_opt.vim
+++ b/src/testdir/test_backspace_opt.vim
@@ -53,6 +53,7 @@ func Test_backspace_option()
   " Cleared when 'compatible' is set
   set compatible
   call assert_equal('', &backspace)
+  set nocompatible
 endfunc
 
 " vim: tabstop=2 shiftwidth=0 expandtab

diff --git a/src/version.c b/src/version.c
index 944ffea316e169753be33d1149457f267450278c..51068b43236cf3745f3989b2cae86080631108c5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1572,
 /**/
     1571,
 /**/