From 9deef1aa227717a2c73ab1d4ad2c883d9b3c2f24 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 6 Jun 2023 07:13:08 +0800 Subject: vim-patch:9.0.1612: "skipcol" not reset when using multi-byte characters (#23928) Problem: "skipcol" not reset when using multi-byte characters. Solution: Compare with w_virtcol instead of w_cursor.col. (closes vim/vim#12457) https://github.com/vim/vim/commit/15d4747ffd197ffa5b5a41a852a1fe93b6cc35fd Co-authored-by: Bram Moolenaar --- src/nvim/move.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/move.c b/src/nvim/move.c index 5934ad90e9..f859294d65 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -1826,10 +1826,13 @@ void scroll_cursor_top(int min_scroll, int always) } } check_topfill(curwin, false); - // TODO(vim): if the line doesn't fit may optimize w_skipcol - if (curwin->w_topline == curwin->w_cursor.lnum - && curwin->w_skipcol >= curwin->w_cursor.col) { - reset_skipcol(curwin); + if (curwin->w_topline == curwin->w_cursor.lnum) { + validate_virtcol(); + if (curwin->w_skipcol >= curwin->w_virtcol) { + // TODO(vim): if the line doesn't fit may optimize w_skipcol instead + // of making it zero + reset_skipcol(curwin); + } } if (curwin->w_topline != old_topline || curwin->w_skipcol != old_skipcol -- cgit