diff options
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 8d730733d0..b2edbf4053 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -1459,16 +1459,11 @@ int do_buffer(int action, int start, int dir, int count, int forceit) // make "buf" the current buffer if (action == DOBUF_SPLIT) { // split window first - // If 'switchbuf' contains "useopen": jump to first window containing - // "buf" if one exists - if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf)) { - return OK; - } - // If 'switchbuf' contains "usetab": jump to first window in any tab - // page containing "buf" if one exists - if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf)) { + // If 'switchbuf' is set jump to the window containing "buf". + if (swbuf_goto_win_with_buf(buf) != NULL) { return OK; } + if (win_split(0, 0) == FAIL) { return FAIL; } @@ -2072,17 +2067,8 @@ int buflist_getfile(int n, linenr_T lnum, int options, int forceit) } if (options & GETF_SWITCH) { - // 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)) { - wp = buf_jump_open_tab(buf); - } + // If 'switchbuf' is set jump to the window containing "buf". + wp = swbuf_goto_win_with_buf(buf); // If 'switchbuf' contains "split", "vsplit" or "newtab" and the // current buffer isn't empty: open new tab or window |