diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-03 15:46:38 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-03 15:46:38 +1200 |
| commit | ae6cdd3c03ed49ef9dc01d42ab35a537ca3c2e1f (patch) | |
| tree | f7754891c455db6d81d5b6e6843fc15ab317f896 /vim/autoload | |
| parent | Remove trailing slashes from default XDG basedir (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-ae6cdd3c03ed49ef9dc01d42ab35a537ca3c2e1f.tar.gz dotfiles-ae6cdd3c03ed49ef9dc01d42ab35a537ca3c2e1f.zip | |
Merge branch 'hotfix/v8.25.2' into develop
* hotfix/v8.25.2:
Copy, don't reference XDG basedir lists
Write v:null back out of XDG routines
Diffstat (limited to 'vim/autoload')
| -rw-r--r-- | vim/autoload/getenv.vim | 11 | ||||
| -rw-r--r-- | vim/autoload/xdg.vim | 4 |
2 files changed, 5 insertions, 10 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 diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim index a91aaa58..dd9a129b 100644 --- a/vim/autoload/xdg.vim +++ b/vim/autoload/xdg.vim @@ -15,7 +15,7 @@ function! s:Get(name) abort throw 'Illegal XDG basedirs env var name' endif let value = getenv#(name) - return value !=# v:null + return value !=# '' \ ? value \ : s:defaults[name] endfunction @@ -29,7 +29,7 @@ endfunction function! s:Home(name) abort let home = s:Get(a:name) if !s:Absolute(home) - return v:null + return '' endif return join([home, s:subdir], '/') endfunction |