lauchmelder/vim-sussify
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Session: rename variables

Browse source
This commit is contained in:
Marco Hinz 2019-04-06 16:40:39 +02:00
parent 26f2ffcdf4
commit 9622dee5f1
No known key found for this signature in database
GPG key ID: 1C980A1B657B4A4F
1 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
autoload/startify.vim
View file

@ -154,30 +154,30 @@ function! startify#session_load(source_last_session, ...) abort
return return
endif endif
let spath = s:session_dir . s:sep let session_path = s:session_dir . s:sep
if a:0 if a:0
let spath .= a:1 let session_path .= a:1
elseif a:source_last_session && !has('win32') elseif a:source_last_session && !has('win32')
let spath .= '__LAST__' let session_path .= '__LAST__'
else else
call inputsave() call inputsave()
let spath .= input( let session_path .= input(
\ 'Load this session: ', \ 'Load this session: ',
\ fnamemodify(v:this_session, ':t'), \ fnamemodify(v:this_session, ':t'),
\ 'custom,startify#session_list_as_string') | redraw \ 'custom,startify#session_list_as_string') | redraw
call inputrestore() call inputrestore()
endif endif
if filereadable(spath) if filereadable(session_path)
if get(g:, 'startify_session_persistence') && filewritable(v:this_session) if get(g:, 'startify_session_persistence') && filewritable(v:this_session)
call startify#session_write(fnameescape(v:this_session)) call startify#session_write(fnameescape(v:this_session))
endif endif
call startify#session_delete_buffers() call startify#session_delete_buffers()
execute 'source '. fnameescape(spath) execute 'source '. fnameescape(session_path)
call s:create_last_session_link(spath) call s:create_last_session_link(session_path)
else else
echo 'No such file: '. spath echo 'No such file: '. session_path
endif endif
endfunction endfunction
@ -199,32 +199,31 @@ function! startify#session_save(bang, ...) abort
endif endif
call inputsave() call inputsave()
let vsession = fnamemodify(v:this_session, ':t') let this_session = fnamemodify(v:this_session, ':t')
if vsession ==# '__LAST__' if this_session ==# '__LAST__'
let vsession = '' let this_session = ''
endif endif
let sname = exists('a:1') let session_name = exists('a:1')
\ ? a:1 \ ? a:1
\ : input('Save under this session name: ', vsession, 'custom,startify#session_list_as_string') \ : input('Save under this session name: ', this_session, 'custom,startify#session_list_as_string') | redraw
\ | redraw
call inputrestore() call inputrestore()
if empty(sname) if empty(session_name)
echo 'You gave an empty name!' echo 'You gave an empty name!'
return return
endif endif
let spath = s:session_dir . s:sep . sname let session_path = s:session_dir . s:sep . session_name
if !filereadable(spath) if !filereadable(session_path)
call startify#session_write(fnameescape(spath)) call startify#session_write(fnameescape(session_path))
echo 'Session saved under: '. spath echo 'Session saved under: '. session_path
return return
endif endif
echo 'Session already exists. Overwrite? [y/n]' | redraw echo 'Session already exists. Overwrite? [y/n]' | redraw
if a:bang || nr2char(getchar()) == 'y' if a:bang || nr2char(getchar()) == 'y'
call startify#session_write(fnameescape(spath)) call startify#session_write(fnameescape(session_path))
echo 'Session saved under: '. spath echo 'Session saved under: '. session_path
else else
echo 'Did NOT save the session!' echo 'Did NOT save the session!'
endif endif
@ -241,7 +240,7 @@ function! startify#session_close() abort
endfunction endfunction
" Function: #session_write {{{1 " Function: #session_write {{{1
function! startify#session_write(spath) function! startify#session_write(session_path)
" preserve existing variables from savevars " preserve existing variables from savevars
if exists('g:startify_session_savevars') if exists('g:startify_session_savevars')
let savevars = map(filter(copy(g:startify_session_savevars), 'exists(v:val)'), '"let ". v:val ." = ". strtrans(string(eval(v:val)))') let savevars = map(filter(copy(g:startify_session_savevars), 'exists(v:val)'), '"let ". v:val ." = ". strtrans(string(eval(v:val)))')
@ -270,7 +269,7 @@ function! startify#session_write(spath)
let ssop = &sessionoptions let ssop = &sessionoptions
set sessionoptions-=options set sessionoptions-=options
try try
execute 'mksession!' a:spath execute 'mksession!' a:session_path
catch catch
echohl ErrorMsg echohl ErrorMsg
echomsg v:exception echomsg v:exception
@ -283,7 +282,7 @@ function! startify#session_write(spath)
if exists('g:startify_session_remove_lines') if exists('g:startify_session_remove_lines')
\ || exists('g:startify_session_savevars') \ || exists('g:startify_session_savevars')
\ || exists('g:startify_session_savecmds') \ || exists('g:startify_session_savecmds')
silent execute 'split' a:spath silent execute 'split' a:session_path
" remove lines from the session file " remove lines from the session file
if exists('g:startify_session_remove_lines') if exists('g:startify_session_remove_lines')
@ -307,7 +306,7 @@ function! startify#session_write(spath)
silent hide silent hide
endif endif
call s:create_last_session_link(a:spath) call s:create_last_session_link(a:session_path)
endfunction endfunction
" Function: #session_delete {{{1 " Function: #session_delete {{{1
@ -321,21 +320,20 @@ function! startify#session_delete(bang, ...) abort
endif endif
call inputsave() call inputsave()
let spath = s:session_dir . s:sep . (exists('a:1') let seesion_path = s:session_dir . s:sep . (exists('a:1')
\ ? a:1 \ ? a:1
\ : input('Delete this session: ', fnamemodify(v:this_session, ':t'), 'custom,startify#session_list_as_string')) \ : input('Delete this session: ', fnamemodify(v:this_session, ':t'), 'custom,startify#session_list_as_string'))
\ | redraw
call inputrestore() call inputrestore()
if !filereadable(spath) if !filereadable(session_path)
echomsg 'No such session: '. spath echomsg 'No such session: '. session_path
return return
endif endif
echo 'Really delete '. spath .'? [y/n]' | redraw echo 'Really delete '. session_path .'? [y/n]'
if a:bang || nr2char(getchar()) == 'y' if a:bang || nr2char(getchar()) == 'y'
if delete(spath) == 0 if delete(session_path) == 0
echo 'Deleted session '. spath .'!' echo 'Deleted session '. session_path .'!'
else else
echo 'Deletion failed!' echo 'Deletion failed!'
endif endif
@ -967,10 +965,10 @@ function! s:register(line, index, type, cmd, path)
endfunction endfunction
" Function: s:create_last_session_link {{{1 " Function: s:create_last_session_link {{{1
function! s:create_last_session_link(spath) function! s:create_last_session_link(session_path)
if !has('win32') && a:spath !~# '__LAST__$' if !has('win32') && a:session_path !~# '__LAST__$'
let cmd = printf('ln -sf %s %s', let cmd = printf('ln -sf %s %s',
\ shellescape(fnamemodify(a:spath, ':t')), \ shellescape(fnamemodify(a:session_path, ':t')),
\ shellescape(s:session_dir .'/__LAST__')) \ shellescape(s:session_dir .'/__LAST__'))
call system(cmd) call system(cmd)
if v:shell_error if v:shell_error