summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/regexp.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/regexp.c b/src/regexp.c
index edd1293a53..2c740d303d 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2052,7 +2052,7 @@ vim_regsub_both(
if (copy)
{
if (eval_result[nested] != NULL &&
- STRLEN(eval_result[nested]) < destlen)
+ (int)STRLEN(eval_result[nested]) < destlen)
{
STRCPY(dest, eval_result[nested]);
dst += STRLEN(eval_result[nested]);
diff --git a/src/version.c b/src/version.c
index 61fe83b785..fe1495ab6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1853,
+/**/
1852,
/**/
1851,