aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-03-28 19:47:40 +0800
committerGitHub <noreply@github.com>2024-03-28 19:47:40 +0800
commitdde2cc65fd2ac89ad88b19df08dc03cf1da50316 (patch)
tree8a4f3e3165e071639598fed73981ffa05b1c4b0d /src/nvim/normal.c
parent346a6390286cf58d8a618fd9d803523e497c8af1 (diff)
parent2f638c0ac6275bebacd12671481642fa43d7ba10 (diff)
downloadrneovim-dde2cc65fd2ac89ad88b19df08dc03cf1da50316.tar.gz
rneovim-dde2cc65fd2ac89ad88b19df08dc03cf1da50316.tar.bz2
rneovim-dde2cc65fd2ac89ad88b19df08dc03cf1da50316.zip
Merge pull request #28044 from luukvbaal/vim-9.1.0211
vim-patch:9.1.{0211,0215}
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 12f0bb631e..bbba8069c7 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2258,7 +2258,7 @@ static void nv_page(cmdarg_T *cap)
goto_tabpage(cap->count0);
}
} else {
- onepage(cap->arg, cap->count1);
+ pagescroll(cap->arg, cap->count1, false);
}
}
@@ -6394,12 +6394,8 @@ static void nv_at(cmdarg_T *cap)
/// Handle the CTRL-U and CTRL-D commands.
static void nv_halfpage(cmdarg_T *cap)
{
- if ((cap->cmdchar == Ctrl_U && curwin->w_cursor.lnum == 1)
- || (cap->cmdchar == Ctrl_D
- && curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count)) {
- clearopbeep(cap->oap);
- } else if (!checkclearop(cap->oap)) {
- halfpage(cap->cmdchar == Ctrl_D, cap->count0);
+ if (!checkclearop(cap->oap)) {
+ pagescroll(cap->cmdchar == Ctrl_D, cap->count0, true);
}
}