diff options
| author | Bram Moolenaar <Bram@vim.org> | 2004-12-09 21:34:53 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2004-12-09 21:34:53 +0000 |
| commit | 293ee4d421cd55f4a3c014c1c26edf02f718cc83 (patch) | |
| tree | ae4856e718b752ea0c6c807912bfbb51967fae80 /src/buffer.c | |
| parent | 741b07e0092eb6d7b81c9cbe149196c6cf9d5bbe (diff) | |
| download | vim-git-293ee4d421cd55f4a3c014c1c26edf02f718cc83.tar.gz | |
updated for version 7.0021v7.0021
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/buffer.c b/src/buffer.c index a1d593dab..f02c00d25 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -538,8 +538,7 @@ buf_freeall(buf, del_buf, wipe_buf) return; } # ifdef FEAT_EVAL - /* autocmds may abort script processing */ - if (aborting()) + if (aborting()) /* autocmds may abort script processing */ return; # endif @@ -755,7 +754,6 @@ handle_swap_exists(old_curbuf) # endif } swap_exists_action = SEA_NONE; - } #endif @@ -1031,8 +1029,12 @@ do_buffer(action, start, dir, count, forceit) * now. */ return FAIL; # endif + /* If it's still changed fail silently, the dialog already + * mentioned why it fails. */ + if (bufIsChanged(buf)) + return FAIL; } - if (bufIsChanged(buf)) + else #endif { EMSGN(_("E89: No write since last change for buffer %ld (add ! to override)"), @@ -1518,8 +1520,7 @@ buflist_new(ffname, sfname, lnum, flags) if (buf == curbuf) apply_autocmds(EVENT_BUFWIPEOUT, NULL, NULL, FALSE, curbuf); # ifdef FEAT_EVAL - /* autocmds may abort script processing */ - if (aborting()) + if (aborting()) /* autocmds may abort script processing */ return NULL; # endif #endif @@ -1572,8 +1573,7 @@ buflist_new(ffname, sfname, lnum, flags) if (buf != curbuf) /* autocommands deleted the buffer! */ return NULL; #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) - /* autocmds may abort script processing */ - if (aborting()) + if (aborting()) /* autocmds may abort script processing */ return NULL; #endif /* buf->b_nwindows = 0; why was this here? */ @@ -1649,8 +1649,7 @@ buflist_new(ffname, sfname, lnum, flags) if (flags & BLN_LISTED) apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, buf); # ifdef FEAT_EVAL - /* autocmds may abort script processing */ - if (aborting()) + if (aborting()) /* autocmds may abort script processing */ return NULL; # endif } |