From 5116c5415cab2839450f11914f288d322d536a29 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 6 Oct 2020 15:23:14 +1300
Subject: Inline environment retrieval to save a file load

---
 vim/autoload/getenv.vim | 17 -----------------
 vim/autoload/xdg.vim    |  9 +++++----
 2 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 vim/autoload/getenv.vim

diff --git a/vim/autoload/getenv.vim b/vim/autoload/getenv.vim
deleted file mode 100644
index 3b5f4c1b..00000000
--- a/vim/autoload/getenv.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" Backport getenv() from v8.1.1305, except return an empty string rather than
-" v:null
-"
-" <https://github.com/vim/vim/releases/tag/v8.1.1305>
-"
-function! getenv#(name) abort
-
-  if a:name !~# '^[A-Z][A-Z0-9_]*$'
-    throw 'Illegal env var name'
-  endif
-  let value = ''
-  if exists('$'.a:name)
-    execute 'let value = $'.a:name
-  endif
-  return value
-
-endfunction
diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim
index c5737506..67a9c5b2 100644
--- a/vim/autoload/xdg.vim
+++ b/vim/autoload/xdg.vim
@@ -12,10 +12,11 @@ function! s:Get(name) abort
   if !has_key(s:defaults, name)
     throw 'Illegal XDG basedirs env var name'
   endif
-  let value = getenv#(name)
-  return value !=# ''
-        \ ? value
-        \ : s:defaults[name]
+  let value = s:defaults[name]
+  if exists('$'.a:name)
+    execute 'let value = $'.a:name
+  endif
+  return value
 endfunction
 
 function! s:Absolute(path) abort
-- 
cgit v1.2.3