aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-16 14:19:19 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-16 14:24:11 +1200
commit90ac35e462086110ddb507648daa9c56c5120d9e (patch)
tree6854e396fb45e3c42ccf688b7212c235d09a7a00
parentMerge branch 'release/v6.12.0' into develop (diff)
downloaddotfiles-90ac35e462086110ddb507648daa9c56c5120d9e.tar.gz
dotfiles-90ac35e462086110ddb507648daa9c56c5120d9e.zip
Break up long conditions again
I'm having some trouble deciding how I want to do these.
-rw-r--r--vim/vimrc15
1 files changed, 10 insertions, 5 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 2175f114..0a95d1a9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -150,8 +150,10 @@ endif
"
" <https://github.com/vim/vim/releases/tag/v7.1.055>
"
-if $MYVIM =~# '\\'
- \ && (v:version < 701 || v:version == 701 && !has('patch55'))
+if $MYVIM =~# '\\' && (
+ \ v:version < 701
+ \ || v:version == 701 && !has('patch55')
+ \ )
echoerr 'Illegal backslash in user runtime path on Vim < v7.1.055'
finish
endif
@@ -492,7 +494,8 @@ set shiftwidth=4 " Indent command like < and > use four-space indents
"
" <https://github.com/vim/vim/releases/tag/v7.3.693>
"
-if v:version > 730 || v:version == 730 && has('patch693')
+if v:version > 730
+ \ || v:version == 730 && has('patch693')
set softtabstop=-1
else
let &softtabstop = &shiftwidth
@@ -622,7 +625,8 @@ set formatoptions+=1
"
" <https://github.com/vim/vim/releases/tag/v7.3.541>
"
-if v:version > 730 || v:version == 730 && has('patch541')
+if v:version > 730
+ \ || v:version == 730 && has('patch541')
set formatoptions+=j
endif
@@ -1074,7 +1078,8 @@ nnoremap <expr> <Space>
" If the plugin isn't available, I just abandon CTRL-C to continue its
" uselessness.
"
-if &loadplugins && globpath(&runtimepath, 'plugin/insert_cancel.vim') !=# ''
+if &loadplugins
+ \ && globpath(&runtimepath, 'plugin/insert_cancel.vim') !=# ''
imap <C-C> <Plug>(InsertCancel)
endif