diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 22:39:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 22:39:02 +0200 |
| commit | 885ca3b7a60b79feb1d4c9e54265c8b543d4f245 (patch) | |
| tree | 158fd374f046235d235e0ae219e349ced74e6dea /src | |
| parent | acdede50cebf7d247e55356be828ebaba43c0d3d (diff) | |
| parent | 29961794821f4c71e891a9ac4db186018ffbb8c5 (diff) | |
| download | rneovim-885ca3b7a60b79feb1d4c9e54265c8b543d4f245.tar.gz rneovim-885ca3b7a60b79feb1d4c9e54265c8b543d4f245.tar.bz2 rneovim-885ca3b7a60b79feb1d4c9e54265c8b543d4f245.zip | |
Merge #8929 from janlazo/vim-8.0.0983
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 7 | ||||
| -rw-r--r-- | src/nvim/window.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index ab24b63110..f7da5b6c97 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -1279,15 +1279,14 @@ bool check_changed(buf_T *buf, int flags) /// /// @param buf /// @param checkall may abandon all changed buffers -void dialog_changed(buf_T *buf, int checkall) +void dialog_changed(buf_T *buf, bool checkall) { char_u buff[DIALOG_MSG_SIZE]; int ret; exarg_T ea; - dialog_msg(buff, _("Save changes to \"%s\"?"), - (buf->b_fname != NULL) ? - buf->b_fname : (char_u *)_("Untitled")); + assert(buf->b_fname != NULL); + dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname); if (checkall) { ret = vim_dialog_yesnoallcancel(VIM_QUESTION, NULL, buff, 1); } else { diff --git a/src/nvim/window.c b/src/nvim/window.c index 3f66568b58..d9bed0789d 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2882,8 +2882,8 @@ close_others ( } if (!r) { if (message && (p_confirm || cmdmod.confirm) && p_write) { - dialog_changed(wp->w_buffer, FALSE); - if (!win_valid(wp)) { /* autocommands messed wp up */ + dialog_changed(wp->w_buffer, false); + if (!win_valid(wp)) { // autocommands messed wp up nextwp = firstwin; continue; } |