diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-31 18:26:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-31 18:26:10 +0100 |
| commit | 375e3390078e740d3c83b0c118c50d9a920036c7 (patch) | |
| tree | 34f565d4a9351b58d48d8d06e4a84b07effdb3fd /src/normal.c | |
| parent | b3051ce82f2e8af95ce3b6a41867f70aee5ecc82 (diff) | |
| download | vim-git-375e3390078e740d3c83b0c118c50d9a920036c7.tar.gz | |
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'v8.1.0864
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)
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/normal.c b/src/normal.c index b512b559a..41af96628 100644 --- a/src/normal.c +++ b/src/normal.c @@ -2814,7 +2814,7 @@ do_mouse( /* Set global flag that we are extending the Visual area with mouse * dragging; temporarily minimize 'scrolloff'. */ - if (VIsual_active && is_drag && p_so) + if (VIsual_active && is_drag && get_scrolloff_value()) { /* In the very first line, allow scrolling one line */ if (mouse_row == 0) @@ -4635,7 +4635,7 @@ scroll_redraw(int up, long count) scrollup(count, TRUE); else scrolldown(count, TRUE); - if (p_so) + if (get_scrolloff_value()) { /* Adjust the cursor position for 'scrolloff'. Mark w_topline as * valid, otherwise the screen jumps back at the end of the file. */ @@ -4692,6 +4692,7 @@ nv_zet(cmdarg_T *cap) #ifdef FEAT_SPELL int undo = FALSE; #endif + long siso = get_sidescrolloff_value(); if (VIM_ISDIGIT(nchar)) { @@ -4874,8 +4875,8 @@ dozet: else #endif getvcol(curwin, &curwin->w_cursor, &col, NULL, NULL); - if ((long)col > p_siso) - col -= p_siso; + if ((long)col > siso) + col -= siso; else col = 0; if (curwin->w_leftcol != col) @@ -4896,10 +4897,10 @@ dozet: #endif getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); n = curwin->w_width - curwin_col_off(); - if ((long)col + p_siso < n) + if ((long)col + siso < n) col = 0; else - col = col + p_siso - n + 1; + col = col + siso - n + 1; if (curwin->w_leftcol != col) { curwin->w_leftcol = col; |