From: Bram Moolenaar Date: Wed, 22 Jul 2015 20:46:13 +0000 (+0200) Subject: patch 7.4.796 X-Git-Tag: v7.4.796 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33c3a694fca7978cdd28c5e41b498473a08bc05e;p=vim 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 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 796, /**/ 795, /**/