diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-08-11 17:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 17:38:36 +0200 |
| commit | 7d2233fad007a3dd42481f8ffc01e69b57a17f9e (patch) | |
| tree | a539fc5a49b000086de4a0ab7c6fbd49e8de9ab8 /src/nvim/normal.c | |
| parent | 2c60f7c99188e90739d83f3c131134b71cd37436 (diff) | |
| parent | 28b5c73bf8b5cc92451a4030b4ffbbad6c56374b (diff) | |
| download | rneovim-7d2233fad007a3dd42481f8ffc01e69b57a17f9e.tar.gz rneovim-7d2233fad007a3dd42481f8ffc01e69b57a17f9e.tar.bz2 rneovim-7d2233fad007a3dd42481f8ffc01e69b57a17f9e.zip | |
Merge pull request #15336 from bfredl/plines
refactor(plines): move "plines" (size of printed lines) family of function to own file
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 54ca216a53..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" @@ -5122,11 +5123,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--; |