fix(win_split_ins): do not fail when oldwin is not valid

zeertzjq · zeertzjq · commit 0cf2dc63bf9e · 2022-03-13T13:17:22.000+08:00
Ref #14240
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
@@ -3646,15 +3646,6 @@ static int qf_open_new_cwindow(qf_info_T *qi, int height)
   if (win_split(height, flags) == FAIL) {
     return FAIL;  // not enough room for window
   }
-
-  // User autocommands may have invalidated the previous window after calling
-  // win_split, so add a check to ensure that the win is still here
-  if (IS_LL_STACK(qi) && !win_valid(win)) {
-    // close the window that was supposed to be for the loclist
-    win_close(curwin, false, false);
-    return FAIL;
-  }
-
   RESET_BINDING(curwin);
 
   if (IS_LL_STACK(qi)) {
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -1420,13 +1420,11 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
     p_wh = i;
   }
 
-  if (!win_valid(oldwin)) {
-    return FAIL;
+  if (win_valid(oldwin)) {
+    // Send the window positions to the UI
+    oldwin->w_pos_changed = true;
   }
 
-  // Send the window positions to the UI
-  oldwin->w_pos_changed = true;
-
   return OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1420,13 +1420,11 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)`
`1420`	`1420`	`p_wh = i;`
`1421`	`1421`	`}`
`1422`	`1422`
`1423`		`- if (!win_valid(oldwin)) {`
`1424`		`- return FAIL;`
	`1423`	`+ if (win_valid(oldwin)) {`
	`1424`	`+ // Send the window positions to the UI`
	`1425`	`+ oldwin->w_pos_changed = true;`
`1425`	`1426`	`}`
`1426`	`1427`
`1427`		`- // Send the window positions to the UI`
`1428`		`- oldwin->w_pos_changed = true;`
`1429`		`-`
`1430`	`1428`	`return OK;`
`1431`	`1429`	`}`
`1432`	`1430`