summaryrefslogtreecommitdiffstats
path: root/src/move.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-04-01 19:54:40 +0100
committerBram Moolenaar <Bram@vim.org>2023-04-01 19:54:40 +0100
commit38d867f041349e1400c2cce9cac06f59ae6ccbb1 (patch)
treecbd455116be456ac8a54b53c6b2f16628cb2a41c /src/move.c
parent39c9ec16ea7ef13c5d783481542ee9aa6c05282c (diff)
patch 9.0.1435: scrolling too many lines when 'wrap' and 'diff' are setv9.0.1435
Problem: Scrolling too many lines when 'wrap' and 'diff' are set. Solution: Only scroll by screenlines for 'diff' when 'wrap' is not set. (closes #12211)
Diffstat (limited to 'src/move.c')
-rw-r--r--src/move.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/move.c b/src/move.c
index e8b86caf17..77d8b5f85d 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1763,7 +1763,7 @@ scrolling_screenlines(int byfold UNUSED)
|| (byfold && hasAnyFolding(curwin))
# endif
# ifdef FEAT_DIFF
- || curwin->w_p_diff
+ || (curwin->w_p_diff && !curwin->w_p_wrap)
# endif
;
}