diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-09-01 15:33:17 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-09-01 15:33:17 +0000 |
| commit | 5bd266c96d6e945d6c52c34e7265a680720a9e68 (patch) | |
| tree | 46c83ce5081374ca72576172fe6c1664718ab6d6 | |
| parent | ac98e5db6e5486416966fc842a2d82394f0d4a7a (diff) | |
updated for version 7.2-008v7.2.008
| -rw-r--r-- | src/buffer.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c index f1b4fd6916..173a0f80c1 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1351,11 +1351,12 @@ set_curbuf(buf, action) } } #ifdef FEAT_AUTOCMD + /* An autocommand may have deleted "buf", already entered it (e.g., when + * it did ":bunload") or aborted the script processing! */ # ifdef FEAT_EVAL - /* An autocommand may have deleted buf or aborted the script processing! */ - if (buf_valid(buf) && !aborting()) + if (buf_valid(buf) && buf != curbuf && !aborting()) # else - if (buf_valid(buf)) /* an autocommand may have deleted buf! */ + if (buf_valid(buf) && buf != curbuf) # endif #endif enter_buffer(buf); diff --git a/src/version.c b/src/version.c index 64370d0fa9..16a0cee28b 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 8, +/**/ 7, /**/ 6, |