diff --git a/src/register.c b/src/register.c
index 8680c6b..8c951b7 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2908,11 +2908,12 @@
 	{
 	    charlen = 0;
 	    for (i = start; i < len; ++i)	// find the end of the line
+	    {
 		if (str[i] == '\n')
 		    break;
+		charlen += mb_ptr2cells_len(str + i, len - i);
+	    }
 	    i -= start;			// i is now length of line
-	    if (start < len)
-		charlen = mb_charlen_len(str + start, i);
 	    if (charlen > maxlen)
 		maxlen = charlen;
 	    if (append)
@@ -2929,7 +2930,7 @@
 		mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra);
 	    if (append)
 		vim_free(y_ptr->y_array[lnum]);
-	    if (i)
+	    if (i > 0)
 		mch_memmove(s + extra, str + start, (size_t)i);
 	    extra += i;
 	    s[extra] = NUL;
diff --git a/src/version.c b/src/version.c
index ab4ffeb..eab59f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2934,
+/**/
     2933,
 /**/
     2932,