diff options
author | watiko <service@mail.watiko.net> | 2016-02-07 17:28:54 +0900 |
---|---|---|
committer | watiko <service@mail.watiko.net> | 2016-02-07 17:54:37 +0900 |
commit | ba8ec7e963d944f6acbc2983db24144d63939b85 (patch) | |
tree | dc192fdcaee253dfcc0aff37276b34e955eadc18 /src/nvim/buffer.c | |
parent | 827e267800417b8fdd1340d54f5dc5fa9d81bb92 (diff) | |
download | rneovim-ba8ec7e963d944f6acbc2983db24144d63939b85.tar.gz rneovim-ba8ec7e963d944f6acbc2983db24144d63939b85.tar.bz2 rneovim-ba8ec7e963d944f6acbc2983db24144d63939b85.zip |
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
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r-- | src/nvim/buffer.c | 29 |
1 files changed, 18 insertions, 11 deletions
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); } } |