From 69af5e8782e601fe9c1e39adf49ce16728719a73 Mon Sep 17 00:00:00 2001 From: Luuk van Baal Date: Wed, 26 Apr 2023 04:00:38 +0200 Subject: vim-patch:9.0.0645: CTRL-Y does not stop at line 1 Problem: CTRL-Y does not stop at line 1. (John Marriott) Solution: Stop at line 1 when 'smoothscroll' is not set. (closes vim/vim#11261) https://github.com/vim/vim/commit/8df9748edb2ac8bd025e34e06194ac210667c97a Co-authored-by: Bram Moolenaar --- src/nvim/move.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/nvim') diff --git a/src/nvim/move.c b/src/nvim/move.c index a3c4e18f5d..75f5c6438b 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -1109,10 +1109,12 @@ bool scrolldown(long line_count, int byfold) curwin->w_topfill++; done++; } else { - if (curwin->w_topline == 1 && curwin->w_skipcol < width1) { + // break when at the very top + if (curwin->w_topline == 1 && (!curwin->w_p_sms || curwin->w_skipcol < width1)) { break; } if (curwin->w_p_wrap && curwin->w_p_sms && curwin->w_skipcol >= width1) { + // scroll a screen line down if (curwin->w_skipcol >= width1 + width2) { curwin->w_skipcol -= width2; } else { @@ -1121,6 +1123,7 @@ bool scrolldown(long line_count, int byfold) redraw_later(curwin, UPD_NOT_VALID); done++; } else { + // scroll a text line down curwin->w_topline--; curwin->w_skipcol = 0; curwin->w_topfill = 0; -- cgit