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

Remove s:escape()

Browse source 
References #25.
This commit is contained in:
Marco Hinz 2013-07-01 22:32:14 +02:00
parent 3775b54d46
commit 80c66870fa
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
autoload/startify.vim
View file

@ -52,7 +52,7 @@ function! startify#insane_in_the_membrane() abort
let entries[expfname] = 1 let entries[expfname] = 1
let index = s:get_index_as_string(cnt) let index = s:get_index_as_string(cnt)
call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . fname) call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . fname)
execute 'nnoremap <buffer> '. index .' :edit '. s:escape(fname) .' <bar> lcd %:h<cr>' execute 'nnoremap <buffer> '. index .' :edit '. fnameescape(fname) .' <bar> lcd %:h<cr>'
let cnt += 1 let cnt += 1
if (cnt == numfiles) if (cnt == numfiles)
break break
@ -68,7 +68,7 @@ function! startify#insane_in_the_membrane() abort
let idx = (i + cnt) let idx = (i + cnt)
let index = s:get_index_as_string(idx) let index = s:get_index_as_string(idx)
call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . fnamemodify(sfiles[i], ':t:r')) call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . fnamemodify(sfiles[i], ':t:r'))
execute 'nnoremap <buffer> '. index .' :source '. s:escape(sfiles[i]) .'<cr>' execute 'nnoremap <buffer> '. index .' :source '. fnameescape(sfiles[i]) .'<cr>'
endfor endfor
let cnt = idx let cnt = idx
endif endif
@ -79,7 +79,7 @@ function! startify#insane_in_the_membrane() abort
let cnt += 1 let cnt += 1
let index = s:get_index_as_string(cnt) let index = s:get_index_as_string(cnt)
call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . fname) call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . fname)
execute 'nnoremap <buffer> '. index .' :edit '. s:escape(fname) .' <bar> lcd %:h<cr>' execute 'nnoremap <buffer> '. index .' :edit '. fnameescape(fname) .' <bar> lcd %:h<cr>'
endfor endfor
endif endif
@ -168,12 +168,12 @@ function! startify#session_save(...) abort
endif endif
let spath = s:session_dir . startify#get_separator() . sname let spath = s:session_dir . startify#get_separator() . sname
if !filereadable(spath) if !filereadable(spath)
execute 'mksession '. s:escape(spath) | echo 'Session saved under: '. spath execute 'mksession '. fnameescape(spath) | echo 'Session saved under: '. spath
return return
endif endif
echo 'Session already exists. Overwrite? [y/n]' | redraw echo 'Session already exists. Overwrite? [y/n]' | redraw
if nr2char(getchar()) == 'y' if nr2char(getchar()) == 'y'
execute 'mksession! '. s:escape(spath) | echo 'Session saved under: '. spath execute 'mksession! '. fnameescape(spath) | echo 'Session saved under: '. spath
else else
echo 'Did NOT save the session!' echo 'Did NOT save the session!'
endif endif
@ -193,7 +193,7 @@ function! startify#session_load(...) abort
\ : input('Load this session: ', fnamemodify(v:this_session, ':t'), 'custom,startify#session_list_as_string')) \ : input('Load this session: ', fnamemodify(v:this_session, ':t'), 'custom,startify#session_list_as_string'))
\ | redraw \ | redraw
if filereadable(spath) if filereadable(spath)
execute 'source '. s:escape(spath) execute 'source '. fnameescape(spath)
else else
echo 'No such file: '. spath echo 'No such file: '. spath
endif endif
@ -214,10 +214,6 @@ function! startify#get_separator() abort
return !exists('+shellslash') || &shellslash ? '/' : '\' return !exists('+shellslash') || &shellslash ? '/' : '\'
endfunction endfunction
" Function: s:escape {{{1
function! s:escape(path) abort
return !exists('+shellslash') || &shellslash ? fnameescape(a:path) : escape(a:path, '\')
endfunction
" Function: s:is_in_skiplist {{{1 " Function: s:is_in_skiplist {{{1
function! s:is_in_skiplist(arg) abort function! s:is_in_skiplist(arg) abort