diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-03 15:37:55 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-03 15:40:53 +1200 |
| commit | 7177aa780fd4293c968ecd5331f67cf4a64b046d (patch) | |
| tree | 697249d63aa4a45a78379c90bdca7bd59fcee6bf /vim/vimrc | |
| parent | Merge branch 'hotfix/v8.25.1' (diff) | |
| download | dotfiles-7177aa780fd4293c968ecd5331f67cf4a64b046d.tar.gz dotfiles-7177aa780fd4293c968ecd5331f67cf4a64b046d.zip | |
Write v:null back out of XDG routines
I had misconfigured my test machine, and was testing the latest Vim
v8.2.x when I thought I was testing v7.0.0, which misled me into
thinking v:null was defined on the latter version in commit 145998c.
Reverse this and just use an empty string as the sentinel value; it's
not strictly correct, but it doesn't matter much to XDG.
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Sat, 02 May 2020 15:15:57 UTC +" Last updated: Sun, 03 May 2020 03:40:34 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -108,7 +108,7 @@ endif " of configuration. " let s:xdgconfigpaths = xdg#['config']['dirs'] -if xdg#['config']['home'] !=# v:null +if xdg#['config']['home'] !=# '' call insert(s:xdgconfigpaths, xdg#['config']['home']) endif if !empty(s:xdgconfigpaths) @@ -124,7 +124,7 @@ unlet s:xdgconfigpaths " Now put the XDG cache home at the very front, so that e.g. 'spellfile' gets " created in there rather than in the configuration directories. " -if xdg#['cache']['home'] !=# v:null +if xdg#['cache']['home'] !=# '' execute 'set runtimepath^='.option#Escape( \ option#item#Escape(xdg#['cache']['home']) \) @@ -155,7 +155,7 @@ command! -bang -bar -complete=dir -nargs=1 CreatePath " v8.1.716 introduced a way to set this with an option named 'viminfofile', " but I don't see a reason to use that. " -if xdg#['cache']['home'] !=# v:null && path#Create(xdg#['cache']['home']) +if xdg#['cache']['home'] !=# '' && path#Create(xdg#['cache']['home']) execute 'set viminfo+='.option#Escape( \ 'n'.xdg#['cache']['home'].'/viminfo' \) @@ -204,7 +204,7 @@ set history=10000 " 'backupfullname', 'swapfilefullname' would have been clearer. " set backup -if xdg#['cache']['home'] !=# v:null +if xdg#['cache']['home'] !=# '' let s:backupdir = xdg#['cache']['home'].'/backup' if path#Create(s:backupdir) execute 'set backupdir^='.option#Escape(option#item#Escape( @@ -248,7 +248,7 @@ endif " option has supported that hint for much longer than 'backupdir' has. We " apply path#Create() to attempt to create the path, if needed. " -if xdg#['cache']['home'] !=# v:null +if xdg#['cache']['home'] !=# '' let s:directory = xdg#['cache']['home'].'/swap' if path#Create(s:directory) execute 'set directory^='.option#Escape(option#item#Escape( @@ -273,7 +273,7 @@ endif " if has#('persistent_undo') set undofile - if xdg#['cache']['home'] !=# v:null + if xdg#['cache']['home'] !=# '' let s:undodir = xdg#['cache']['home'].'/undo' if path#Create(s:undodir) execute 'set undodir^='.option#Escape(option#item#Escape( @@ -411,7 +411,7 @@ set spellcapcheck=[.?!]\\%(\ \ \\\|[\\n\\r\\t]\\) " set dictionary^=/usr/share/dict/words let s:refdirs = xdg#['data']['dirs'] -if xdg#['data']['home'] !=# v:null +if xdg#['data']['home'] !=# '' call insert(s:refdirs, xdg#['data']['home']) endif if !empty(s:refdirs) |