diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-04 21:48:17 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-04 21:48:17 +1300 |
commit | c213eec1cb25c07033b9164ad2054a7458e0def0 (patch) | |
tree | 903b042c364c0098fea7f4707007b049bbd470ca | |
parent | Merge branch 'feature/plugin-review' into develop (diff) | |
parent | Use spaces around concat dots in VimL consistently (diff) | |
download | dotfiles-c213eec1cb25c07033b9164ad2054a7458e0def0.tar.gz dotfiles-c213eec1cb25c07033b9164ad2054a7458e0def0.zip |
Merge branch 'feature/space-dots' into develop
* feature/space-dots:
Use spaces around concat dots in VimL consistently
-rw-r--r-- | vim/indent/_GLOBAL.vim | 6 | ||||
-rw-r--r-- | vim/plugin/strip_trailing_whitespace.vim | 2 | ||||
-rw-r--r-- | vim/plugin/toggle_option_flag.vim | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vim/indent/_GLOBAL.vim b/vim/indent/_GLOBAL.vim index 4461f36d..d0bdea26 100644 --- a/vim/indent/_GLOBAL.vim +++ b/vim/indent/_GLOBAL.vim @@ -7,6 +7,6 @@ setlocal expandtab< " Unfortunately, older versions of Vim (6.2 is known) accept neither the " `option<` nor `option=` syntax for resetting these numeric values, so we do " it this clunkier way. -execute 'setlocal shiftwidth='.&g:shiftwidth -execute 'setlocal softtabstop='.&g:softtabstop -execute 'setlocal tabstop='.&g:tabstop +execute 'setlocal shiftwidth=' . &g:shiftwidth +execute 'setlocal softtabstop=' . &g:softtabstop +execute 'setlocal tabstop=' . &g:tabstop diff --git a/vim/plugin/strip_trailing_whitespace.vim b/vim/plugin/strip_trailing_whitespace.vim index 3840195b..b5079d28 100644 --- a/vim/plugin/strip_trailing_whitespace.vim +++ b/vim/plugin/strip_trailing_whitespace.vim @@ -50,7 +50,7 @@ if has('eval') let l:cc = col('.') " Delete the lines, which will move the cursor - execute l:lw + 1.',$ delete' + execute l:lw + 1 . ',$ delete' " Return the cursor to the saved position call cursor(l:lc, l:cc) diff --git a/vim/plugin/toggle_option_flag.vim b/vim/plugin/toggle_option_flag.vim index 43561a25..f83af1cc 100644 --- a/vim/plugin/toggle_option_flag.vim +++ b/vim/plugin/toggle_option_flag.vim @@ -32,7 +32,7 @@ if has('eval') && has('user_commands') " 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 ? "-=" : "+="' + execute 'let l:op = &' . a:option . ' =~# a:flag ? "-=" : "+="' " eval() to perform the option toggle and then print the value execute l:set . ' ' . a:option . l:op . a:flag |