mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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)
This commit is contained in:
@@ -2094,12 +2094,17 @@ check_overwrite(
|
|||||||
/*
|
/*
|
||||||
* Write to another file or b_flags set or not writing the whole file:
|
* Write to another file or b_flags set or not writing the whole file:
|
||||||
* overwriting only allowed with '!'.
|
* 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
|
if ( (other
|
||||||
|| (buf->b_flags & BF_NOTEDITED)
|
|| (!bt_nofilename(buf)
|
||||||
|
&& ((buf->b_flags & BF_NOTEDITED)
|
||||||
|| ((buf->b_flags & BF_NEW)
|
|| ((buf->b_flags & BF_NEW)
|
||||||
&& vim_strchr(p_cpo, CPO_OVERNEW) == NULL)
|
&& vim_strchr(p_cpo, CPO_OVERNEW) == NULL)
|
||||||
|| (buf->b_flags & BF_READERR))
|
|| (buf->b_flags & BF_READERR))))
|
||||||
&& !p_wa
|
&& !p_wa
|
||||||
&& vim_fexists(ffname))
|
&& vim_fexists(ffname))
|
||||||
{
|
{
|
||||||
|
@@ -1922,6 +1922,21 @@ func Test_BufReadCmd()
|
|||||||
au! BufWriteCmd
|
au! BufWriteCmd
|
||||||
endfunc
|
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)
|
func SetChangeMarks(start, end)
|
||||||
exe a:start .. 'mark ['
|
exe a:start .. 'mark ['
|
||||||
exe a:end .. 'mark ]'
|
exe a:end .. 'mark ]'
|
||||||
|
@@ -707,6 +707,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
332,
|
||||||
/**/
|
/**/
|
||||||
331,
|
331,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user