aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-09 16:56:53 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-09 16:56:53 +1200
commitdf76b01c6151be8a56181d9c1a8463094205e1c1 (patch)
treeb8b0f42940c7f8288e8bd2d6e7e973320598efca
parentMerge branch 'hotfix/v8.31.1' (diff)
parentBump VERSION (diff)
downloaddotfiles-8.31.2.tar.gz (sig)
dotfiles-8.31.2.zip
Merge branch 'hotfix/v8.31.2'v8.31.2
* hotfix/v8.31.2: Make copies for map(), filter(), and reverse()
-rw-r--r--VERSION4
-rw-r--r--vim/autoload/option.vim2
-rw-r--r--vim/autoload/xdg.vim2
-rw-r--r--vim/vimrc14
4 files changed, 13 insertions, 9 deletions
diff --git a/VERSION b/VERSION
index e02c1e32..fafb89ee 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.31.1
-Wed, 06 May 2020 10:07:19 +0000
+tejr dotfiles v8.31.2
+Sat, 09 May 2020 04:56:39 +0000
diff --git a/vim/autoload/option.vim b/vim/autoload/option.vim
index c44cf94b..49fbf1a4 100644
--- a/vim/autoload/option.vim
+++ b/vim/autoload/option.vim
@@ -7,7 +7,7 @@ function! option#Split(expr, ...) abort
endif
let keepempty = a:0 ? a:1 : 0
let parts = split(a:expr, '\\\@<!,[, ]*', keepempty)
- return map(parts, 'substitute(v:val, ''\\,'', '','', ''g'')')
+ return map(copy(parts), 'substitute(v:val, ''\\,'', '','', ''g'')')
endfunction
" Escape the right-hand side of a :set option value
diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim
index dd9a129b..5cef0f98 100644
--- a/vim/autoload/xdg.vim
+++ b/vim/autoload/xdg.vim
@@ -37,7 +37,7 @@ endfunction
function! s:Dirs(name) abort
let dirs = split(s:Get(a:name), ':')
return map(
- \ filter(dirs, 's:Absolute(v:val)')
+ \ filter(copy(dirs), 's:Absolute(v:val)')
\,'join([v:val, s:subdir], "/")'
\)
endfunction
diff --git a/vim/vimrc b/vim/vimrc
index d60d66fd..09a31c42 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
" Tom Ryder (tejr)’s Literate Vimrc
" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
"
-" Last updated: Mon, 04 May 2020 00:51:58 UTC
+" Last updated: Sat, 09 May 2020 04:48:24 UTC
"
" │ And I was lifted up in heart, and thought
" │ Of all my late-shown prowess in the lists,
@@ -118,10 +118,12 @@ if xdg#['config']['home'] !=# ''
endif
if !empty(s:xdgconfigpaths)
execute 'set runtimepath^='.option#Escape(join(map(
- \ s:xdgconfigpaths, 'option#item#Escape(v:val)'
+ \ copy(s:xdgconfigpaths),
+ \ 'option#item#Escape(v:val)'
\), ','))
execute 'set runtimepath+='.option#Escape(join(map(
- \ reverse(s:xdgconfigpaths), 'option#item#Escape(v:val."/after")'
+ \ reverse(copy(s:xdgconfigpaths)),
+ \ 'option#item#Escape(v:val.''/after'')'
\), ','))
endif
unlet s:xdgconfigpaths
@@ -419,10 +421,12 @@ endif
if !empty(s:refdirs)
try
execute 'set dictionary^='.option#Escape(join(map(
- \ s:refdirs, 'option#item#Escape(v:val."/dictionary.txt")'
+ \ copy(s:refdirs),
+ \ 'option#item#Escape(v:val.''/dictionary.txt'')'
\), ','))
execute 'set thesaurus^='.option#Escape(join(map(
- \ s:refdirs, 'option#item#Escape(v:val."/thesaurus.txt")'
+ \ copy(s:refdirs),
+ \ 'option#item#Escape(v:val.''/thesaurus.txt'')'
\), ','))
catch /^Vim\%((\a\+)\)\=:E474:/
endtry