diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-27 18:44:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-27 18:44:57 +0200 |
| commit | d5c8234517c18fa059b78f59eb96c35eda323dae (patch) | |
| tree | abd953fac030f67c31a0b4b9cfcc01db6156a89a | |
| parent | 298466629119eda501cfdf7824797f05045e67ca (diff) | |
| download | vim-git-d5c8234517c18fa059b78f59eb96c35eda323dae.tar.gz | |
patch 8.1.1758: count of g$ not used correctly when text is not wrappedv8.1.1758
Problem: Count of g$ not used correctly when text is not wrapped.
Solution: Do use the count. (Christian Brabandt, closes #4729, closes #4566)
| -rw-r--r-- | src/normal.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_normal.vim | 55 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 62 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c index ce1acb555..acc5b64ab 100644 --- a/src/normal.c +++ b/src/normal.c @@ -8062,10 +8062,14 @@ nv_g_cmd(cmdarg_T *cap) } else { + if (cap->count1 > 1) + // if it fails, let the cursor still move to the last char + cursor_down(cap->count1 - 1, FALSE); + i = curwin->w_leftcol + curwin->w_width - col_off - 1; coladvance((colnr_T)i); - /* Make sure we stick in this column. */ + // Make sure we stick in this column. validate_virtcol(); curwin->w_curswant = curwin->w_virtcol; curwin->w_set_curswant = FALSE; diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index a9fe46a22..f48eaa0f3 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -2732,3 +2732,58 @@ Piece of Java close! endfunc + +fun! Test_normal_gdollar_cmd() + if !has("jumplist") + return + endif + " Tests for g cmds + call Setup_NewWindow() + " Make long lines that will wrap + %s/$/\=repeat(' foobar', 10)/ + 20vsp + set wrap + " Test for g$ with count + norm! gg + norm! 0vg$y + call assert_equal(20, col("'>")) + call assert_equal('1 foobar foobar foob', getreg(0)) + norm! gg + norm! 0v4g$y + call assert_equal(72, col("'>")) + call assert_equal('1 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.."\n", getreg(0)) + norm! gg + norm! 0v6g$y + call assert_equal(40, col("'>")) + call assert_equal('1 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '2 foobar foobar foobar foobar foobar foo', getreg(0)) + set nowrap + " clean up + norm! gg + norm! 0vg$y + call assert_equal(20, col("'>")) + call assert_equal('1 foobar foobar foob', getreg(0)) + norm! gg + norm! 0v4g$y + call assert_equal(20, col("'>")) + call assert_equal('1 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '2 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '3 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '4 foobar foobar foob', getreg(0)) + norm! gg + norm! 0v6g$y + call assert_equal(20, col("'>")) + call assert_equal('1 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '2 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '3 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '4 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '5 foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar'.. "\n".. + \ '6 foobar foobar foob', getreg(0)) + " Move to last line, also down movement is not possible, should still move + " the cursor to the last visible char + norm! G + norm! 0v6g$y + call assert_equal(20, col("'>")) + call assert_equal('100 foobar foobar fo', getreg(0)) + bw! +endfunc diff --git a/src/version.c b/src/version.c index 5444c772a..209f3c966 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1758, +/**/ 1757, /**/ 1756, |