From 4558912d0c2470ed30aae7cdbf4f2f82874ae15c Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Fri, 5 Sep 2014 19:15:34 +0200 Subject: [PATCH 1/3] Save sessions before loading another one References #106. --- autoload/startify.vim | 13 +++++++++---- doc/startify.txt | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/autoload/startify.vim b/autoload/startify.vim index 8219fe1..58be315 100644 --- a/autoload/startify.vim +++ b/autoload/startify.vim @@ -147,18 +147,23 @@ endfunction " Function: #session_load {{{1 function! startify#session_load(...) abort if !isdirectory(s:session_dir) - echo 'The session directory does not exist: '. s:session_dir + echomsg 'The session directory does not exist: '. s:session_dir return elseif empty(startify#session_list_as_string('')) - echo 'There are no sessions...' + echomsg 'There are no sessions...' return endif - call startify#session_delete_buffers() let spath = s:session_dir . s:sep . (exists('a:1') \ ? a:1 \ : input('Load this session: ', fnamemodify(v:this_session, ':t'), 'custom,startify#session_list_as_string')) \ | redraw if filereadable(spath) + if get(g:, 'startify_session_persistence') + \ && exists('v:this_session') + \ && filewritable(v:this_session) + call startify#session_write(fnameescape(v:this_session)) + endif + call startify#session_delete_buffers() execute 'source '. fnameescape(spath) else echo 'No such file: '. spath @@ -398,7 +403,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 ' index ':SLoad' fnamemodify(sfiles[i], ':t') '' + execute 'nnoremap ' index ':enew SLoad' fnamemodify(sfiles[i], ':t') '' let cnt += 1 endfor call append('$', '') diff --git a/doc/startify.txt b/doc/startify.txt index a6f70e0..742791f 100644 --- a/doc/startify.txt +++ b/doc/startify.txt @@ -213,7 +213,10 @@ Great way to create a portable project folder. > let g:startify_session_persistence = 0 < -Automatically update sessions before exiting Vim. +Automatically update sessions in two cases: + + 1) Before leaving Vim + 2) Before loading a new session via :SLoad This also works for sessions started with: > From 1765f6b6bbba8c86f9a811757a4f6c57feea32e5 Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Fri, 5 Sep 2014 19:38:01 +0200 Subject: [PATCH 2/3] Prune arglist before saving sessions :mksession saves opened buffers and files listed in the arglist. Assuming you would do: $ vim foo bar :SS session :x $ vim :SL session :bwipeout bar :x In that case the only file left in the session should be 'foo'. But that's not the case, since :mksession! also saves the argument list, which still consists of 'foo' and 'bar'. Next time you load the session, both buffers would be opened again. But since the argument list is seldomly used, or at least not with the arguments that were given to Vim, it will be pruned from now on. References #106. --- autoload/startify.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autoload/startify.vim b/autoload/startify.vim index 58be315..df3825a 100644 --- a/autoload/startify.vim +++ b/autoload/startify.vim @@ -219,6 +219,8 @@ function! startify#session_write(spath) let ssop = &sessionoptions try set sessionoptions-=options + " prevent saving already deleted buffers that were in the arglist + silent! argdelete * execute 'mksession!' a:spath catch execute 'echoerr' string(v:exception) From 4a788df9b4715a65a96276d8059faab3207e3453 Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Sun, 7 Sep 2014 18:49:49 +0200 Subject: [PATCH 3/3] 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 ' index ':enew SLoad' fnamemodify(sfiles[i], ':t') '' + execute 'nnoremap ' index ':SLoad' fnamemodify(sfiles[i], ':t') '' 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() command! -nargs=? -bar -complete=customlist,startify#session_list SLoad call startify#session_load() command! -nargs=? -bar -complete=customlist,startify#session_list SDelete call startify#session_delete() -command! -nargs=0 -bar Startify enew | call startify#insane_in_the_membrane() +command! -nargs=0 -bar Startify call startify#insane_in_the_membrane(bufnr('%'))