Skip to content

Commit 6550d9c

Browse files
committed
sensible.vim: compute setcmd in DefaultSet()
Eliminates TranslateDefault()
1 parent 1a4e74f commit 6550d9c

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

plugin/sensible.vim

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ let s:defaultval_no = ['set no', '']
3131
let s:defaultval_checked = ['" ', ''] " translates to comment -> no :set
3232
let s:default_opts = []
3333
let s:default_vals = {}
34-
function! s:DefaultSet(option, value) abort
34+
function! s:DefaultSet(option, setcmd) abort
3535
if exists('&' . a:option)
3636
call add(s:default_opts, a:option)
37-
let s:default_vals[a:option] = a:value
37+
let s:default_vals[a:option] = a:setcmd[0] . a:option . a:setcmd[1]
3838
endif
3939
endfunction
4040
function! s:Default(option, value) abort
@@ -146,15 +146,9 @@ function! s:MaySet(option) abort
146146
return s:global_settings !~# ('\n\(\s\+\|no\)\?' . a:option . '\(=[^\n]*\n\|\n\)' . '[^\n]*' . s:homerx)
147147
endfunction
148148

149-
function! s:TranslateDefault(opt) abort
150-
if ! s:MaySet(a:opt)
151-
return ''
152-
endif
153-
let val = s:default_vals[a:opt]
154-
return val[0] . a:opt . val[1]
155-
endfunction
156149
function! s:ComputeSettings() abort
157-
return join(map(copy(s:default_opts), 's:TranslateDefault(v:val)'), "\n")
150+
call filter(s:default_opts, 's:MaySet(v:val)')
151+
return join(map(s:default_opts, 's:default_vals[v:val]'), "\n")
158152
endfunction
159153

160154
call s:CheckDefaults()

0 commit comments

Comments
 (0)