From 9af8cd768d79e226d494d9387463cf9d8c35e0af Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 2 Dec 2016 16:04:47 -0700
Subject: vim-patch:7.4.1835

Problem:    When splitting and closing a window the status height changes.
Solution:   Compute the frame height correctly. (Hirohito Higashi)

https://github.com/vim/vim/commit/991dea3ab185fb35e577ab0bdfd443cd4b43ccc6
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 05855ee385..b60cecf7f9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -607,7 +607,7 @@ static int included_patches[] = {
   // 1838,
   // 1837,
   // 1836,
-  // 1835,
+  1835,
   // 1834,
   1833,
   1832,
-- 
cgit 


From 34efe443acf06a63c6521cd0c6b19bcbb9cc44ac Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 2 Dec 2016 17:28:54 -0700
Subject: vim-patch:7.4.1956

Problem:    When using CTRL-W f and pressing "q" at the ATTENTION dialog the
            newly opened window is not closed.
Solution:   Close the window and go back to the original one. (Norio Takagi,
            Hirohito Higashi)

https://github.com/vim/vim/commit/5d2ca0402954ff79b73d9c86cc16c8a6454b75a7
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index b60cecf7f9..431c92d436 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -486,7 +486,7 @@ static int included_patches[] = {
   // 1959 NA
   // 1958 NA
   // 1957 NA
-  // 1956,
+  1956,
   // 1955,
   // 1954,
   // 1953,
-- 
cgit