aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.1554: code for handling 'switchbuf' is repeated

Browse Source 
Problem:    Code for handling 'switchbuf' is repeated.
Solution:   Add a function to handle 'switchbuf'. (Yegappan Lakshmanan,
            closes #12397)
This commit is contained in:
Yegappan Lakshmanan
2023-05-14 17:24:22 +01:00
committed by Bram Moolenaar
parent b6a19594b2
commit e42c27d9e8
5 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/buffer.c
View File

@@ -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))
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;
}
@@ -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