From a177c7df093f573c4bcb7b422bd615ce239be367 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Tue, 10 Aug 2021 22:32:08 +0200
Subject: refactor(plines): remove implicit curwin plines() function

---
 src/nvim/normal.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/nvim/normal.c')

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 54ca216a53..eb680203f7 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -5122,11 +5122,13 @@ static void nv_scroll(cmdarg_T *cap)
           --n;
           break;
         }
-        used += plines(curwin->w_topline + n);
-        if (used >= half)
+        used += plines_win(curwin, curwin->w_topline + n, true);
+        if (used >= half) {
           break;
-        if (hasFolding(curwin->w_topline + n, NULL, &lnum))
+        }
+        if (hasFolding(curwin->w_topline + n, NULL, &lnum)) {
           n = lnum - curwin->w_topline;
+        }
       }
       if (n > 0 && used > curwin->w_height_inner) {
         n--;
-- 
cgit 


From 7f71e8a6b3d2ce6257ed24cf74a8f130edc8f0b0 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Tue, 10 Aug 2021 22:59:29 +0200
Subject: refactor(plines): move out plines related code from misc1.c

---
 src/nvim/normal.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nvim/normal.c')

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index eb680203f7..2a530db934 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -45,6 +45,7 @@
 #include "nvim/mouse.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
+#include "nvim/plines.h"
 #include "nvim/quickfix.h"
 #include "nvim/screen.h"
 #include "nvim/search.h"
-- 
cgit