From 6ed6d8d910907f5a85b3cf5eb7291e6fff4ae9e4 Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Sat, 20 Jun 2015 16:39:40 -0300
Subject: defaults: remove "options" in 'sessionoptions'. #2871

Re: https://github.com/neovim/neovim/issues/2676
---
 runtime/doc/options.txt  | 4 ++--
 runtime/doc/vim_diff.txt | 3 ++-
 src/nvim/option.c        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 388848ac4e..8f8f9ba152 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5406,10 +5406,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'sessionoptions'* *'ssop'*
 'sessionoptions' 'ssop'	string	(default: "blank,buffers,curdir,folds,
+					       help,tabpages,winsize"
+				 Vi default: "blank,buffers,curdir,folds,
 					       help,options,tabpages,winsize")
 			global
-			{not available when compiled without the |+mksession|
-			feature}
 	Changes the effect of the |:mksession| command.  It is a comma
 	separated list of words.  Each word enables saving and restoring
 	something:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 80d687a2a1..2140994259 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -28,8 +28,8 @@ these differences.
 ==============================================================================
 2. Option defaults					  *nvim-option-defaults*
 
-- 'autoread' is set by default
 - 'autoindent' is set by default.
+- 'autoread' is set by default
 - 'backspace' defaults to "indent,eol,start"
 - 'complete' doesn't include "i"
 - 'display' defaults to "lastline"
@@ -41,6 +41,7 @@ these differences.
 - 'mouse' defaults to "a"
 - 'nocompatible' is always set
 - 'nrformats' defaults to "hex"
+- 'sessionoptions' doesn't include "options"
 - 'smarttab' is set by default
 - 'tabpagemax' defaults to 50
 - 'tags' defaults to "./tags;,tags"
diff --git a/src/nvim/option.c b/src/nvim/option.c
index ab97b18cd6..8ec5640b7a 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1305,10 +1305,10 @@ static vimoption_T
   {"selectmode",  "slm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
    (char_u *)&p_slm, PV_NONE,
    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
-  {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+  {"sessionoptions", "ssop", P_STRING|P_VIM|P_COMMA|P_NODUP,
    (char_u *)&p_ssop, PV_NONE,
    {(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize",
-    (char_u *)0L}
+    (char_u *)"blank,buffers,curdir,folds,help,tabpages,winsize"}
    SCRIPTID_INIT},
   {"shell",       "sh",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
    (char_u *)&p_sh, PV_NONE,
-- 
cgit