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

Use environ() if available

Browse source
This commit is contained in:
Marco Hinz 2019-12-07 02:47:06 +01:00
parent a521559d70
commit 05122f08c6
No known key found for this signature in database
GPG key ID: 1C980A1B657B4A4F
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
autoload/startify.vim
View file

@ -1056,13 +1056,24 @@ function! s:init_env()
\ 'PWD': 1, \ 'PWD': 1,
\ } \ }
function! s:get_env() if exists('*environ')
let env = items(environ())
else
redir => s redir => s
silent! execute "norm!:ec$\<c-a>'\<c-b>\<right>\<right>\<del>'\<cr>" silent! execute "norm!:ec$\<c-a>'\<c-b>\<right>\<right>\<del>'\<cr>"
redir END redir END
redraw redraw
return split(s) let env = map(split(s), '[v:val, eval("$".v:val)]')
endfunction endif
for [var, val] in env
if has('win32') ? (val[1] != ':') : (val[0] != '/')
\ || has_key(ignore, var)
\ || len(var) > len(val)
continue
endif
call insert(s:env, [var, val], 0)
endfor
function! s:compare_by_key_len(foo, bar) function! s:compare_by_key_len(foo, bar)
return len(a:foo[0]) - len(a:bar[0]) return len(a:foo[0]) - len(a:bar[0])
@ -1071,16 +1082,6 @@ function! s:init_env()
return len(a:bar[1]) - len(a:foo[1]) return len(a:bar[1]) - len(a:foo[1])
endfunction endfunction
for k in s:get_env()
silent! execute "let v = eval('$'.k)"
if has('win32') ? (v[1] != ':') : (v[0] != '/')
\ || has_key(ignore, k)
\ || len(k) > len(v)
continue
endif
call insert(s:env, [k,v], 0)
endfor
let s:env = sort(s:env, 's:compare_by_key_len') let s:env = sort(s:env, 's:compare_by_key_len')
let s:env = sort(s:env, 's:compare_by_val_len') let s:env = sort(s:env, 's:compare_by_val_len')
endfunction endfunction