summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index bff54d008c..aa3506ebef 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2285,7 +2285,7 @@ put_msg_win(win_T *wp, int where, char_u *t_s, char_u *end, linenr_T lnum)
redraw_win_later(wp, UPD_NOT_VALID);
// set msg_col so that a newline is written if needed
- msg_col = STRLEN(t_s);
+ msg_col = (int)STRLEN(t_s);
}
#endif
diff --git a/src/version.c b/src/version.c
index 80a532e492..69cfafe500 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 298,
+/**/
297,
/**/
296,