diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-04-05 20:02:55 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-05 20:02:55 +0200 |
| commit | c20bdf1107d48a1c14713709d12d429e761132af (patch) | |
| tree | 7132521d0fdd5373507633cbdc35ee998929708d /src | |
| parent | b73faa1c02d0911a60bddd1ba343cf620f2cd124 (diff) | |
patch 9.1.0267: File name entered in GUI dialog is ignoredv9.1.0267
Problem: File name entered in GUI dialog is ignored (after v9.1.0265)
Solution: Only set file name to "Untitled" if GUI dialog didn't set it.
(zeertzjq)
closes: #14417
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds2.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index a75bfc11c0..ce30b8d397 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -164,7 +164,6 @@ dialog_changed( int ret; buf_T *buf2; exarg_T ea; - int empty_buf = buf->b_fname == NULL ? TRUE : FALSE; dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname); if (checkall) @@ -178,11 +177,14 @@ dialog_changed( if (ret == VIM_YES) { + int empty_bufname; + #ifdef FEAT_BROWSE // May get file name, when there is none browse_save_fname(buf); #endif - if (empty_buf) + empty_bufname = buf->b_fname == NULL ? TRUE : FALSE; + if (empty_bufname) buf_set_name(buf->b_fnum, (char_u *)"Untitled"); if (check_overwrite(&ea, buf, buf->b_fname, buf->b_ffname, FALSE) == OK) @@ -193,14 +195,11 @@ dialog_changed( } // restore to empty when write failed - if (empty_buf) + if (empty_bufname) { - 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; + VIM_CLEAR(buf->b_fname); + VIM_CLEAR(buf->b_ffname); + VIM_CLEAR(buf->b_sfname); unchanged(buf, TRUE, FALSE); } } diff --git a/src/version.c b/src/version.c index f1792f7335..5534b9b308 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 267, +/**/ 266, /**/ 265, |