1 files changed, 30 insertions, 14 deletions

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 3dd4e35f65..28691914bb 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -2699,7 +2699,8 @@ static void qf_goto_win_with_qfl_file(int qf_fnum)
       // Didn't find it, go to the window before the quickfix
       // window, unless 'switchbuf' contains 'uselast': in this case we
       // try to jump to the previously used window first.
-      if ((swb_flags & SWB_USELAST) && win_valid(prevwin) && !prevwin->w_p_wfb) {
+      if ((swb_flags & SWB_USELAST) && win_valid(prevwin)
+          && !prevwin->w_p_wfb) {
         win = prevwin;
       } else if (altwin != NULL) {
         win = altwin;
@@ -2803,27 +2804,42 @@ static int qf_jump_edit_buffer(qf_info_T *qi, qfline_T *qf_ptr, int forceit, int
                      ECMD_HIDE + ECMD_SET_HELP,
                      prev_winid == curwin->handle ? curwin : NULL);
   } else {
-    if (!forceit && curwin->w_p_wfb) {
+    int fnum = qf_ptr->qf_fnum;
+
+    if (!forceit && curwin->w_p_wfb && curbuf->b_fnum != fnum) {
       if (qi->qfl_type == QFLT_LOCATION) {
         // Location lists cannot split or reassign their window
         // so 'winfixbuf' windows must fail
-        semsg("%s", e_winfixbuf_cannot_go_to_buffer);
-        return QF_ABORT;
+        emsg(_(e_winfixbuf_cannot_go_to_buffer));
+        return FAIL;
       }
 
-      if (!win_valid(prevwin)) {
-        // Split the window, which will be 'nowinfixbuf', and set curwin to that
-        exarg_T new_eap = {
-          .cmdidx = CMD_split,
-          .cmd = "split",
-          .arg = "",
-        };
-        ex_splitview(&new_eap);
+      if (win_valid(prevwin) && !prevwin->w_p_wfb
+          && !bt_quickfix(prevwin->w_buffer)) {
+        // 'winfixbuf' is set; attempt to change to a window without it
+        // that isn't a quickfix/location list window.
+        win_goto(prevwin);
+      }
+      if (curwin->w_p_wfb) {
+        // Split the window, which will be 'nowinfixbuf', and set curwin
+        // to that
+        if (win_split(0, 0) == OK) {
+          *opened_window = true;
+        }
+        if (curwin->w_p_wfb) {
+          // Autocommands set 'winfixbuf' or sent us to another window
+          // with it set.  Give up, but don't return immediately, as
+          // they may have messed with the list.
+          emsg(_(e_winfixbuf_cannot_go_to_buffer));
+          retval = FAIL;
+        }
       }
     }
 
-    retval = buflist_getfile(qf_ptr->qf_fnum, 1,
-                             GETF_SETMARK | GETF_SWITCH, forceit);
+    if (retval == OK) {
+      retval = buflist_getfile(fnum, 1,
+                               GETF_SETMARK | GETF_SWITCH, forceit);
+    }
   }
   // If a location list, check whether the associated window is still
   // present.