Merge pull request #1225 from mhinz/p7.4.454

vim-patch:7.4.454

2 files changed, 19 insertions, 4 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index bcde020839..1482ec4a5a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -184,6 +184,19 @@ static char *(features[]) = {
 };
 
 static int included_patches[] = {
+  //457,
+  //456,
+  //455,
+  454,
+  //453,
+  //452,
+  //451,
+  //450,
+  //449,
+  //448,
+  //447,
+  //446,
+  //445,
   //444,
   //443,
   //442,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 2a6dcf1743..4f94284186 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -364,14 +364,16 @@ newwindow:
   /*FALLTHROUGH*/
   case ']':
   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)
       postponed_split = Prenum;
     else
       postponed_split = -1;
+    g_do_tagpreview = 0;
 
-    /* Execute the command right here, required when
-     * "wincmd ]" was used in a function. */
+    // Execute the command right here, required when
+    // "wincmd ]" was used in a function.
     do_nv_ident(Ctrl_RSB, NUL);
     break;
 
@@ -457,7 +459,7 @@ wingotofile:
     /*FALLTHROUGH*/
     case ']':
     case Ctrl_RSB:
-      reset_VIsual_and_resel();                         /* stop Visual mode */
+      // Keep visual mode, can select words to use as a tag.
       if (Prenum)
         postponed_split = Prenum;
       else