From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 12 Mar 2017 20:31:58 +0000 (+0100)
Subject: patch 8.0.0454: compiler warnings for "always true" comparison
X-Git-Tag: v8.0.0454
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=977d03733601948ab334fec24d0da82bc18c57c3;p=vim

patch 8.0.0454: compiler warnings for "always true" comparison

Problem:    Compiler warnings for comparing unsigned char with 256 always
            being true. (Manuel Ortega)
Solution:   Add type cast.
---

diff --git a/src/charset.c b/src/charset.c
index 2091d233b..29c587b52 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1090,7 +1090,7 @@ win_lbr_chartabsize(
      */
     if (wp->w_p_lbr
 	    && VIM_ISBREAK(c)
-	    && !VIM_ISBREAK(s[1])
+	    && !VIM_ISBREAK((int)s[1])
 	    && wp->w_p_wrap
 # ifdef FEAT_WINDOWS
 	    && wp->w_width != 0
@@ -1120,7 +1120,7 @@ win_lbr_chartabsize(
 	    if (!(c != NUL
 		    && (VIM_ISBREAK(c)
 			|| (!VIM_ISBREAK(c)
-			    && (col2 == col || !VIM_ISBREAK(*ps))))))
+			    && (col2 == col || !VIM_ISBREAK((int)*ps))))))
 		break;
 
 	    col2 += win_chartabsize(wp, s, col2);
diff --git a/src/screen.c b/src/screen.c
index b4fff18d9..206b50fc0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4554,7 +4554,7 @@ win_line(
 		 * Found last space before word: check for line break.
 		 */
 		if (wp->w_p_lbr && c0 == c
-				      && VIM_ISBREAK(c) && !VIM_ISBREAK(*ptr))
+				  && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr))
 		{
 # ifdef FEAT_MBYTE
 		    int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
diff --git a/src/version.c b/src/version.c
index 28c929429..2f9c3150d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    454,
 /**/
     453,
 /**/