patch 9.1.1167: mark '] wrong after copying text object
Commit:
https://github.com/vim/vim/commit/360a39ae6c823dd3e3c89c209b544f345c6d86dd
Author: Jim Zhou <jimzhou...@gmail.com>
Date: Mon Mar 3 19:53:26 2025 +0100
patch 9.1.1167: mark '] wrong after copying text object
Problem: mark '] wrong after copying text object (ubaldot)
Solution: Adjust position of '] for non-linewise, exclusive motions
(Jim Zhou)
related: #16679
closes: #16772
Signed-off-by: Jim Zhou <jimzhou...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/register.c b/src/register.c
index 465bee3be..7ba69be06 100644
--- a/src/register.c
+++ b/src/register.c
@@ -1374,6 +1374,9 @@ op_yank(oparg_T *oap, int deleting, int mess)
curbuf->b_op_start.col = 0;
curbuf->b_op_end.col = MAXCOL;
}
+ if (yanktype != MLINE && !oap->inclusive)
+ // Exclude the end position.
+ decl(&curbuf->b_op_end);
}
#ifdef FEAT_CLIPBOARD
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index 43f80be29..0ff1df84c 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -1154,4 +1154,54 @@ func Test_register_cursor_column_negative()
call StopVimInTerminal(buf)
endfunc
+" test '] mark generated by op_yank
+func Test_mark_from_yank()
+ new
+ " double quote object
+ call setline(1, 'test "yank" mark')
+ normal! yi"
+ call assert_equal([0, 1, 10, 0], getpos("']"))
+ normal! ya"
+ call assert_equal(getpos("']"), [0, 1, 13, 0], getpos("']"))
+ " single quote object
+ call setline(1, 'test ''yank'' mark')
+ normal! yi'
+ call assert_equal([0, 1, 10, 0], getpos("']"))
+ normal! ya'
+ call assert_equal([0, 1, 13, 0], getpos("']"))
+ " paren object
+ call setline(1, 'test (yank) mark')
+ call cursor(1, 9)
+ normal! yi(
+ call assert_equal([0, 1, 10, 0], getpos("']"))
+ call cursor(1, 9)
+ normal! ya(
+ call assert_equal([0, 1, 11, 0], getpos("']"))
+ " brace object
+ call setline(1, 'test {yank} mark')
+ call cursor(1, 9)
+ normal! yi{
+ call assert_equal([0, 1, 10, 0], getpos("']"))
+ call cursor(1, 9)
+ normal! ya{
+ call assert_equal([0, 1, 11, 0], getpos("']"))
+ " bracket object
+ call setline(1, 'test [yank] mark')
+ call cursor(1, 9)
+ normal! yi[
+ call assert_equal([0, 1, 10, 0], getpos("']"))
+ call cursor(1, 9)
+ normal! ya[
+ call assert_equal([0, 1, 11, 0], getpos("']"))
+ " block object
+ call setline(1, 'test <yank> mark')
+ call cursor(1, 9)
+ normal! yi<
+ call assert_equal([0, 1, 10, 0], getpos("']"))
+ call cursor(1, 9)
+ normal! ya<
+ call assert_equal([0, 1, 11, 0], getpos("']"))
+ bw!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 34459ef01..29ea4beef 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 */
+/**/
+ 1167,
/**/
1166,
/**/
--
--
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tpB1J-006hDj-0a%40256bit.org.
