Mercurial > vim
changeset 29988:b2140f61826c v9.0.0332
patch 9.0.0332: overwrite check may block BufWriteCmd
Commit: https://github.com/vim/vim/commit/9c8f94636b3610b898ffbbd07f6b75866d16cbca
Author: zeertzjq <zeertzjq@outlook.com>
Date: Tue Aug 30 18:17:15 2022 +0100
patch 9.0.0332: overwrite check may block BufWriteCmd
Problem: Overwrite check may block BufWriteCmd.
Solution: Do not use overwrite check when 'buftype' is "acwrite".
(closes #11011)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 30 Aug 2022 19:30:03 +0200 |
| parents | 72c94ab54038 |
| children | 85e7d9e4a484 |
| files | src/ex_cmds.c src/testdir/test_autocmd.vim src/version.c |
| diffstat | 3 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2094,12 +2094,17 @@ check_overwrite( /* * Write to another file or b_flags set or not writing the whole file: * overwriting only allowed with '!'. + * If "other" is FALSE and bt_nofilename(buf) is TRUE, this must be + * writing an "acwrite" buffer to the same file as its b_ffname, and + * buf_write() will only allow writing with BufWriteCmd autocommands, + * so there is no need for an overwrite check. */ if ( (other - || (buf->b_flags & BF_NOTEDITED) - || ((buf->b_flags & BF_NEW) - && vim_strchr(p_cpo, CPO_OVERNEW) == NULL) - || (buf->b_flags & BF_READERR)) + || (!bt_nofilename(buf) + && ((buf->b_flags & BF_NOTEDITED) + || ((buf->b_flags & BF_NEW) + && vim_strchr(p_cpo, CPO_OVERNEW) == NULL) + || (buf->b_flags & BF_READERR)))) && !p_wa && vim_fexists(ffname)) {
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1922,6 +1922,21 @@ func Test_BufReadCmd() au! BufWriteCmd endfunc +func Test_BufWriteCmd() + autocmd BufWriteCmd Xbufwritecmd let g:written = 1 + new + file Xbufwritecmd + set buftype=acwrite + call mkdir('Xbufwritecmd') + write + " BufWriteCmd should be triggered even if a directory has the same name + call assert_equal(1, g:written) + call delete('Xbufwritecmd', 'd') + unlet g:written + au! BufWriteCmd + bwipe! +endfunc + func SetChangeMarks(start, end) exe a:start .. 'mark [' exe a:end .. 'mark ]'