patch 9.1.1216: Pasting the '.' register multiple times may not work
Commit:
https://github.com/vim/vim/commit/61b354442418539056cc7073a9aec353d297836c
Author: zeertzjq <[email protected]>
Date: Mon Mar 17 21:02:50 2025 +0100
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/edit.c b/src/edit.c
index a23f66bad..42ee125ba 100644
--- 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 39e9e786e..c26b4427a 100644
--- 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 94e4f475c..2af31db3d 100644
--- 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, " foobar")
+ exe $"normal! A\<C-D>{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
+
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 435c27d0d..2e013df26 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tuGrW-00GenU-QH%40256bit.org.
