commit 362e1a30c6f3527d5d0efc328c2fb448290cd6fc
author Bram Moolenaar <Bram@vim.org> Mon Mar 06 23:29:24 2006 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Mar 06 23:29:24 2006 +0000
tree 91c408352947bec09aee2032949ef1acef606d15
parent 768b8c4dbcb3cdaccab87daa833ab176a438cc3c

updated for version 7.0216

src/message.c

diff --git a/src/message.c b/src/message.c
index 0cba2cc..c3acc40 100644
--- a/src/message.c
+++ b/src/message.c
@@ -293,10 +293,12 @@
     else if (enc_utf8)
     {
 	/* For UTF-8 we can go backwards easily. */
-	i = (int)STRLEN(s);
+	half = i = (int)STRLEN(s);
 	for (;;)
 	{
-	    half = i - (*mb_head_off)(s, s + i - 1) - 1;
+	    do
+		half = half - (*mb_head_off)(s, s + half - 1) - 1;
+	    while (utf_iscomposing(utf_ptr2char(s + half)) && half > 0);
 	    n = ptr2cells(s + half);
 	    if (len + n > room)
 		break;
@@ -1723,7 +1725,7 @@
     char_u	*longstr;
     int		attr;
 {
-    msg_puts_long_len_attr(longstr, (int)strlen((char *)longstr), attr);
+    msg_puts_long_len_attr(longstr, (int)STRLEN(longstr), attr);
 }
 
     void