diff options
| -rw-r--r-- | src/fileio.c | 5 | ||||
| -rw-r--r-- | src/misc1.c | 8 | ||||
| -rw-r--r-- | src/option.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 0d0269b7f..eec68e84b 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -6647,6 +6647,11 @@ buf_check_timestamp(buf, focus) tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg) + STRLEN(mesg2) + 2)); sprintf((char *)tbuf, mesg, path); +#ifdef FEAT_EVAL + /* Set warningmsg here, before the unimportant and output-specific + * mesg2 has been appended. */ + set_vim_var_string(VV_WARNINGMSG, tbuf, -1); +#endif #if defined(FEAT_CON_DIALOG) || defined(FEAT_GUI_DIALOG) if (can_reload) { diff --git a/src/misc1.c b/src/misc1.c index 048729024..3fdcdecb1 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2955,6 +2955,8 @@ change_warning(col) int col; /* column for message; non-zero when in insert mode and 'showmode' is on */ { + static char *w_readonly = N_("W10: Warning: Changing a readonly file"); + if (curbuf->b_did_warn == FALSE && curbufIsChanged() == 0 #ifdef FEAT_AUTOCMD @@ -2977,8 +2979,10 @@ change_warning(col) if (msg_row == Rows - 1) msg_col = col; msg_source(hl_attr(HLF_W)); - MSG_PUTS_ATTR(_("W10: Warning: Changing a readonly file"), - hl_attr(HLF_W) | MSG_HIST); + MSG_PUTS_ATTR(_(w_readonly), hl_attr(HLF_W) | MSG_HIST); +#ifdef FEAT_EVAL + set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1); +#endif msg_clr_eos(); (void)msg_end(); if (msg_silent == 0 && !silent_mode) diff --git a/src/option.c b/src/option.c index cc3363164..5e71c9bf3 100644 --- a/src/option.c +++ b/src/option.c @@ -7563,9 +7563,13 @@ set_bool_option(opt_idx, varp, value, opt_flags) * set. */ if (STRCMP(p_enc, "utf-8") != 0) { + static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"); + msg_source(hl_attr(HLF_W)); - MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"), - hl_attr(HLF_W)); + MSG_ATTR(_(w_arabic), hl_attr(HLF_W)); +#ifdef FEAT_EVAL + set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1); +#endif } # ifdef FEAT_MBYTE diff --git a/src/version.c b/src/version.c index 252a73848..415329a1a 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 146, +/**/ 145, /**/ 144, |