From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 30 Dec 2019 16:55:34 +0000 (+0100)
Subject: patch 8.2.0060: message test only runs with one encoding
X-Git-Tag: v8.2.0060
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0337e360e9f0b51a1a5627239d80a45dee8c3be;p=vim

patch 8.2.0060: message test only runs with one encoding

Problem:    Message test only runs with one encoding. (Dominique Pelle)
Solution:   Run the test with "utf-8" and "latin1".  Fix underflow. (related
            to #5410)
---

diff --git a/src/message.c b/src/message.c
index 4040e5ba5..7a6e34609 100644
--- a/src/message.c
+++ b/src/message.c
@@ -307,7 +307,8 @@ trunc_string(
     }
     else
     {
-	for (i = (int)STRLEN(s); len + (n = ptr2cells(s + i - 1)) <= room; --i)
+	for (i = (int)STRLEN(s);
+		   i - 1 >= 0 && len + (n = ptr2cells(s + i - 1)) <= room; --i)
 	    len += n;
     }
 
diff --git a/src/message_test.c b/src/message_test.c
index 6faad65fe..23650dd6b 100644
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -100,8 +100,14 @@ main(int argc, char **argv)
     params.argc = argc;
     params.argv = argv;
     common_init(&params);
+
+    set_option_value((char_u *)"encoding", 0, (char_u *)"utf-8", 0);
     init_chartab();
+    test_trunc_string();
 
+    set_option_value((char_u *)"encoding", 0, (char_u *)"latin1", 0);
+    init_chartab();
     test_trunc_string();
+
     return 0;
 }
diff --git a/src/version.c b/src/version.c
index aeb1920b9..3a22ca41d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    60,
 /**/
     59,
 /**/