diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-18 21:53:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 21:53:20 +0200 |
| commit | 974b43fd7940cd807e5a6b67c77cb2e0462b11a4 (patch) | |
| tree | a8c3d747d3bca47d5b52758b02de199b83146186 /src/nvim/fileio.c | |
| parent | 1cbe0145695bea4168b4e23f61e29e51684088e1 (diff) | |
| parent | d07a6e2b45175439891beafc5e75f68f92eabd65 (diff) | |
| download | rneovim-974b43fd7940cd807e5a6b67c77cb2e0462b11a4.tar.gz rneovim-974b43fd7940cd807e5a6b67c77cb2e0462b11a4.tar.bz2 rneovim-974b43fd7940cd807e5a6b67c77cb2e0462b11a4.zip | |
Merge #10028 from janlazo/vim-8.1.1345
vim-patch:8.1.{1325,1345,1348,1349}
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 507bf3c032..8e4a210b66 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -3693,9 +3693,11 @@ restore_backup: /* * Remove the backup unless 'backup' option is set */ - if (!p_bk && backup != NULL && os_remove((char *)backup) != 0) + if (!p_bk && backup != NULL + && !write_info.bw_conv_error + && os_remove((char *)backup) != 0) { EMSG(_("E207: Can't delete backup file")); - + } goto nofail; |