aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

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
Show Stats 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

1
src/proto/window.pro
View File

@ -1,6 +1,7 @@
/* window.c */
int window_layout_locked(enum CMD_index cmd);
win_T *prevwin_curwin(void);
win_T *swbuf_goto_win_with_buf(buf_T *buf);
void do_window(int nchar, long Prenum, int xchar);
void get_wincmd_addr_type(char_u *arg, exarg_T *eap);
int win_split(int size, int flags);

16
src/tag.c
View File

@ -3816,18 +3816,10 @@ jumpto_tag(
if (existing_buf != NULL)
{
win_T *wp = 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);
// We've switched to the buffer, the usual loading of the file must
// be skipped.
if (wp != NULL)
// If 'switchbuf' is set jump to the window containing "buf".
if (swbuf_goto_win_with_buf(existing_buf) != NULL)
// We've switched to the buffer, the usual loading of the file
// must be skipped.
getfile_result = GETFILE_SAME_FILE;
}
}

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1554,
/**/
1553,
/**/

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)
{