aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-12-15 17:23:09 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-12-15 17:23:09 +1300
commitaa2032ac9647c10192c73b66d748735909a8826c (patch)
tree549da9c8f7549c88688120afab3ad543d4fe138d
parentMerge branch 'release/v8.3.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-aa2032ac9647c10192c73b66d748735909a8826c.tar.gz
dotfiles-aa2032ac9647c10192c73b66d748735909a8826c.zip
Merge branch 'release/v8.4.0'v8.4.0
* release/v8.4.0: Add mappings to change 'equalprg' in Perl and PHP
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/perl.vim15
-rw-r--r--vim/after/ftplugin/php.vim20
3 files changed, 33 insertions, 6 deletions
diff --git a/VERSION b/VERSION
index 72b6691e..57c7ea8b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.3.0
-Wed, 11 Dec 2019 00:01:31 +0000
+tejr dotfiles v8.4.0
+Sun, 15 Dec 2019 04:23:07 +0000
diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim
index 5c9cf8a0..611af62c 100644
--- a/vim/after/ftplugin/perl.vim
+++ b/vim/after/ftplugin/perl.vim
@@ -1,8 +1,11 @@
" Use Perl itself for checking and Perl::Tidy for tidying
compiler perl
-setlocal equalprg=perltidy
let b:undo_ftplugin .= '|unlet b:current_compiler'
- \ . '|setlocal equalprg< errorformat< makeprg<'
+ \ . '|setlocal errorformat< makeprg<'
+if executable('perltidy')
+ setlocal equalprg=perltidy
+ let b:undo_ftplugin .= '|setlocal equalprg<'
+endif
" Fold based on indent level, but start with all folds open
setlocal foldmethod=indent
@@ -38,6 +41,14 @@ nnoremap <buffer> <LocalLeader>l
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c'
\ . '|nunmap <buffer> <LocalLeader>l'
+" Mappings to choose 'equalprg'
+nnoremap <buffer> <LocalLeader>t
+ \ :<C-U>setlocal equalprg=perltidy<CR>
+nnoremap <buffer> <LocalLeader>i
+ \ :<C-U>setlocal equalprg<<CR>
+let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>t'
+ \ . '|nunmap <buffer> <LocalLeader>i'
+
" Bump version numbers
nmap <buffer> <LocalLeader>v
\ <Plug>(PerlVersionBumpMinor)
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 0ce099a0..20d8d42e 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,8 +1,11 @@
" Use PHP itself for syntax checking
compiler php
-setlocal equalprg=phpcsff
let b:undo_ftplugin .= '|unlet b:current_compiler'
- \ . '|setlocal equalprg< errorformat< makeprg<'
+ \ . '|setlocal errorformat< makeprg<'
+if executable('php-cs-fixer')
+ setlocal equalprg=phpcsff
+ let b:undo_ftplugin .= '|setlocal equalprg<'
+endif
" Set comment formats
setlocal comments=s1:/*,m:*,ex:*/,://,:#
@@ -26,3 +29,16 @@ let b:undo_ftplugin .= '|unlet b:regex_escape_flavor'
if !exists('b:alternate_filetypes')
let b:alternate_filetypes = [&filetype, 'html']
endif
+
+" Stop here if the user doesn't want ftplugin mappings
+if exists('no_plugin_maps') || exists('no_php_maps')
+ finish
+endif
+
+" Mappings to choose 'equalprg'
+nnoremap <buffer> <LocalLeader>f
+ \ :<C-U>setlocal equalprg=phpcsff<CR>
+nnoremap <buffer> <LocalLeader>i
+ \ :<C-U>setlocal equalprg<<CR>
+let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>f'
+ \ . '|nunmap <buffer> <LocalLeader>i'