From 69e835d1f779140f7c0a27f6fd30ae4d1f9dac77 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Wed, 30 Jan 2019 11:42:40 +0100
Subject: [PATCH] Nvim: use stdpath() for all OS

---
 autoload/startify.vim | 21 ++++++++++++++++++---
 doc/startify.txt      |  7 +++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index 39b98f4..9b362c7 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -1016,6 +1016,23 @@ function! s:warn(msg) abort
   echohl NONE
 endfunction
 
+" Function: s:get_session_path {{{1
+function! s:get_session_path() abort
+  if exists('g:startify_session_dir')
+    let path = g:startify_session_dir
+  elseif has('nvim')
+    let path = stdpath('data') . s:sep . 'session'
+  else
+    if has('win32')
+      let path = '$HOME\vimfiles\session'
+    else
+      let path = '~/.vim/session'
+    endif
+  endif
+
+  return resolve(expand(path))
+endfunction
+
 " Init: values {{{1
 let s:sep = startify#get_separator()
 
@@ -1023,9 +1040,7 @@ let s:numfiles = get(g:, 'startify_files_number', 10)
 let s:show_special = get(g:, 'startify_enable_special', 1)
 let s:relative_path = get(g:, 'startify_relative_path') ? ':~:.' : ':p:~'
 let s:tf = exists('g:startify_transformations')
-let s:session_dir = resolve(expand(get(g:, 'startify_session_dir',
-      \ has('win32') ? '$HOME\vimfiles\session' :
-      \ has('nvim') ? stdpath('data') . '/session' : '~/.vim/session')))
+let s:session_dir = s:get_session_path()
 
 let s:skiplist = get(g:, 'startify_skiplist', [
       \ 'COMMIT_EDITMSG',
diff --git a/doc/startify.txt b/doc/startify.txt
index 73d04e8..fa8f41e 100644
--- a/doc/startify.txt
+++ b/doc/startify.txt
@@ -134,8 +134,11 @@ default values.
 <
 The directory to save/load sessions to/from.
 
-The default for Windows systems is '$HOME\vimfiles\session'. The
-default for Neovim is '$XDG_DATA_HOME/nvim/session'.
+Defaults:~
+
+  Nvim:          `$XDG_DATA_HOME/nvim/session` (`:echo stdpath('data')`)
+  Vim (Unix):    `$HOME/.vim/session`
+  Vim (Windows): `$HOME/vimfiles/session`
 
 ------------------------------------------------------------------------------
                                                          *g:startify_list_order*