This commit is contained in:
James McCoy
2016-12-08 10:36:24 -05:00
parent d1473880bc
commit 7775fb7dff

View File

@@ -1967,27 +1967,30 @@ failed:
* should not be overwritten: Set msg_scroll, restore its value if no * should not be overwritten: Set msg_scroll, restore its value if no
* output was done. * output was done.
*/ */
msg_scroll = TRUE; msg_scroll = true;
if (filtering) if (filtering) {
apply_autocmds_exarg(EVENT_FILTERREADPOST, NULL, sfname, apply_autocmds_exarg(EVENT_FILTERREADPOST, NULL, sfname,
FALSE, curbuf, eap); false, curbuf, eap);
else if (newfile) { } else if (newfile) {
apply_autocmds_exarg(EVENT_BUFREADPOST, NULL, sfname, apply_autocmds_exarg(EVENT_BUFREADPOST, NULL, sfname,
FALSE, curbuf, eap); false, curbuf, eap);
if (!au_did_filetype && *curbuf->b_p_ft != NUL) { if (!au_did_filetype && *curbuf->b_p_ft != NUL) {
// EVENT_FILETYPE was not triggered but the buffer already has a // EVENT_FILETYPE was not triggered but the buffer already has a
// filetype. Trigger EVENT_FILETYPE using the existing filetype. // filetype. Trigger EVENT_FILETYPE using the existing filetype.
apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, curbuf->b_fname, true, curbuf); apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, curbuf->b_fname,
true, curbuf);
} }
} else { } else {
apply_autocmds_exarg(EVENT_FILEREADPOST, sfname, sfname, apply_autocmds_exarg(EVENT_FILEREADPOST, sfname, sfname,
FALSE, NULL, eap); false, NULL, eap);
} }
if (msg_scrolled == n) if (msg_scrolled == n) {
msg_scroll = m; msg_scroll = m;
if (aborting()) /* autocmds may abort script processing */ }
if (aborting()) { // autocmds may abort script processing
return FAIL; return FAIL;
} }
}
if (recoverymode && error) if (recoverymode && error)
return FAIL; return FAIL;