changeset 6957:d19e79d29bf9 v7.4.796

patch 7.4.796 Problem: Warning from 64 bit compiler. Solution: Add type cast. (Mike Williams)
author Bram Moolenaar <bram@vim.org>
date Wed, 22 Jul 2015 22:46:13 +0200
parents ad7ee058c03b
children 8840c1ae3b50
files src/ops.c src/version.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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,