Mercurial > vim
changeset 34028:bcf1429cb1fc v9.0.2188
patch 9.0.2188: cursor wrong after { in single line buffer
Commit: https://github.com/vim/vim/commit/9e6549d2fb282c45a2492ea95fe7ba54c2082c3e
Author: Gary Johnson <garyjohn@spocom.com>
Date: Wed Dec 27 19:12:43 2023 +0100
patch 9.0.2188: cursor wrong after { in single line buffer
Problem: cursor wrong after { in single line buffer
(Edwin Chan)
Solution: do not place the cursor at the end for a single
line buffer when moving backwards
(Gary Johnson)
closes: #13780
closes: #13783
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 27 Dec 2023 19:30:03 +0100 |
| parents | 75e19c1e8048 |
| children | e278a7034aa8 |
| files | src/testdir/test_normal.vim src/textobject.c src/version.c |
| diffstat | 3 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -4164,4 +4164,21 @@ func Test_normal34_zet_large() norm! z9765405999999999999 endfunc +" Test for { and } paragraph movements in a single line +func Test_brace_single_line() + let text =<< trim [DATA] + foobar one two three + [DATA] + + new + call setline(1, text) + 1 + norm! 0} + + call assert_equal([0, 1, 20, 0], getpos('.')) + norm! { + call assert_equal([0, 1, 1, 0], getpos('.')) + bw! +endfunc + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/textobject.c +++ b/src/textobject.c @@ -226,7 +226,7 @@ findpar( if (both && *ml_get(curr) == '}') // include line with '}' ++curr; curwin->w_cursor.lnum = curr; - if (curr == curbuf->b_ml.ml_line_count && what != '}') + if (curr == curbuf->b_ml.ml_line_count && what != '}' && dir == FORWARD) { char_u *line = ml_get(curr);