updated for version 7.2-146

diff --git a/src/fileio.c b/src/fileio.c
index 0d0269b7fbb76d2d4111504b2a708fcdb0e45028..eec68e84b95f28cca290b5849b992ba1974c14fd 100644 (file)
--- 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 0487290247fe9114da6aae54a8b49c9ef565c5e8..3fdcdecb191c560bb510fc7f3852940758c10f85 100644 (file)
--- 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 cc3363164895bcdcb7eed4d4d2b4dfd80d6ce5ff..5e71c9bf344f1c4c996a550de5ba98181f39022f 100644 (file)
--- 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 252a73848a5f045b9384d2252e9ea6b79656c322..415329a1ada36a98a68c0dbf9812d353a92567c8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    146,
 /**/
     145,
 /**/