summaryrefslogtreecommitdiff
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
commit33c3a694fca7978cdd28c5e41b498473a08bc05e (patch)
tree39b9ae3e5f3fb218b71205db4c80a8fb2d50cdd4
parentdd1616e6cedf798a5e6db3bf8cec1fc79a0481d0 (diff)
downloadvim-git-33c3a694fca7978cdd28c5e41b498473a08bc05e.tar.gz
patch 7.4.796v7.4.796
Problem: Warning from 64 bit compiler. Solution: Add type cast. (Mike Williams)
-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 3441f05dd..a9eec34dc 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 7cea9b1aa..0bab900a9 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,