# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1622827803 -7200
# Node ID fd245e5d4585e8d9b9071d7c07e8dd2c7970e12f
# Parent  83d41b2de004e7c0d73f71329f32f2cc3da57d39
patch 8.2.2935: calculating register width is not always needed

Commit: https://github.com/vim/vim/commit/6c4c404c580fadd69e39297a6cb4b214f2fcb6d6
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jun 4 19:17:07 2021 +0200

    patch 8.2.2935: calculating register width is not always needed

    Problem:    Calculating register width is not always needed. (Christian
                Brabandt)
    Solution:   Only calculate the width when the type is MBLOCK.

diff --git a/src/register.c b/src/register.c
--- a/src/register.c
+++ b/src/register.c
@@ -2836,7 +2836,6 @@ str_to_reg(
     char_u	**ss;
     char_u	**pp;
     long	maxlen;
-    int	charlen;
 
     if (y_ptr->y_array == NULL)		// NULL means empty register
 	y_ptr->y_size = 0;
@@ -2895,23 +2894,28 @@ str_to_reg(
     {
 	for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum)
 	{
-	    charlen = MB_CHARLEN(*ss);
-	    i = (long)STRLEN(*ss);
-	    pp[lnum] = vim_strnsave(*ss, i);
-	    if (charlen > maxlen)
-		maxlen = charlen;
+	    pp[lnum] = vim_strsave(*ss);
+	    if (type == MBLOCK)
+	    {
+		int charlen = mb_string2cells(*ss, -1);
+
+		if (charlen > maxlen)
+		    maxlen = charlen;
+	    }
 	}
     }
     else
     {
 	for (start = 0; start < len + extraline; start += i + 1)
 	{
-	    charlen = 0;
+	    int 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);
+		if (type == MBLOCK)
+		    charlen += mb_ptr2cells_len(str + i, len - i);
 	    }
 	    i -= start;			// i is now length of line
 	    if (charlen > maxlen)
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2935,
+/**/
     2934,
 /**/
     2933,