Mercurial > vim
diff src/buffer.c @ 32445:48b95cef8fa2 v9.0.1554
patch 9.0.1554: code for handling 'switchbuf' is repeated
Commit: https://github.com/vim/vim/commit/e42c27d9e8a18e3786f13f17663914cdd0f63f9e
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sun May 14 17:24:22 2023 +0100
patch 9.0.1554: code for handling 'switchbuf' is repeated
Problem: Code for handling 'switchbuf' is repeated.
Solution: Add a function to handle 'switchbuf'. (Yegappan Lakshmanan,
closes #12397)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 14 May 2023 18:30:05 +0200 |
| parents | bfc23ba1bba5 |
| children | 87f59a64efab |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -1570,14 +1570,10 @@ do_buffer_ext( */ 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)) + // If 'switchbuf' is set jump to the window containing "buf". + if (swbuf_goto_win_with_buf(buf) != NULL) 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)) - return OK; + if (win_split(0, 0) == FAIL) return FAIL; } @@ -2492,15 +2488,8 @@ buflist_getfile( 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