From 17052946c744abd53d8f3349f453964ffa818bea Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 20 Apr 2017 12:32:14 +0200
Subject: 'scrollback': Allow :setlocal -1 on normal buffers

Avoids a spurious :loadview error.
---
 src/nvim/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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) {
-- 
cgit