diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-12-08 10:12:09 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-12-08 10:12:09 +1300 |
commit | b0e6149e44726c1a0b32d549ff3c6ee2d8b4b574 (patch) | |
tree | c260e5929b3f25b1ed37963f49a1a853c1754f26 /vim | |
parent | Merge branch 'hotfix/v0.19.1' (diff) | |
parent | Bump verison number to 0.20.0 (diff) | |
download | dotfiles-d2db372d0167bd88cd6118f7e710ddb4e9557adc.tar.gz (sig) dotfiles-d2db372d0167bd88cd6118f7e710ddb4e9557adc.zip |
Merge branch 'release/v0.20.0'v0.20.0
* release/v0.20.0:
Bump verison number to 0.20.0
Add some comments to vintrc
Make vim-vint allow saying ":set nocompatible"
Add install target for vim-vint
Update submodule paths
Add syntax checking with zsh -n for Z shell
Use consistent indentation for bulleted list items
Update sahara submodule
Correct a homophone error in a comment
Diffstat (limited to 'vim')
-rw-r--r-- | vim/after/ftplugin/zsh/check.vim | 49 | ||||
m--------- | vim/bundle/sahara | 0 | ||||
-rw-r--r-- | vim/compiler/zsh.vim | 17 |
3 files changed, 66 insertions, 0 deletions
diff --git a/vim/after/ftplugin/zsh/check.vim b/vim/after/ftplugin/zsh/check.vim new file mode 100644 index 00000000..39faf44a --- /dev/null +++ b/vim/after/ftplugin/zsh/check.vim @@ -0,0 +1,49 @@ +" Only do this when not done yet for this buffer +" Also do nothing if 'compatible' enabled +if exists('b:did_ftplugin_zsh_check') || &compatible + finish +endif +let b:did_ftplugin_zsh_check = 1 +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_zsh_check' +endif + +" Build function for checker +if !exists('*s:ZshCheck') + function s:ZshCheck() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler zsh + make! + let &l:makeprg = l:save_makeprg + let &l:errorformat = l:save_errorformat + cwindow + endfunction +endif + +" Set up a mapping for the checker, if we're allowed +if !exists('g:no_plugin_maps') && !exists('g:no_zsh_maps') + + " Define a mapping target + nnoremap <buffer> <silent> <unique> + \ <Plug>ZshCheck + \ :<C-U>call <SID>ZshCheck()<CR> + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>ZshCheck' + endif + + " If there isn't a key mapping already, use a default one + if !hasmapto('<Plug>ZshCheck') + nmap <buffer> <unique> + \ <LocalLeader>c + \ <Plug>ZshCheck + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>c' + endif + endif + +endif diff --git a/vim/bundle/sahara b/vim/bundle/sahara -Subproject 6beee89195b4510cf091755c4c5ee9e1ddf2e9d +Subproject 4f85b7c8fe1953479a2253cadd1ab82017a4d7e diff --git a/vim/compiler/zsh.vim b/vim/compiler/zsh.vim new file mode 100644 index 00000000..685a01ad --- /dev/null +++ b/vim/compiler/zsh.vim @@ -0,0 +1,17 @@ +if exists('g:current_compiler') + finish +endif +let g:current_compiler = 'zsh' + +if exists(':CompilerSet') != 2 + command -nargs=* CompilerSet setlocal <args> +endif + +" 7.4.191 is the earliest version with the :S file name modifier, which we +" really should use if we can +if v:version >= 704 || v:version == 704 && has('patch191') + CompilerSet makeprg=zsh\ -n\ %:S +else + CompilerSet makeprg=zsh\ -n\ % +endif +CompilerSet errorformat=%f:%l:\ %m |