Merge pull request #1724 from fwalch/vim-7.4.452

vim-patch:7.4.449, vim-patch:7.4.452

5 files changed, 23 insertions, 2 deletions

diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 87f095e56d..52b61394e3 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -96,6 +96,9 @@ Help on help files					*helphelp*
 			find a tag in a file with the same language as the
 			current file.  See |help-translated|.
 
+							*:helpc* *:helpclose*
+:helpc[lose]            Close one help window.
+
 							*:helpg* *:helpgrep*
 :helpg[rep] {pattern}[@xx]
 			Search all help text files and make a list of lines
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 01ec37b5a0..a4d25681ca 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1242,6 +1242,7 @@ tag	      command	      action ~
 |:gvim|		:gv[im]		start the GUI
 |:hardcopy|	:ha[rdcopy]	send text to the printer
 |:help|		:h[elp]		open a help window
+|:helpclose|	:helpc[lose]	close one help window
 |:helpfind|	:helpf[ind]	dialog to open a help window
 |:helpgrep|	:helpg[rep]	like ":grep" but searches help files
 |:helptags|	:helpt[ags]	generate help tags for a directory
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index a8d2f5589e..3278de3561 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -5644,6 +5644,18 @@ struct sign
 static sign_T   *first_sign = NULL;
 static int      next_sign_typenr = 1;
 
+/*
+ * ":helpclose": Close one help window
+ */
+void ex_helpclose(exarg_T *eap)
+{
+  FOR_ALL_WINDOWS_IN_TAB(win, curtab) {
+    if (win->w_buffer->b_help) {
+      win_close(win, FALSE);
+      return;
+    }
+  }
+}
 
 static char *cmds[] = {
 			"define",
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 5cd69232aa..d5d6d39616 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -841,6 +841,11 @@ return {
     func='ex_help',
   },
   {
+    command='helpclose',
+    flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
+    func='ex_helpclose',
+  },
+  {
     command='helpfind',
     flags=bit.bor(EXTRA, NOTRLCOM),
     func='ex_helpfind',
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f3897212fa..cff8e93470 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -285,10 +285,10 @@ static int included_patches[] = {
   455,
   454,
   //453 NA
-  //452,
+  452,
   //451,
   //450,
-  //449,
+  449,
   //448 NA
   447,
   //446,