diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-06-19 14:41:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-06-19 14:41:49 +0200 |
| commit | a594d77ffcccf2ac0e4079c41342ca55d4c9bb08 (patch) | |
| tree | cd5d4aefbcf18485f1c3fb3c247b67fc1752d33b | |
| parent | a7b7b1cef9b61700ba5076c1d889dce791392388 (diff) | |
patch 7.4.742v7.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)
| -rw-r--r-- | runtime/doc/options.txt | 1 | ||||
| -rw-r--r-- | src/buffer.c | 14 | ||||
| -rw-r--r-- | src/option.h | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 31210393bb..9cdf9bb58e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -7067,6 +7067,7 @@ A jump table for the options with a short description can be found at |Q_op|. split If included, split the current window before loading a buffer for a |quickfix| command that display errors. Otherwise: do not split, use current window. + vsplit Just like "split" but split vertically. newtab Like "split", but open a new tab page. Overrules "split" when both are present. diff --git a/src/buffer.c b/src/buffer.c index 6dfe007c28..97c6596042 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2071,17 +2071,21 @@ buflist_getfile(n, lnum, options, forceit) * "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)) 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 '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) /* Open in a new tab */ + 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/option.h b/src/option.h index b031466768..7c7d35abfe 100644 --- a/src/option.h +++ b/src/option.h @@ -765,12 +765,13 @@ EXTERN char_u *p_sws; /* 'swapsync' */ 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/version.c b/src/version.c index 6fc420cbd0..197b6ea0b9 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 742, +/**/ 741, /**/ 740, |