patch 9.1.1216: Pasting the '.' register multiple times may not work

Problem:  Pasting the '.' register multiple times may work incorrectly
          when the last insert starts with Ctrl-D and ends with '0'.
          (after 9.1.1212)
Solution: Restore the missing assignment (zeertzjq).

closes: #16908

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/edit.c b/src/edit.c
index a23f66bad5af280a23ed1fcd8d5a6dc5f6532981..42ee125ba669f65db02e833dd24dba4e51914735 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -79,7 +79,7 @@ static colnr_T        Insstart_blank_vcol;    // vcol for first inserted blank
 static int     update_Insstart_orig = TRUE; // set Insstart_orig to Insstart
 
 static string_T        last_insert = {NULL, 0};    // the text of the previous insert,
-                                       // K_SPECIAL and CSI are escaped
+                                           // K_SPECIAL and CSI are escaped
 static int     last_insert_skip; // nr of chars in front of previous insert
 static int     new_insert_skip;  // nr of chars in front of current insert
 static int     did_restart_edit;       // "restart_edit" when calling edit()
@@ -2915,7 +2915,7 @@ stuff_inserted(
     long    count,     // Repeat this many times
     int            no_esc)     // Don't add an ESC at the end
 {
-    string_T   *insert;                                    // text to be inserted
+    string_T   *insert;                                // text to be inserted
     char_u     last = ' ';
 
     insert = get_last_insert();
@@ -2934,7 +2934,7 @@ stuff_inserted(
        char_u  *p;
 
        // look for the last ESC in 'insert'
-       for (p = insert->string + (insert->length - 1); p >= insert->string; --p)
+       for (p = insert->string + insert->length - 1; p >= insert->string; --p)
        {
            if (*p == ESC)
            {
@@ -2942,13 +2942,17 @@ stuff_inserted(
                break;
            }
        }
+    }
+
+    if (insert->length > 0)
+    {
+       char_u  *p = insert->string + insert->length - 1;
 
        // when the last char is either "0" or "^" it will be quoted if no ESC
        // comes after it OR if it will insert more than once and "ptr"
        // starts with ^D.      -- Acevedo
-       if (p >= insert->string
-           && (*p == '0' || *p == '^')
-           && (no_esc || (*insert->string == Ctrl_D && count > 1)))
+       if ((*p == '0' || *p == '^')
+               && (no_esc || (*insert->string == Ctrl_D && count > 1)))
        {
            last = *p;
            --insert->length;

diff --git a/src/getchar.c b/src/getchar.c
index 39e9e786e9d555e5d2f6904919c4a5277f7e264a..c26b4427a9d970123bc829f394bcd9595549bb80 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -204,7 +204,7 @@ get_recorded(void)
 get_inserted(void)
 {
     size_t len = 0;
-    char_u* str = get_buffcont(&redobuff, FALSE, &len);
+    char_u *str = get_buffcont(&redobuff, FALSE, &len);
     string_T ret = { str, len };
     return ret;
 }

diff --git a/src/testdir/test_put.vim b/src/testdir/test_put.vim
index 94e4f475c0175d04f88de4ec571cafb714bc0f58..2af31db3dfac2b8f23024a6bbe6ed2fa0d3fa404 100644 (file)
--- a/src/testdir/test_put.vim
+++ b/src/testdir/test_put.vim
@@ -328,4 +328,31 @@ func Test_put_list()
   bw!
 endfunc
 
+" Test pasting the '.' register
+func Test_put_inserted()
+  new
+
+  for s in ['', '…', '0', '^', '+0', '+^', '…0', '…^']
+    call setline(1, 'foobar')
+    exe $"normal! A{s}\<Esc>"
+    call assert_equal($'foobar{s}', getline(1))
+    normal! ".p
+    call assert_equal($'foobar{s}{s}', getline(1))
+    normal! ".2p
+    call assert_equal($'foobar{s}{s}{s}{s}', getline(1))
+  endfor
+
+  for s in ['0', '^', '+0', '+^', '…0', '…^']
+    call setline(1, "\t\t\t\t\tfoobar")
+    exe $"normal! A\<C-D>{s}\<Esc>"
+    call assert_equal($"\t\t\t\tfoobar{s}", getline(1))
+    normal! ".p
+    call assert_equal($"\t\t\tfoobar{s}{s}", getline(1))
+    normal! ".2p
+    call assert_equal($"\tfoobar{s}{s}{s}{s}", getline(1))
+  endfor
+
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 435c27d0df3c6ad29d3b4e191ca462b0f3f3a7ec..2e013df2617765fe99dc839078a19f7b61d6c284 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1216,
 /**/
     1215,
 /**/