diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-03-13 18:30:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-03-13 18:30:43 +0100 |
| commit | 4f8301f6415e86631dadbc19066ba0bc8550df49 (patch) | |
| tree | 21499c9636dd495ff2b8ade901ef8f2862f0a0a1 | |
| parent | 1a0316ca2a617c5becc187337c4b9e3f08578d3b (diff) | |
updated for version 7.3.857v7.3.857
Problem: The QuitPre autocommand event does not trigger for :qa and :wq.
Solution: Trigger the event. (Tatsuro Fujii)
| -rw-r--r-- | src/ex_docmd.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 89b523495d..d258e69e7b 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -6526,7 +6526,7 @@ ex_quit(eap) } #ifdef FEAT_AUTOCMD apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf); - /* Refuse to quick when locked or when the buffer in the last window is + /* Refuse to quit when locked or when the buffer in the last window is * being closed (can only happen in autocommands). */ if (curbuf_locked() || (curbuf->b_nwindows == 1 && curbuf->b_closing)) return; @@ -6600,7 +6600,10 @@ ex_quit_all(eap) return; } #ifdef FEAT_AUTOCMD - if (curbuf_locked()) + apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf); + /* Refuse to quit when locked or when the buffer in the last window is + * being closed (can only happen in autocommands). */ + if (curbuf_locked() || (curbuf->b_nwindows == 1 && curbuf->b_closing)) return; #endif @@ -6936,7 +6939,10 @@ ex_exit(eap) return; } #ifdef FEAT_AUTOCMD - if (curbuf_locked()) + apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf); + /* Refuse to quit when locked or when the buffer in the last window is + * being closed (can only happen in autocommands). */ + if (curbuf_locked() || (curbuf->b_nwindows == 1 && curbuf->b_closing)) return; #endif diff --git a/src/version.c b/src/version.c index 90d7a4a263..f865b72a7d 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 857, +/**/ 856, /**/ 855, |