Mercurial > vim
changeset 3486:f9a865d97614 v7.3.507
updated for version 7.3.507
Problem: When exiting with unsaved changes, selecting an existing file in
the file dialog, there is no dialog to ask whether the existing
file should be overwritten. (Felipe G. Nievinski)
Solution: Call check_overwrite() before writing. (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 25 Apr 2012 17:32:18 +0200 |
| parents | 0c88089c42de |
| children | 7e60e3985f71 |
| files | src/ex_cmds.c src/ex_cmds2.c src/proto/ex_cmds.pro src/version.c |
| diffstat | 4 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -25,7 +25,6 @@ static int viminfo_encoding __ARGS((vir_ static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing)); #endif -static int check_overwrite __ARGS((exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int other)); static int check_readonly __ARGS((int *forceit, buf_T *buf)); #ifdef FEAT_AUTOCMD static void delbuf_msg __ARGS((char_u *name)); @@ -2722,7 +2721,7 @@ theend: * May set eap->forceit if a dialog says it's OK to overwrite. * Return OK if it's OK, FAIL if it is not. */ - static int + int check_overwrite(eap, buf, fname, ffname, other) exarg_T *eap; buf_T *buf;
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1489,6 +1489,7 @@ dialog_changed(buf, checkall) char_u buff[DIALOG_MSG_SIZE]; int ret; buf_T *buf2; + exarg_T ea; dialog_msg(buff, _("Save changes to \"%s\"?"), (buf->b_fname != NULL) ? @@ -1498,13 +1499,19 @@ dialog_changed(buf, checkall) else ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1); + /* Init ea pseudo-structure, this is needed for the check_overwrite() + * function. */ + ea.append = ea.forceit = FALSE; + if (ret == VIM_YES) { #ifdef FEAT_BROWSE /* May get file name, when there is none */ browse_save_fname(buf); #endif - if (buf->b_fname != NULL) /* didn't hit Cancel */ + if (buf->b_fname != NULL && check_overwrite(&ea, buf, + buf->b_fname, buf->b_ffname, FALSE) == OK) + /* didn't hit Cancel */ (void)buf_write_all(buf, FALSE); } else if (ret == VIM_NO) @@ -1532,7 +1539,9 @@ dialog_changed(buf, checkall) /* May get file name, when there is none */ browse_save_fname(buf2); #endif - if (buf2->b_fname != NULL) /* didn't hit Cancel */ + if (buf2->b_fname != NULL && check_overwrite(&ea, buf2, + buf2->b_fname, buf2->b_ffname, FALSE) == OK) + /* didn't hit Cancel */ (void)buf_write_all(buf2, FALSE); #ifdef FEAT_AUTOCMD /* an autocommand may have deleted the buffer */
--- a/src/proto/ex_cmds.pro +++ b/src/proto/ex_cmds.pro @@ -23,6 +23,7 @@ void ex_file __ARGS((exarg_T *eap)); void ex_update __ARGS((exarg_T *eap)); void ex_write __ARGS((exarg_T *eap)); int do_write __ARGS((exarg_T *eap)); +int check_overwrite __ARGS((exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int other)); void ex_wnext __ARGS((exarg_T *eap)); void do_wqall __ARGS((exarg_T *eap)); int not_writing __ARGS((void));