From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 6 Jul 2008 17:16:02 +0000 (+0000)
Subject: updated for version 7.2a-015
X-Git-Tag: v7.2a.015
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3c722a01531e39710de0cbbd8bab3004e7e50c9;p=thirdparty%2Fvim.git

updated for version 7.2a-015
---

diff --git a/src/message.c b/src/message.c
index cb749da7f5..41dfffbaeb 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1390,8 +1390,10 @@ msg_outtrans_len_attr(msgstr, len, attr)
 									attr);
 		plain_start = str + 1;
 		msg_puts_attr(s, attr == 0 ? hl_attr(HLF_8) : attr);
+		retval += STRLEN(s);
 	    }
-	    retval += char2cells(*str);
+	    else
+		++retval;
 	    ++str;
 	}
     }
diff --git a/src/version.c b/src/version.c
index 28ac16a26a..a9773ddbfa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    15,
 /**/
     14,
 /**/