aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-08-21 06:08:28 +0800
committerzeertzjq <zeertzjq@outlook.com>2023-08-21 06:11:16 +0800
commit7485fd0518557f7f49f9b636a80e4e3b523dd9dd (patch)
treeabeac343c4b025d3171d9cd751e5f5f00ccd9966 /src/nvim/normal.c
parent18062f70d81ee8d3d9dcad2fe3afe8e2431cbbdf (diff)
downloadrneovim-7485fd0518557f7f49f9b636a80e4e3b523dd9dd.tar.gz
rneovim-7485fd0518557f7f49f9b636a80e4e3b523dd9dd.tar.bz2
rneovim-7485fd0518557f7f49f9b636a80e4e3b523dd9dd.zip
vim-patch:9.0.1753: can't move to last non-blank char
Problem: can't move to last non-blank char Solution: Make g<end> behave like that Make it possible to move to last non-blank char on a line We can distinguish between g0 and g^ to move to the very first character and the first non-blank char. And while we can move to the last screen char, we cannot go to the last non-blank screen char. Since I think g$ is the more widely used and known movement command (and g<end> is synonymous to it) change the behaviour of g<end> to move to last non-screen char instead and don't have this be the same command as the g$ command anymore. If you want to keep the old behaviour, you can use: ``` nnoremap g<end> g$ ``` Add a test to verify the behaviour. closes: vim/vim#12593 https://github.com/vim/vim/commit/b5f6fe9ca2661d06bc0be839447ce1995450b9de Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index f9689d7593..4a4b675591 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;
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.