aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/message.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index cc9ef15f13..bf54284881 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1986,7 +1986,7 @@ static void msg_puts_printf(const char *str, const ptrdiff_t maxlen)
char buf[4];
char *p;
- while (*s != NUL && (maxlen < 0 || s - str < maxlen)) {
+ while ((maxlen < 0 || s - str < maxlen) && *s != NUL) {
if (!(silent_mode && p_verbose == 0)) {
// NL --> CR NL translation (for Unix, not for "--version")
p = &buf[0];
diff --git a/src/nvim/version.c b/src/nvim/version.c
index db3b9b51b2..a354634218 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -92,7 +92,7 @@ static int included_patches[] = {
// 2352 NA
// 2351 NA
// 2350,
- // 2349,
+ 2349,
2348,
2347,
2346,