diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-09-24 20:11:30 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-01 22:27:43 -0400 |
| commit | 8d0bc3c18964db51fec4b204a122e946393f2d6d (patch) | |
| tree | 9a6ebfb9698af830c14a9e393160d0c0bbebabcb /src/nvim/normal.c | |
| parent | 24c4d4e1258f8ca34eb581550776ef613c27a689 (diff) | |
| download | rneovim-8d0bc3c18964db51fec4b204a122e946393f2d6d.tar.gz rneovim-8d0bc3c18964db51fec4b204a122e946393f2d6d.tar.bz2 rneovim-8d0bc3c18964db51fec4b204a122e946393f2d6d.zip | |
vim-patch:8.1.1758: count of g$ not used correctly when text is not wrapped
Problem: Count of g$ not used correctly when text is not wrapped.
Solution: Do use the count. (Christian Brabandt, closes vim/vim#4729, closes vim/vim#4566)
https://github.com/vim/vim/commit/d5c8234517c18fa059b78f59eb96c35eda323dae
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index d4065cc06e..6b76082772 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -6795,10 +6795,14 @@ static void nv_g_cmd(cmdarg_T *cap) } else if (nv_screengo(oap, FORWARD, cap->count1 - 1) == false) clearopbeep(oap); } 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_inner - 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; |