diff --git a/src/ops.c b/src/ops.c
index 3441f05..a9eec34 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5429,10 +5429,9 @@
 	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 7cea9b1..0bab900 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    796,
+/**/
     795,
 /**/
     794,