summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-09-16 15:46:08 +0200
committerBram Moolenaar <Bram@vim.org>2020-09-16 15:46:08 +0200
commit573545a55afb5d42614cdb69f356abb32409270b (patch)
treeeb69a65191fb473138c6831adaa027344f8564e4 /src
parent05eb5b9cae123b138bbd23cc77e50657ece6b4ad (diff)
patch 8.2.1694: compiler warning for loss if datav8.2.1694
Problem: Compiler warning for loss if data. Solution: Add typecast.
Diffstat (limited to 'src')
-rw-r--r--src/ops.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index d572940346..99388a60b8 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2840,7 +2840,8 @@ do_addsub(
// Delete the one character before the insert.
curwin->w_cursor = save_pos;
(void)del_char(FALSE);
- curwin->w_cursor.col = STRLEN(ml_get_curline()) - bytes_after;
+ curwin->w_cursor.col = (colnr_T)(STRLEN(ml_get_curline())
+ - bytes_after);
--todel;
}
while (todel-- > 0)
diff --git a/src/version.c b/src/version.c
index dab2bd8e27..c3efafd0bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1694,
+/**/
1693,
/**/
1692,