From 5498a41f5a62c3877fee0185adf3bf7245a9a547 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 11 Jul 2016 23:19:05 +0200
Subject: [PATCH] patch 7.4.2028 Problem:    cppcheck warns for using index
 before limits check. Solution:   Swap the expressions. (Dominique Pelle)

---
 src/mbyte.c   | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mbyte.c b/src/mbyte.c
index 7bc184ba2..f85d5ad60 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4357,7 +4357,7 @@ enc_locale(void)
 	else
 	    s = p + 1;
     }
-    for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i)
+    for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; ++i)
     {
 	if (s[i] == '_' || s[i] == '-')
 	    buf[i] = '-';
diff --git a/src/version.c b/src/version.c
index 93f3c03fa..6d75f76f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2028,
 /**/
     2027,
 /**/
-- 
2.50.1