aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/mbyte.c9
-rw-r--r--src/nvim/version.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index e8b1131767..ec4969d4f6 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -2109,13 +2109,14 @@ char_u * enc_locale(void)
} else
s = p + 1;
}
- for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i) {
- if (s[i] == '_' || s[i] == '-')
+ for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; i++) {
+ if (s[i] == '_' || s[i] == '-') {
buf[i] = '-';
- else if (isalnum((int)s[i]))
+ } else if (isalnum((int)s[i])) {
buf[i] = TOLOWER_ASC(s[i]);
- else
+ } else {
break;
+ }
}
buf[i] = NUL;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9ad40cddd2..8497d213e7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -412,7 +412,7 @@ static int included_patches[] = {
// 2031,
// 2030 NA
// 2029,
- // 2028,
+ 2028,
// 2027 NA
// 2026 NA
// 2025 NA