From 670c735799879ae066b9a5249356a4d872514951 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 17 Jun 2018 11:53:31 +1200
Subject: Use autoload function for temp-makeprg :lmake

---
 vim/after/ftplugin/php/check.vim | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

(limited to 'vim/after/ftplugin/php')

diff --git a/vim/after/ftplugin/php/check.vim b/vim/after/ftplugin/php/check.vim
index f211a642..9dc4c6a8 100644
--- a/vim/after/ftplugin/php/check.vim
+++ b/vim/after/ftplugin/php/check.vim
@@ -10,42 +10,20 @@ if exists('b:did_ftplugin_php_check')
   finish
 endif
 
+" Don't load if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_php_maps')
+  finish
+endif
+
 " Flag as loaded
 let b:did_ftplugin_php_check = 1
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|unlet b:did_ftplugin_php_check'
 
-" Build function for checker
-function! s:PhpCheck()
-  if exists('b:current_compiler')
-    let l:save_compiler = b:current_compiler
-  endif
-  compiler php
-
-  " The PHP compiler is unusual: it gets us to provide the filename argument
-  " ourselves. 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')
-    lmake! %:S
-  else
-    lmake! %
-  endif
-  lwindow
-
-  if exists('l:save_compiler')
-    execute 'compiler ' . l:save_compiler
-  endif
-endfunction
-
-" Stop here if the user doesn't want ftplugin mappings
-if exists('g:no_plugin_maps') || exists('g:no_php_maps')
-  finish
-endif
-
 " Define a mapping target
 nnoremap <buffer> <silent> <unique>
       \ <Plug>PhpCheck
-      \ :<C-U>call <SID>PhpCheck()<CR>
+      \ :<C-U>call compiler#Make('php')<CR>
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|nunmap <buffer> <Plug>PhpCheck'
 
-- 
cgit v1.2.3