From ba8ec7e963d944f6acbc2983db24144d63939b85 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Sun, 7 Feb 2016 17:28:54 +0900
Subject: vim-patch:7.4.742

Problem:    Cannot specify a vertical split when loading a buffer for a
            quickfix command.
Solution:   Add the "vsplit" value to 'switchbuf'. (Brook Hong)

https://github.com/vim/vim/commit/a594d77ffcccf2ac0e4079c41342ca55d4c9bb08
---
 src/nvim/buffer.c      | 29 ++++++++++++++++++-----------
 src/nvim/option_defs.h |  3 ++-
 src/nvim/version.c     |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 34e24712cd..0883ee93b8 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1601,21 +1601,28 @@ int buflist_getfile(int n, linenr_T lnum, int options, int forceit)
     col = 0;
 
   if (options & GETF_SWITCH) {
-    /* If 'switchbuf' contains "useopen": jump to first window containing
-     * "buf" if one exists */
-    if (swb_flags & SWB_USEOPEN)
+    // If 'switchbuf' contains "useopen": jump to first window containing
+    // "buf" if one exists
+    if (swb_flags & SWB_USEOPEN) {
       wp = buf_jump_open_win(buf);
-    /* If 'switchbuf' contains "usetab": jump to first window in any tab
-     * page containing "buf" if one exists */
-    if (wp == NULL && (swb_flags & SWB_USETAB))
+    }
+
+    // If 'switchbuf' contains "usetab": jump to first window in any tab
+    // page containing "buf" if one exists
+    if (wp == NULL && (swb_flags & SWB_USETAB)) {
       wp = buf_jump_open_tab(buf);
-    /* If 'switchbuf' contains "split" or "newtab" and the current buffer
-     * isn't empty: open new window */
-    if (wp == NULL && (swb_flags & (SWB_SPLIT | SWB_NEWTAB)) && !bufempty()) {
-      if (swb_flags & SWB_NEWTAB)               /* Open in a new tab */
+    }
+
+    // If 'switchbuf' contains "split", "vsplit" or "newtab" and the
+    // current buffer isn't empty: open new tab or window
+    if (wp == NULL && (swb_flags & (SWB_VSPLIT | SWB_SPLIT | SWB_NEWTAB))
+        && !bufempty()) {
+      if (swb_flags & SWB_NEWTAB) {
         tabpage_new();
-      else if (win_split(0, 0) == FAIL)         /* Open in a new window */
+      } else if (win_split(0, (swb_flags & SWB_VSPLIT) ? WSP_VERT : 0)
+                 == FAIL) {
         return FAIL;
+      }
       RESET_BINDING(curwin);
     }
   }
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 11b5e31f77..d37b15b142 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -571,12 +571,13 @@ EXTERN char_u   *p_su;          // 'suffixes'
 EXTERN char_u   *p_swb;         // 'switchbuf'
 EXTERN unsigned swb_flags;
 #ifdef IN_OPTION_C
-static char *(p_swb_values[]) = {"useopen", "usetab", "split", "newtab", NULL};
+static char *(p_swb_values[]) = {"useopen", "usetab", "split", "newtab", "vsplit", NULL};
 #endif
 #define SWB_USEOPEN             0x001
 #define SWB_USETAB              0x002
 #define SWB_SPLIT               0x004
 #define SWB_NEWTAB              0x008
+#define SWB_VSPLIT              0x010
 EXTERN int p_tbs;               /* 'tagbsearch' */
 EXTERN long p_tl;               /* 'taglength' */
 EXTERN int p_tr;                /* 'tagrelative' */
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 026eab46d0..7d03969d81 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -546,7 +546,7 @@ static int included_patches[] = {
   745,
   // 744 NA
   // 743,
-  // 742,
+  742,
   741,
   740,
   739,
-- 
cgit