patch 7.4.796

Problem:    Warning from 64 bit compiler.
Solution:   Add type cast. (Mike Williams)

diff --git a/src/ops.c b/src/ops.c
index 3441f05ddeb258400ccba1b21631499b0903c6b1..a9eec34dc1f9f0f21472b13b6bece8c172c0a15d 100644 (file)
--- 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 7cea9b1aa8a136077082e905ac789f056d64b069..0bab900a916b9adb9deda955eb03171af5c81532 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    796,
 /**/
     795,
 /**/