Merge pull request #1724 from fwalch/vim-7.4.452

vim-patch:7.4.449, vim-patch:7.4.452
This commit is contained in:
Justin M. Keyes 2014-12-23 14:50:36 -05:00
commit 44fabac4e0
5 changed files with 23 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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",

View File

@ -840,6 +840,11 @@ return {
flags=bit.bor(BANG, EXTRA, NOTRLCOM),
func='ex_help',
},
{
command='helpclose',
flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
func='ex_helpclose',
},
{
command='helpfind',
flags=bit.bor(EXTRA, NOTRLCOM),

View File

@ -285,10 +285,10 @@ static int included_patches[] = {
455,
454,
//453 NA
//452,
452,
//451,
//450,
//449,
449,
//448 NA
447,
//446,