summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-01-30 21:56:21 +0100
committerBram Moolenaar <Bram@vim.org>2013-01-30 21:56:21 +0100
commit04e5b5a22823fdf30e35c383aea8843f7c747eec (patch)
tree0c3d6a807f30f709afc09debda46dbb9a1748902
parente337e5f634dcb0e74999d67286125a85423e38a9 (diff)
downloadvim-git-04e5b5a22823fdf30e35c383aea8843f7c747eec.tar.gz
updated for version 7.3.797v7.3.797
Problem: Compiler warning for size_t to int conversion. (Skeept) Solution: Add type casts.
-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 0b6830969..3c865e784 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 f289e437e..8cd0432d0 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,