diff options
Diffstat (limited to 'src/ex_cmds2.c')
| -rw-r--r-- | src/ex_cmds2.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 4a6f519231..a75bfc11c0 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -163,7 +163,8 @@ dialog_changed( char_u buff[DIALOG_MSG_SIZE]; int ret; buf_T *buf2; - exarg_T ea; + exarg_T ea; + int empty_buf = buf->b_fname == NULL ? TRUE : FALSE; dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname); if (checkall) @@ -181,10 +182,27 @@ dialog_changed( // May get file name, when there is none browse_save_fname(buf); #endif - if (buf->b_fname != NULL && check_overwrite(&ea, buf, - buf->b_fname, buf->b_ffname, FALSE) == OK) + if (empty_buf) + buf_set_name(buf->b_fnum, (char_u *)"Untitled"); + + if (check_overwrite(&ea, buf, buf->b_fname, buf->b_ffname, FALSE) == OK) + { // didn't hit Cancel - (void)buf_write_all(buf, FALSE); + if (buf_write_all(buf, FALSE) == OK) + return; + } + + // restore to empty when write failed + if (empty_buf) + { + vim_free(buf->b_fname); + buf->b_fname = NULL; + vim_free(buf->b_ffname); + buf->b_ffname = NULL; + vim_free(buf->b_sfname); + buf->b_sfname = NULL; + unchanged(buf, TRUE, FALSE); + } } else if (ret == VIM_NO) { |