diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-10 01:55:15 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-10 01:56:49 +1200 |
commit | f36ef6745c3c96914eb7be228125c1d53bf70287 (patch) | |
tree | a42fc40eafc296b522071d60d754eb3c83ffece7 /vim/after/ftplugin/php.vim | |
parent | Add explicit group to ftdetect rule (diff) | |
download | dotfiles-f36ef6745c3c96914eb7be228125c1d53bf70287.tar.gz dotfiles-f36ef6745c3c96914eb7be228125c1d53bf70287.zip |
Overhaul after/ftplugin
Use .= operator to append to b:undo_ftplugin, as we're requiring Vim 7.0
or later everywhere here anyway. Also remove &compatible where we don't
need line breaks.
Diffstat (limited to 'vim/after/ftplugin/php.vim')
-rw-r--r-- | vim/after/ftplugin/php.vim | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim index 765c1fb9..c98c1264 100644 --- a/vim/after/ftplugin/php.vim +++ b/vim/after/ftplugin/php.vim @@ -1,21 +1,17 @@ " Extra configuration for PHP scripts -if &filetype != 'php' || &compatible || v:version < 700 +if &filetype !=# 'php' || v:version < 700 || &compatible finish endif " Use PHP itself for syntax checking compiler php -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:current_compiler' - \ . '|setlocal errorformat<' - \ . '|setlocal makeprg<' +let b:undo_ftplugin .= '|unlet b:current_compiler' + \ . '|setlocal errorformat< makeprg<' " Set comment formats setlocal comments=s1:/*,m:*,ex:*/,://,:# setlocal formatoptions+=or -let b:undo_ftplugin = b:undo_ftplugin - \ . '|setlocal comments<' - \ . '|setlocal formatoptions<' +let b:undo_ftplugin .= '|setlocal comments< formatoptions<' " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_php_maps') @@ -23,8 +19,7 @@ if exists('g:no_plugin_maps') || exists('g:no_php_maps') endif " Get rid of the core ftplugin's square-bracket maps on unload -let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> [[' +let b:undo_ftplugin .= '|nunmap <buffer> [[' \ . '|ounmap <buffer> [[' \ . '|nunmap <buffer> ]]' \ . '|ounmap <buffer> ]]' |