Merge pull request #1225 from mhinz/p7.4.454

vim-patch:7.4.454
This commit is contained in:
Justin M. Keyes 2014-09-26 16:08:48 -04:00
commit 4b0f524915
2 changed files with 19 additions and 4 deletions

View File

@ -184,6 +184,19 @@ static char *(features[]) = {
}; };
static int included_patches[] = { static int included_patches[] = {
//457,
//456,
//455,
454,
//453,
//452,
//451,
//450,
//449,
//448,
//447,
//446,
//445,
//444, //444,
//443, //443,
//442, //442,

View File

@ -364,14 +364,16 @@ newwindow:
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case ']': case ']':
case Ctrl_RSB: case Ctrl_RSB:
CHECK_CMDWIN reset_VIsual_and_resel(); /* stop Visual mode */ CHECK_CMDWIN
// Keep visual mode, can select words to use as a tag.
if (Prenum) if (Prenum)
postponed_split = Prenum; postponed_split = Prenum;
else else
postponed_split = -1; postponed_split = -1;
g_do_tagpreview = 0;
/* Execute the command right here, required when // Execute the command right here, required when
* "wincmd ]" was used in a function. */ // "wincmd ]" was used in a function.
do_nv_ident(Ctrl_RSB, NUL); do_nv_ident(Ctrl_RSB, NUL);
break; break;
@ -457,7 +459,7 @@ wingotofile:
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case ']': case ']':
case Ctrl_RSB: case Ctrl_RSB:
reset_VIsual_and_resel(); /* stop Visual mode */ // Keep visual mode, can select words to use as a tag.
if (Prenum) if (Prenum)
postponed_split = Prenum; postponed_split = Prenum;
else else