This commit is contained in:
Jan Edmund Lazo 2021-05-12 02:28:15 -04:00
parent 07f6f12cf5
commit e9804aead6
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
2 changed files with 10 additions and 12 deletions

View File

@ -2439,16 +2439,14 @@ int do_ecmd(
// BufLeave applies to the old buffer. // BufLeave applies to the old buffer.
cmdwin_type = 0; cmdwin_type = 0;
/* // Be careful: The autocommands may delete any buffer and change
* Be careful: The autocommands may delete any buffer and change // the current buffer.
* the current buffer. // - If the buffer we are going to edit is deleted, give up.
* - If the buffer we are going to edit is deleted, give up. // - If the current buffer is deleted, prefer to load the new
* - If the current buffer is deleted, prefer to load the new // buffer when loading a buffer is required. This avoids
* buffer when loading a buffer is required. This avoids // loading another buffer which then must be closed again.
* loading another buffer which then must be closed again. // - If we ended up in the new buffer already, need to skip a few
* - If we ended up in the new buffer already, need to skip a few // things, set auto_buf.
* things, set auto_buf.
*/
if (buf->b_fname != NULL) { if (buf->b_fname != NULL) {
new_name = vim_strsave(buf->b_fname); new_name = vim_strsave(buf->b_fname);
} }

View File

@ -212,7 +212,7 @@ void do_exmode(int improved)
while (exmode_active) { while (exmode_active) {
/* Check for a ":normal" command and no more characters left. */ /* Check for a ":normal" command and no more characters left. */
if (ex_normal_busy > 0 && typebuf.tb_len == 0) { if (ex_normal_busy > 0 && typebuf.tb_len == 0) {
exmode_active = FALSE; exmode_active = 0;
break; break;
} }
msg_scroll = true; msg_scroll = true;
@ -7307,7 +7307,7 @@ do_exedit(
*/ */
if (exmode_active && (eap->cmdidx == CMD_visual if (exmode_active && (eap->cmdidx == CMD_visual
|| eap->cmdidx == CMD_view)) { || eap->cmdidx == CMD_view)) {
exmode_active = FALSE; exmode_active = 0;
ex_pressedreturn = false; ex_pressedreturn = false;
if (*eap->arg == NUL) { if (*eap->arg == NUL) {
/* Special case: ":global/pat/visual\NLvi-commands" */ /* Special case: ":global/pat/visual\NLvi-commands" */