Mercurial > vim
changeset 6843:50cdebea094f v7.4.742
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 19 Jun 2015 14:41:49 +0200 |
| parents | 948e22983cd3 |
| children | 68c25dd3873a |
| files | runtime/doc/options.txt src/buffer.c src/option.h src/version.c |
| diffstat | 4 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -7067,6 +7067,7 @@ A jump table for the options with a shor 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.
--- a/src/buffer.c +++ b/src/buffer.c @@ -2071,17 +2071,21 @@ buflist_getfile(n, lnum, options, forcei * "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); }
--- 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' */