Merge branch 'hotfix/v8.25.2'v8.25.2

* hotfix/v8.25.2:
  Copy, don't reference XDG basedir lists
  Write v:null back out of XDG routines

1 files changed, 3 insertions, 8 deletions

diff --git a/vim/autoload/getenv.vim b/vim/autoload/getenv.vim
index 2b8fef1b..3b5f4c1b 100644
--- a/vim/autoload/getenv.vim
+++ b/vim/autoload/getenv.vim
@@ -1,19 +1,14 @@
-" Backport getenv() from v8.1.1305
+" 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
 
-  " Use native if available
-  if exists('*getenv')
-    return getenv(a:name)
-  endif
-
-  " Backport
   if a:name !~# '^[A-Z][A-Z0-9_]*$'
     throw 'Illegal env var name'
   endif
-  let value = v:null
+  let value = ''
   if exists('$'.a:name)
     execute 'let value = $'.a:name
   endif