Mercurial > vim
diff src/misc2.c @ 15713:ad8b2c109b22 v8.1.0864
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
commit https://github.com/vim/vim/commit/375e3390078e740d3c83b0c118c50d9a920036c7
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 31 18:26:10 2019 +0100
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 31 Jan 2019 18:30:08 +0100 |
| parents | 01890a3caefd |
| children | 99ebf78686a9 |
line wrap: on
line diff
--- a/src/misc2.c +++ b/src/misc2.c @@ -643,6 +643,7 @@ leftcol_changed(void) long lastcol; colnr_T s, e; int retval = FALSE; + long siso = get_sidescrolloff_value(); changed_cline_bef_curs(); lastcol = curwin->w_leftcol + curwin->w_width - curwin_col_off() - 1; @@ -652,15 +653,15 @@ leftcol_changed(void) * If the cursor is right or left of the screen, move it to last or first * character. */ - if (curwin->w_virtcol > (colnr_T)(lastcol - p_siso)) + if (curwin->w_virtcol > (colnr_T)(lastcol - siso)) { retval = TRUE; - coladvance((colnr_T)(lastcol - p_siso)); + coladvance((colnr_T)(lastcol - siso)); } - else if (curwin->w_virtcol < curwin->w_leftcol + p_siso) + else if (curwin->w_virtcol < curwin->w_leftcol + siso) { retval = TRUE; - (void)coladvance((colnr_T)(curwin->w_leftcol + p_siso)); + (void)coladvance((colnr_T)(curwin->w_leftcol + siso)); } /*