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)
diff --git a/src/buffer.c b/src/buffer.c
index 60b7c80..dc279ff 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1570,14 +1570,10 @@
*/
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 @@
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