From 91688b488310ae45ea5874df8729e7dfe554c0bc Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Mon, 4 Feb 2019 02:53:23 +0100 Subject: options: set 'scrollback' to -1 by default #9563 Makes the 'scrollback' option more consistent (same default for all buffers) and future-proof. - Default to -1 for all buffers, but treat it as an implementation detail. - Document range of 1 - 100_000. - New terminal buffer by default sets scrollback=10_000 if the global default is -1. - Existing terminal buffer: On entering terminal-mode or on refresh, if the user explicitly did `:set[local] scbk=-1`, the local value goes to 100_000 (max). (This is undocumented on purpose. Users should work with explicit values in the range of 1-100_000.) --- test/functional/terminal/scrollback_spec.lua | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'test/functional') diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua index 38c7e385cc..7c74e82d17 100644 --- a/test/functional/terminal/scrollback_spec.lua +++ b/test/functional/terminal/scrollback_spec.lua @@ -481,25 +481,10 @@ describe("'scrollback' option", function() eq(-1, curbufmeths.get_option('scrollback')) end) - 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('') - - -- :setlocal to anything except -1 is an error. - feed_command('setlocal scrollback=42') - feed('') - eq('E474:', string.match(eval("v:errmsg"), "E%d*:")) - eq(-1, curbufmeths.get_option('scrollback')) - end) - it(':set updates local value and global default', function() set_fake_shell() - command('set scrollback=42') -- set global and (attempt) local - eq(-1, curbufmeths.get_option('scrollback')) -- normal buffer: -1 + command('set scrollback=42') -- set global value + eq(42, curbufmeths.get_option('scrollback')) command('terminal') eq(42, curbufmeths.get_option('scrollback')) -- inherits global default command('setlocal scrollback=99') -- cgit