diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-20 14:47:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 14:47:01 +0200 |
| commit | 3a606ee58d550d3307cf69c69267bb02cfae3c31 (patch) | |
| tree | 939c95a47f0e5bcd0bbd1be678b20a6a942cab88 | |
| parent | a6f50c1120f4427d1b4f531ac564d83b770fd62f (diff) | |
| parent | d55fd9588f621719e3e8c66f69290a00e1fadc1b (diff) | |
| download | rneovim-3a606ee58d550d3307cf69c69267bb02cfae3c31.tar.gz rneovim-3a606ee58d550d3307cf69c69267bb02cfae3c31.tar.bz2 rneovim-3a606ee58d550d3307cf69c69267bb02cfae3c31.zip | |
Merge #6552 from justinmk/loadview
| -rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | test/functional/terminal/scrollback_spec.lua | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 2d1dd22222..14e8c5d76f 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -922,7 +922,7 @@ You might want to clean up your 'viewdir' directory now and then. To automatically save and restore views for *.c files: > au BufWinLeave *.c mkview - au BufWinEnter *.c silent loadview + au BufWinEnter *.c silent! loadview ============================================================================== 8. The ShaDa file *shada* *shada-file* diff --git a/src/nvim/option.c b/src/nvim/option.c index 8748406ba4..ae038389b4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4223,7 +4223,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, } else if (pp == &curbuf->b_p_scbk || pp == &p_scbk) { // 'scrollback' if (*pp < -1 || *pp > SB_MAX - || (opt_flags == OPT_LOCAL && !curbuf->terminal)) { + || (*pp != -1 && opt_flags == OPT_LOCAL && !curbuf->terminal)) { errmsg = e_invarg; *pp = old_value; } else if (curbuf->terminal) { diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua index 32f25d4086..05f81295c2 100644 --- a/test/functional/terminal/scrollback_spec.lua +++ b/test/functional/terminal/scrollback_spec.lua @@ -451,6 +451,13 @@ describe("'scrollback' option", function() it(':setlocal in a normal buffer is an error', function() command('new') + + -- :setlocal to -1 is NOT an error. + feed_command('setlocal scrollback=-1') + eq(nil, string.match(eval("v:errmsg"), "E%d*:")) + feed('<CR>') + + -- :setlocal to anything except -1 is an error. feed_command('setlocal scrollback=42') feed('<CR>') eq('E474:', string.match(eval("v:errmsg"), "E%d*:")) |