updated for version 7.2a-016

diff --git a/src/version.c b/src/version.c
index a9773ddbfaa96b5565d5b41b926f54d78379f1c2..0e2c9ed1091bcf8b9639320a4d8fba20203bc2c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    16,
 /**/
     15,
 /**/

diff --git a/src/window.c b/src/window.c
index a0f196bc458745cb58e4e7f8e8cf070b157ad71a..b1430a679e79e76b49a72f6c457833dd21eaf3b3 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -149,12 +149,18 @@ do_window(nchar, Prenum, xchar)
     case Ctrl_V:
     case 'v':
                CHECK_CMDWIN
-#ifdef FEAT_VISUAL
+# ifdef FEAT_VISUAL
                reset_VIsual_and_resel();       /* stop Visual mode */
-#endif
-#ifdef FEAT_GUI
+# endif
+# ifdef FEAT_QUICKFIX
+               /* When splitting the quickfix window open a new buffer in it,
+                * don't replicate the quickfix buffer. */
+               if (bt_quickfix(curbuf))
+                   goto newwindow;
+# endif
+# ifdef FEAT_GUI
                need_mouse_correct = TRUE;
-#endif
+# endif
                win_split((int)Prenum, WSP_VERT);
                break;
 #endif
@@ -168,7 +174,8 @@ do_window(nchar, Prenum, xchar)
 #endif
                STRCPY(cbuf, "split #");
                if (Prenum)
-                   sprintf((char *)cbuf + 7, "%ld", Prenum);
+                   vim_snprintf((char *)cbuf + 7, sizeof(cbuf) - 7,
+                                                              "%ld", Prenum);
                do_cmdline_cmd(cbuf);
                break;
 
@@ -183,9 +190,14 @@ do_window(nchar, Prenum, xchar)
 newwindow:
 #endif
                if (Prenum)
-                   sprintf((char *)cbuf, "%ld", Prenum); /* window height */
+                   /* window height */
+                   vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%ld", Prenum);
                else
                    cbuf[0] = NUL;
+#if defined(FEAT_VERTSPLIT) && defined(FEAT_QUICKFIX)
+               if (nchar == 'v' || nchar == Ctrl_V)
+                   STRCAT(cbuf, "v");
+#endif
                STRCAT(cbuf, "new");
                do_cmdline_cmd(cbuf);
                break;