This commit is contained in:
James McCoy 2016-06-22 21:21:05 -04:00
parent cde1d818d0
commit 438c5d27b0

View File

@ -1576,14 +1576,15 @@ win_found:
* set b_p_ro flag). */ * set b_p_ro flag). */
if (!can_abandon(curbuf, forceit)) { if (!can_abandon(curbuf, forceit)) {
EMSG(_(e_nowrtmsg)); EMSG(_(e_nowrtmsg));
ok = FALSE; ok = false;
} else } else {
ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1, ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
ECMD_HIDE + ECMD_SET_HELP, ECMD_HIDE + ECMD_SET_HELP,
oldwin == curwin ? curwin : NULL); oldwin == curwin ? curwin : NULL);
}
} else { } else {
ok = buflist_getfile(qf_ptr->qf_fnum, ok = buflist_getfile(qf_ptr->qf_fnum, (linenr_T)1,
(linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit); GETF_SETMARK | GETF_SWITCH, forceit);
if (qi != &ql_info && !win_valid(oldwin)) { if (qi != &ql_info && !win_valid(oldwin)) {
EMSG(_("E924: Current window was closed")); EMSG(_("E924: Current window was closed"));
ok = false; ok = false;
@ -1671,13 +1672,12 @@ win_found:
msg_scroll = (int)i; msg_scroll = (int)i;
} }
} else { } else {
if (opened_window) if (opened_window) {
win_close(curwin, TRUE); /* Close opened window */ win_close(curwin, true); // Close opened window
}
if (qf_ptr != NULL && qf_ptr->qf_fnum != 0) { if (qf_ptr != NULL && qf_ptr->qf_fnum != 0) {
/* // Couldn't open file, so put index back where it was. This could
* Couldn't open file, so put index back where it was. This could // happen if the file was readonly and we changed something.
* happen if the file was readonly and we changed something.
*/
failed: failed:
qf_ptr = old_qf_ptr; qf_ptr = old_qf_ptr;
qf_index = old_qf_index; qf_index = old_qf_index;