thac0/vim
1
0
Fork 0
forked from aniani/vim
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

42
src/window.c
View File

@@ -167,6 +167,32 @@ prevwin_curwin(void)
return is_in_cmdwin() && prevwin != NULL ? prevwin : curwin;
}
/*
* If the 'switchbuf' option contains "useopen" or "usetab", then try to jump
* to a window containing "buf".
* Returns the pointer to the window that was jumped to or NULL.
*/
win_T *
swbuf_goto_win_with_buf(buf_T *buf)
{
win_T *wp = NULL;
if (buf == NULL)
return wp;
// If 'switchbuf' contains "useopen": jump to first window in the current
// tab page 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);
return wp;
}
/*
* All CTRL-W window commands are handled here, called from normal_cmd().
*/
@@ -586,21 +612,7 @@ wingotofile:
wp = NULL;
if ((swb_flags & (SWB_USEOPEN | SWB_USETAB))
&& cmdmod.cmod_tab == 0)
{
buf_T *existing_buf = buflist_findname_exp(ptr);
if (existing_buf != NULL)
{
if (swb_flags & SWB_USEOPEN)
wp = buf_jump_open_win(existing_buf);
// If 'switchbuf' contains "usetab": jump to first
// window in any tab page containing "existing_buf"
// if one exists.
if (wp == NULL && (swb_flags & SWB_USETAB))
wp = buf_jump_open_tab(existing_buf);
}
}
wp = swbuf_goto_win_with_buf(buflist_findname_exp(ptr));
if (wp == NULL && win_split(0, 0) == OK)
{