IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6552 from justinmk/loadview

Browse Source
This commit is contained in:
Justin M. Keyes 2017-04-20 14:47:01 +02:00 committed by GitHub
commit 3a606ee58d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/starting.txt
View File

@ -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: > To automatically save and restore views for *.c files: >
au BufWinLeave *.c mkview au BufWinLeave *.c mkview
au BufWinEnter *.c silent loadview au BufWinEnter *.c silent! loadview
============================================================================== ==============================================================================
8. The ShaDa file *shada* *shada-file* 8. The ShaDa file *shada* *shada-file*

2
src/nvim/option.c
View File

@ -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) { } else if (pp == &curbuf->b_p_scbk || pp == &p_scbk) {
// 'scrollback' // 'scrollback'
if (*pp < -1 || *pp > SB_MAX if (*pp < -1 || *pp > SB_MAX
|| (opt_flags == OPT_LOCAL && !curbuf->terminal)) { || (*pp != -1 && opt_flags == OPT_LOCAL && !curbuf->terminal)) {
errmsg = e_invarg; errmsg = e_invarg;
*pp = old_value; *pp = old_value;
} else if (curbuf->terminal) { } else if (curbuf->terminal) {

7
test/functional/terminal/scrollback_spec.lua
View File

@ -451,6 +451,13 @@ describe("'scrollback' option", function()
it(':setlocal in a normal buffer is an error', function() it(':setlocal in a normal buffer is an error', function()
command('new') 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_command('setlocal scrollback=42')
feed('<CR>') feed('<CR>')
eq('E474:', string.match(eval("v:errmsg"), "E%d*:")) eq('E474:', string.match(eval("v:errmsg"), "E%d*:"))