Mercurial > vim

comparison src/normal.c @ 17520:827d29c8f7e8 v8.1.1758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1758: count of g$ not used correctly when text is not wrapped commit https://github.com/vim/vim/commit/d5c8234517c18fa059b78f59eb96c35eda323dae Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 27 18:44:57 2019 +0200 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 https://github.com/vim/vim/issues/4729, closes https://github.com/vim/vim/issues/4566)
author Bram Moolenaar <Bram@vim.org>
date Sat, 27 Jul 2019 19:00:05 +0200
parents a7d1cd2ea886
children 9efb4dda9720
comparison
equal deleted inserted replaced
17519:88eefa30af20 17520:827d29c8f7e8
8060 else if (nv_screengo(oap, FORWARD, cap->count1 - 1) == FAIL) 8060 else if (nv_screengo(oap, FORWARD, cap->count1 - 1) == FAIL)
8061 clearopbeep(oap); 8061 clearopbeep(oap);
8062 } 8062 }
8063 else 8063 else
8064 { 8064 {
8065 if (cap->count1 > 1)
8066 // if it fails, let the cursor still move to the last char
8067 cursor_down(cap->count1 - 1, FALSE);
8068
8065 i = curwin->w_leftcol + curwin->w_width - col_off - 1; 8069 i = curwin->w_leftcol + curwin->w_width - col_off - 1;
8066 coladvance((colnr_T)i); 8070 coladvance((colnr_T)i);
8067 8071
8068 /* Make sure we stick in this column. */ 8072 // Make sure we stick in this column.
8069 validate_virtcol(); 8073 validate_virtcol();
8070 curwin->w_curswant = curwin->w_virtcol; 8074 curwin->w_curswant = curwin->w_virtcol;
8071 curwin->w_set_curswant = FALSE; 8075 curwin->w_set_curswant = FALSE;
8072 } 8076 }
8073 } 8077 }