Remove more uses of command_callback and executable_callback

4 files changed, 8 insertions, 8 deletions

diff --git a/autoload/ale/handlers/alex.vim b/autoload/ale/handlers/alex.vim
index 9cb546ec..190a7f86 100644
--- a/autoload/ale/handlers/alex.vim
+++ b/autoload/ale/handlers/alex.vim
@@ -1,3 +1,4 @@
+scriptencoding utf-8
 " Author: Johannes Wienke <languitar@semipol.de>
 " Description: Error handling for errors in alex output format
 
@@ -44,8 +45,8 @@ function! ale#handlers#alex#DefineLinter(filetype, flags) abort
 
     call ale#linter#Define(a:filetype, {
     \   'name': 'alex',
-    \   'executable_callback': 'ale#handlers#alex#GetExecutable',
-    \   'command_callback': ale#handlers#alex#CreateCommandCallback(a:flags),
+    \   'executable': function('ale#handlers#alex#GetExecutable'),
+    \   'command': ale#handlers#alex#CreateCommandCallback(a:flags),
     \   'output_stream': 'stderr',
     \   'callback': 'ale#handlers#alex#Handle',
     \   'lint_file': 1,
diff --git a/autoload/ale/handlers/languagetool.vim b/autoload/ale/handlers/languagetool.vim
index 8b7c5306..aaad4c99 100644
--- a/autoload/ale/handlers/languagetool.vim
+++ b/autoload/ale/handlers/languagetool.vim
@@ -1,4 +1,4 @@
-" Author: Vincent (wahrwolf [ät] wolfpit.net)
+" Author: Vincent (wahrwolf [at] wolfpit.net)
 " Description: languagetool for markdown files
 "
 call ale#Set('languagetool_executable', 'languagetool')
@@ -65,8 +65,8 @@ endfunction
 function! ale#handlers#languagetool#DefineLinter(filetype) abort
     call ale#linter#Define(a:filetype, {
     \   'name': 'languagetool',
-    \   'executable_callback': 'ale#handlers#languagetool#GetExecutable',
-    \   'command_callback': 'ale#handlers#languagetool#GetCommand',
+    \   'executable': function('ale#handlers#languagetool#GetExecutable'),
+    \   'command': function('ale#handlers#languagetool#GetCommand'),
     \   'output_stream': 'stdout',
     \   'callback': 'ale#handlers#languagetool#HandleOutput',
     \   'lint_file': 1,
diff --git a/autoload/ale/handlers/sml.vim b/autoload/ale/handlers/sml.vim
index e5e528a5..594ee4f7 100644
--- a/autoload/ale/handlers/sml.vim
+++ b/autoload/ale/handlers/sml.vim
@@ -26,7 +26,6 @@ function! ale#handlers#sml#GetCmFile(buffer) abort
 endfunction
 
 " Only one of smlnj or smlnj-cm can be enabled at a time.
-" executable_callback is called before *every* lint attempt
 function! s:GetExecutable(buffer, source) abort
     if ale#handlers#sml#GetCmFile(a:buffer) is# ''
         " No CM file found; only allow single-file mode to be enabled
diff --git a/autoload/ale/handlers/writegood.vim b/autoload/ale/handlers/writegood.vim
index aff66d5f..8ae61a38 100644
--- a/autoload/ale/handlers/writegood.vim
+++ b/autoload/ale/handlers/writegood.vim
@@ -65,8 +65,8 @@ function! ale#handlers#writegood#DefineLinter(filetype) abort
     call ale#linter#Define(a:filetype, {
     \   'name': 'writegood',
     \   'aliases': ['write-good'],
-    \   'executable_callback': 'ale#handlers#writegood#GetExecutable',
-    \   'command_callback': 'ale#handlers#writegood#GetCommand',
+    \   'executable': function('ale#handlers#writegood#GetExecutable'),
+    \   'command': function('ale#handlers#writegood#GetCommand'),
     \   'callback': 'ale#handlers#writegood#Handle',
     \})
 endfunction