diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-08-21 06:41:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 06:41:44 +0800 |
| commit | 10459e1ed0fe6429b15705567135c55e0778b262 (patch) | |
| tree | 9ff51a7708101ad4607bb0a180bc88f70c2538b7 /src | |
| parent | 18062f70d81ee8d3d9dcad2fe3afe8e2431cbbdf (diff) | |
| parent | 0c91cb4f03814bfdfe262c6d2693c6883c38719b (diff) | |
| download | rneovim-10459e1ed0fe6429b15705567135c55e0778b262.tar.gz rneovim-10459e1ed0fe6429b15705567135c55e0778b262.tar.bz2 rneovim-10459e1ed0fe6429b15705567135c55e0778b262.zip | |
Merge pull request #24805 from zeertzjq/vim-9.0.1753
vim-patch:9.0.{1753,1761}: g<End>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/normal.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index f9689d7593..e72a0fe385 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -5284,7 +5284,7 @@ static void nv_g_home_m_cmd(cmdarg_T *cap) if (flag) { do { i = gchar_cursor(); - } while (ascii_iswhite(i) && oneright()); + } while (ascii_iswhite(i) && oneright() == OK); curwin->w_valid &= ~VALID_WCOL; } curwin->w_set_curswant = true; @@ -5323,6 +5323,7 @@ static void nv_g_dollar_cmd(cmdarg_T *cap) oparg_T *oap = cap->oap; int i; int col_off = curwin_col_off(); + const bool flag = cap->nchar == K_END || cap->nchar == K_KEND; oap->motion_type = kMTCharWise; oap->inclusive = true; @@ -5373,6 +5374,12 @@ static void nv_g_dollar_cmd(cmdarg_T *cap) // Make sure we stick in this column. update_curswant_force(); } + if (flag) { + do { + i = gchar_cursor(); + } while (ascii_iswhite(i) && oneleft() == OK); + curwin->w_valid &= ~VALID_WCOL; + } } /// "gi": start Insert at the last position. |