From 3954537b9e243fb3df3672d47fe3d9529fa4e544 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Mon, 16 Aug 2021 14:05:24 -0600
Subject: feat(defaults): remove 'options' from viewoptions #15397

ref #6289
---
 src/nvim/options.lua       | 2 +-
 src/nvim/testdir/setup.vim | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/nvim')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 585f8d638a..8c0970c32e 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2705,7 +2705,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_vop',
-      defaults={if_true={vi="folds,options,cursor,curdir"}}
+      defaults={if_true={vi="folds,cursor,curdir"}}
     },
     {
       -- Alias for "shada".
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim
index b15df2ea03..57ba57a3c8 100644
--- a/src/nvim/testdir/setup.vim
+++ b/src/nvim/testdir/setup.vim
@@ -21,6 +21,7 @@ set undodir^=.
 set wildoptions=
 set startofline
 set sessionoptions+=options
+set viewoptions+=options
 set switchbuf=
 
 " Unmap Nvim default mappings.
-- 
cgit