From 05122f08c6a553992f7b0a9ad88016a89f51548a Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Sat, 7 Dec 2019 02:47:06 +0100
Subject: [PATCH] Use environ() if available

---
 autoload/startify.vim | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index 024a5bf..a273693 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -1056,13 +1056,24 @@ function! s:init_env()
         \ 'PWD':    1,
         \ }
 
-  function! s:get_env()
+  if exists('*environ')
+    let env = items(environ())
+  else
     redir => s
       silent! execute "norm!:ec$\<c-a>'\<c-b>\<right>\<right>\<del>'\<cr>"
     redir END
     redraw
-    return split(s)
-  endfunction
+    let env = map(split(s), '[v:val, eval("$".v:val)]')
+  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)
     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])
   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_val_len')
 endfunction