From 4a788df9b4715a65a96276d8059faab3207e3453 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Sun, 7 Sep 2014 18:49:49 +0200
Subject: [PATCH] Don't save the startify buffer in a session

References #106.
---
 autoload/startify.vim | 25 ++++++++++++++++++++-----
 plugin/startify.vim   |  4 ++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index df3825a..9dbb601 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -50,7 +50,7 @@ function! startify#get_lastline() abort
 endfunction
 
 " Function: #insane_in_the_membrane {{{1
-function! startify#insane_in_the_membrane() abort
+function! startify#insane_in_the_membrane(callingbuffer) abort
   if !empty(v:servername) && exists('g:startify_skiplist_server')
     for servname in g:startify_skiplist_server
       if servname == v:servername
@@ -59,10 +59,14 @@ function! startify#insane_in_the_membrane() abort
     endfor
   endif
 
+  if a:callingbuffer != 0
+    let s:callingbuffer = a:callingbuffer
+  endif
+
+  enew
+  set filetype=startify
   setlocal noswapfile nobuflisted buftype=nofile bufhidden=wipe
   setlocal nonumber nocursorline nocursorcolumn nolist statusline=\ startify
-  set filetype=startify
-
   if v:version >= 703
     setlocal norelativenumber
   endif
@@ -218,9 +222,20 @@ endfunction
 function! startify#session_write(spath)
   let ssop = &sessionoptions
   try
-    set sessionoptions-=options
+    " if this function was called through :Startify instead of :SLoad
+    " switch back to the previous buffer before saving the session
+    if exists('s:callingbuffer')
+      redir => callingbuffer
+      file
+      redir END
+      if callingbuffer !~# '\[No Name\]'
+        execute 'buffer' s:callingbuffer
+      endif
+      unlet s:callingbuffer
+    endif
     " prevent saving already deleted buffers that were in the arglist
     silent! argdelete *
+    set sessionoptions-=options
     execute 'mksession!' a:spath
   catch
     execute 'echoerr' string(v:exception)
@@ -405,7 +420,7 @@ function! s:show_sessions(cnt) abort
   for i in range(len(sfiles))
     let index = s:get_index_as_string(cnt)
     call append('$', '   ['. index .']'. repeat(' ', (3 - strlen(index))) . fnamemodify(sfiles[i], ':t'))
-    execute 'nnoremap <buffer><silent>' index ':enew <bar> SLoad' fnamemodify(sfiles[i], ':t') '<cr>'
+    execute 'nnoremap <buffer><silent>' index ':SLoad' fnamemodify(sfiles[i], ':t') '<cr>'
     let cnt += 1
   endfor
   call append('$', '')
diff --git a/plugin/startify.vim b/plugin/startify.vim
index cb7a980..4ca8fef 100644
--- a/plugin/startify.vim
+++ b/plugin/startify.vim
@@ -14,7 +14,7 @@ augroup startify
   if !get(g:, 'startify_disable_at_vimenter')
     autocmd VimEnter *
           \ if !argc() && (line2byte('$') == -1) && (v:progname =~? '^[gmnq]\=vim\=x\=\%[\.exe]$') |
-          \   call startify#insane_in_the_membrane() |
+          \   call startify#insane_in_the_membrane(0) |
           \ endif |
           \ autocmd! startify VimEnter
   endif
@@ -30,4 +30,4 @@ augroup END
 command! -nargs=? -bar -complete=customlist,startify#session_list SSave   call startify#session_save(<f-args>)
 command! -nargs=? -bar -complete=customlist,startify#session_list SLoad   call startify#session_load(<f-args>)
 command! -nargs=? -bar -complete=customlist,startify#session_list SDelete call startify#session_delete(<f-args>)
-command! -nargs=0 -bar Startify enew | call startify#insane_in_the_membrane()
+command! -nargs=0 -bar Startify call startify#insane_in_the_membrane(bufnr('%'))