patch 9.0.0085: ":write" fails after ":file name" and the ":edit"
Problem: ":write" fails after ":file name" and the ":edit".
Solution: Reset BF_NOTEDITED when using ":edit". (closes #10790)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5253863..6e5e09f 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2973,6 +2973,11 @@
// Assume success now
retval = OK;
+ // If the file name was changed, reset the not-edit flag so that ":write"
+ // works.
+ if (!other_file)
+ curbuf->b_flags &= ~BF_NOTEDITED;
+
/*
* Check if we are editing the w_arg_idx file in the argument list.
*/
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index f55e6a5..7b270ff 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -725,5 +725,21 @@
bwipe!
endfunc
+" Test :write after changing name with :file and loading it with :edit
+func Test_write_after_rename()
+ call writefile(['text'], 'Xfile')
+
+ enew
+ file Xfile
+ call assert_fails('write', 'E13: File exists (add ! to override)')
+
+ " works OK after ":edit"
+ edit
+ write
+
+ call delete('Xfile')
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 03b65d2..a0caf3e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 85,
+/**/
84,
/**/
83,