summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-15 16:53:26 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-15 16:53:26 +0100
commit85a7cb4dcf50aa562ff1fc872bfc1b50a5a9e368 (patch)
treede42754a4572420dc046ffe073cde3b300deb753
parent8e15ffcde757ffc6cfe8b5e384948b3278e9af33 (diff)
downloadvim-git-85a7cb4dcf50aa562ff1fc872bfc1b50a5a9e368.tar.gz
patch 7.4.1572v7.4.1572
Problem: Setting 'compatible' in test influences following tests. Solution: Turn 'compatible' off again.
-rw-r--r--src/testdir/test_backspace_opt.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_backspace_opt.vim b/src/testdir/test_backspace_opt.vim
index 5793e3486..f80e831e9 100644
--- 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 944ffea31..51068b432 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1572,
+/**/
1571,
/**/
1570,