commit 375e3390078e740d3c83b0c118c50d9a920036c7
author Bram Moolenaar <Bram@vim.org> Thu Jan 31 18:26:10 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Jan 31 18:26:10 2019 +0100
tree 34f565d4a9351b58d48d8d06e4a84b07effdb3fd
parent b3051ce82f2e8af95ce3b6a41867f70aee5ecc82

patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'

Problem:    Cannot have a local value for 'scrolloff' and 'sidescrolloff'.
            (Gary Holloway)
Solution:   Make 'scrolloff' and 'sidescrolloff' global-local. (mostly by
            Aron Widforss, closes #3539)

src/edit.c

diff --git a/src/edit.c b/src/edit.c
index de1666c..eac4803 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -728,7 +728,7 @@
 		(int)curwin->w_wcol < mincol - curbuf->b_p_ts
 #endif
 		    && curwin->w_wrow == W_WINROW(curwin)
-						 + curwin->w_height - 1 - p_so
+				 + curwin->w_height - 1 - get_scrolloff_value()
 		    && (curwin->w_cursor.lnum != curwin->w_topline
 #ifdef FEAT_DIFF
 			|| curwin->w_topfill > 0