summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-07-22 22:46:13 +0200
committerBram Moolenaar <bram@vim.org>2015-07-22 22:46:13 +0200
commit9586404e8bb16a08aebaee73f183599c62630ce0 (patch)
tree6943c64cc0a027ce292bd883a61daef1389ef128 /src
parent17daee190b470b8b6d74c16f75d3413ecadea93e (diff)
downloadvim-9586404e8bb16a08aebaee73f183599c62630ce0.tar.gz
patch 7.4.796v7.4.796v7-4-796
Problem: Warning from 64 bit compiler. Solution: Add type cast. (Mike Williams)
Diffstat (limited to 'src')
-rw-r--r--src/ops.c5
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ops.c b/src/ops.c
index 3441f05d..a9eec34d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5429,10 +5429,9 @@ do_addsub(command, Prenum1, g_cmd)
if (VIsual_mode == 'V')
{
VIsual.col = 0;
- curwin->w_cursor.col = STRLEN(ptr);
+ curwin->w_cursor.col = (colnr_T)STRLEN(ptr);
}
- else if (VIsual_mode == Ctrl_V &&
- VIsual.col > curwin->w_cursor.col)
+ else if (VIsual_mode == Ctrl_V && VIsual.col > curwin->w_cursor.col)
{
t = VIsual;
VIsual.col = curwin->w_cursor.col;
diff --git a/src/version.c b/src/version.c
index 7cea9b1a..0bab900a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 796,
+/**/
795,
/**/
794,