summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drawscreen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/drawscreen.c b/src/drawscreen.c
index da0cd1306..44c2dc52b 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -2036,7 +2036,7 @@ win_update(win_T *wp)
{
colnr_T t;
- pos.col = STRLEN(ml_get_buf(wp->w_buffer,
+ pos.col = (int)STRLEN(ml_get_buf(wp->w_buffer,
pos.lnum, FALSE));
getvvcol(wp, &pos, NULL, NULL, &t);
if (toc < t)
diff --git a/src/version.c b/src/version.c
index 30db741ed..e2108a025 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3132,
+/**/
3131,
/**/
3130,