diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-09-06 21:33:52 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-09-06 21:33:52 +0200 |
commit | 100f5c90f4d4fb40bc3aeabc35192db371f5988f (patch) | |
tree | 2a659ab8fb45bfb406ed36c2a9a8197b2f183c7b | |
parent | 7947312871e7d01cdba058199904c212ec32f1c0 (diff) |
patch 7.4.2339v7.4.2339
Problem: Tab page test fails when run as fake root.
Solution: Check 'buftype' instead of 'filetype'. (James McCoy, closes #1042)
-rw-r--r-- | src/testdir/test_tabpage.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 0bf7d056de..4bee7956d7 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -195,7 +195,7 @@ function Test_tabpage_with_tab_modifier() exec 'tabnext ' . a:pre_nr exec a:cmd call assert_equal(a:post_nr, tabpagenr()) - call assert_equal('help', &filetype) + call assert_equal('help', &buftype) helpclose endfunc diff --git a/src/version.c b/src/version.c index 79628cba79..9214ce7d57 100644 --- 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 */ /**/ + 2339, +/**/ 2338, /**/ 2337, |