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

1 files changed, 10 insertions, 10 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 29d99643..40e744c1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
 "  Tom Ryder (tejr)’s Literate Vimrc
 " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 "
-" Last updated: Sat, 02 May 2020 15:52:53 UTC
+" Last updated: Sun, 03 May 2020 03:46:29 UTC
 "
 " │ And I was lifted up in heart, and thought
 " │ Of all my late-shown prowess in the lists,
@@ -107,8 +107,8 @@ endif
 " directories to the end of it, in reverse order, forming the desired layers
 " of configuration.
 "
-let s:xdgconfigpaths = xdg#['config']['dirs']
-if xdg#['config']['home'] !=# v:null
+let s:xdgconfigpaths = copy(xdg#['config']['dirs'])
+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(
@@ -410,8 +410,8 @@ set spellcapcheck=[.?!]\\%(\ \ \\\|[\\n\\r\\t]\\)
 " 'isfname'; the blacklist is hard-coded.
 "
 set dictionary^=/usr/share/dict/words
-let s:refdirs = xdg#['data']['dirs']
-if xdg#['data']['home'] !=# v:null
+let s:refdirs = copy(xdg#['data']['dirs'])
+if xdg#['data']['home'] !=# ''
   call insert(s:refdirs, xdg#['data']['home'])
 endif
 if !empty(s:refdirs)