diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-04 17:35:09 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-04 17:35:09 +1300 |
commit | ad7cb8319053250e4f2a2eb559bd942e741ba9b5 (patch) | |
tree | 2209ce2a1cc3ae384fbca8b2a93cc106947b59f0 | |
parent | Don't suggest mappings in Vim plugin comments (diff) | |
download | dotfiles-ad7cb8319053250e4f2a2eb559bd942e741ba9b5.tar.gz dotfiles-ad7cb8319053250e4f2a2eb559bd942e741ba9b5.zip |
Rename and refactor option toggle plugin
Renamed to flag_toggle.vim and placed in autoload using the namespaced
autoload function syntax.
I'm not sure this is the right approach yet, but I seem to pretty rarely
use a Vim earlier than 7.1 these days.
-rw-r--r-- | vim/autoload/flag_toggle.vim | 89 | ||||
-rw-r--r-- | vim/config/format.vim | 16 |
2 files changed, 51 insertions, 54 deletions
diff --git a/vim/autoload/flag_toggle.vim b/vim/autoload/flag_toggle.vim index 10739149..2ff4584d 100644 --- a/vim/autoload/flag_toggle.vim +++ b/vim/autoload/flag_toggle.vim @@ -1,5 +1,5 @@ " -" option_flags.vim: Provide functions to toggle flags in single-char grouped +" flag_toggle.vim: Provide functions to toggle flags in single-char grouped " options like 'formatoptions', 'shortmess', 'complete' etc. " " This will fail hilariously if you try to set e.g. 'switchbuf' with it! @@ -7,48 +7,45 @@ " Author: Tom Ryder <tom@sanctum.geek.nz> " License: Same as Vim itself " -if has('eval') - - " Public wrapper function to toggle a flag with 'set' - function! option_flags#toggle(option, flag) - call s:toggle(a:option, a:flag, 0) - endfunction - - " Public wrapper function to toggle a flag with 'setlocal' - function! option_flags#toggle_local(option, flag) - call s:toggle(a:option, a:flag, 1) - endfunction - - " Internal function to do the toggling - function! s:toggle(option, flag, local) - - " Check for weird options, we don't want to eval() anything funny - if a:option =~# '[^a-z]' - echoerr 'Illegal option name' - return - endif - - " Weird flags, too; should be a single inoffensive char - if a:flag !~# '^[a-z0-9.]$' - echoerr 'Illegal flag' - return - endif - - " Choose which set command to use - if a:local - let l:set = 'setlocal ' - else - let l:set = 'set ' - endif - - " Use eval() to assign -= or += to l:op for the option toggle - " (I couldn't get {curly braces} indirection to work) - let l:op = '' - execute 'let l:op = &'.a:option.' =~# a:flag ? "-=" : "+="' - - " Use eval() to perform the option toggle and then print the value - execute l:set . ' ' . a:option . l:op . a:flag . ' ' . a:option . '?' - - endfunction - -endif + +" Public wrapper function to toggle a flag with 'set' +function! flag_toggle#Toggle(option, flag) + call s:Toggle(a:option, a:flag, 0) +endfunction + +" Public wrapper function to toggle a flag with 'setlocal' +function! flag_toggle#ToggleLocal(option, flag) + call s:Toggle(a:option, a:flag, 1) +endfunction + +" Internal function to do the toggling +function! s:Toggle(option, flag, local) + + " Check for weird options, we don't want to eval() anything funny + if a:option =~# '[^a-z]' + echoerr 'Illegal option name' + return + endif + + " Weird flags, too; should be a single inoffensive char + if a:flag !~# '^[a-z0-9.]$' + echoerr 'Illegal flag' + return + endif + + " Choose which set command to use + if a:local + let l:set = 'setlocal ' + else + let l:set = 'set ' + endif + + " Use eval() to assign -= or += to l:op for the option toggle + " (I couldn't get {curly braces} indirection to work) + let l:op = '' + execute 'let l:op = &'.a:option.' =~# a:flag ? "-=" : "+="' + + " Use eval() to perform the option toggle and then print the value + execute l:set . ' ' . a:option . l:op . a:flag . ' ' . a:option . '?' + +endfunction diff --git a/vim/config/format.vim b/vim/config/format.vim index ceff2be1..9c68d843 100644 --- a/vim/config/format.vim +++ b/vim/config/format.vim @@ -5,7 +5,7 @@ if v:version > 703 || v:version ==# 703 && has('patch541') endif " -" Use option_flags.vim plugin to bind quick toggle actions for some +" Use flag_toggle.vim plugin to bind quick toggle actions for some " 'formatoptions' flags: " " a - Automatically format paragraphs, reapplying the wrap on every text @@ -16,11 +16,11 @@ endif " to set for me) " t - Automatically wrap text at 'textwidth' (as above) " -if has('eval') - nnoremap <silent> <leader>a - \ :<C-U>call option_flags#toggle_local('formatoptions', 'a')<CR> - nnoremap <silent> <leader>c - \ :<C-U>call option_flags#toggle_local('formatoptions', 'c')<CR> - nnoremap <silent> <leader>t - \ :<C-U>call option_flags#toggle_local('formatoptions', 't')<CR> +if has('eval') && v:version >= 701 + silent! nnoremap <silent> <leader>a + \ :<C-U>call flag_toggle#ToggleLocal('formatoptions', 'a')<CR> + silent! nnoremap <silent> <leader>c + \ :<C-U>call flag_toggle#ToggleLocal('formatoptions', 'c')<CR> + silent! nnoremap <silent> <leader>t + \ :<C-U>call flag_toggle#ToggleLocal('formatoptions', 't')<CR> endif |