diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-21 14:11:27 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-22 18:42:59 +0100 |
| commit | 78a4c73cf06aaf8cd496d39bbbeaef821906fc25 (patch) | |
| tree | 4a5083550651383e262320fcdbb7ac5a86b85ac8 | |
| parent | 89abed7d852518528051c1c0fdf84d34d3d8c2d5 (diff) | |
| download | rneovim-78a4c73cf06aaf8cd496d39bbbeaef821906fc25.tar.gz rneovim-78a4c73cf06aaf8cd496d39bbbeaef821906fc25.tar.bz2 rneovim-78a4c73cf06aaf8cd496d39bbbeaef821906fc25.zip | |
vim-patch:7.4.2339
Problem: Tab page test fails when run as fake root.
Solution: Check 'buftype' instead of 'filetype'. (James McCoy, closes vim/vim#1042)
https://github.com/vim/vim/commit/100f5c90f4d4fb40bc3aeabc35192db371f5988f
| -rw-r--r-- | src/nvim/testdir/test_tabpage.vim | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_tabpage.vim b/src/nvim/testdir/test_tabpage.vim index c2aadcea6e..870cb4da13 100644 --- a/src/nvim/testdir/test_tabpage.vim +++ b/src/nvim/testdir/test_tabpage.vim @@ -205,7 +205,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/nvim/version.c b/src/nvim/version.c index 1b6e513c49..db3b9b51b2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -102,7 +102,7 @@ static int included_patches[] = { // 2342 NA 2341, // 2340 NA - // 2339, + 2339, // 2338 NA 2337, 2336, |