From 78a4c73cf06aaf8cd496d39bbbeaef821906fc25 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 21 Mar 2017 14:11:27 +0100
Subject: [PATCH] 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
---
 src/nvim/testdir/test_tabpage.vim | 2 +-
 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,