summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 0b68309697..3c865e7849 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4764,8 +4764,8 @@ do_sub(eap)
* substitute may have inserted or
* deleted characters before the
* cursor. */
- len_change = STRLEN(new_line)
- - STRLEN(orig_line);
+ len_change = (int)STRLEN(new_line)
+ - (int)STRLEN(orig_line);
curwin->w_cursor.col += len_change;
ml_replace(lnum, new_line, FALSE);
}
diff --git a/src/version.c b/src/version.c
index f289e437e1..8cd0432d02 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 797,
+/**/
796,
/**/
795,