2 files changed, 10 insertions, 14 deletions
diff --git a/ale_linters/html/htmlhint.vim b/ale_linters/html/htmlhint.vim
index c4afceea..2d65dddc 100644
--- a/ale_linters/html/htmlhint.vim
+++ b/ale_linters/html/htmlhint.vim
@@ -2,29 +2,25 @@
 " Description: HTMLHint for checking html files
 
 " CLI options
-let g:ale_html_htmlhint_options = get(g:, 'ale_html_htmlhint_options', '--format=unix')
-
-let g:ale_html_htmlhint_executable =
-\   get(g:, 'ale_html_htmlhint_executable', 'htmlhint')
-
-let g:ale_html_htmlhint_use_global =
-\   get(g:, 'ale_html_htmlhint_use_global', 0)
+let g:html_htmlhint_options = get(g:, 'ale_html_htmlhint_options', '--format=unix')
+let g:html_htmlhint_executable = get(g:, 'ale_html_htmlhint_executable', 'htmlhint')
+let g:html_htmlhint_use_global = get(g:, 'ale_html_htmlhint_use_global', 0)
 
 function! ale_linters#html#htmlhint#GetExecutable(buffer) abort
-    if g:ale_html_htmlhint_use_global
-        return g:ale_html_htmlhint_executable
+    if ale#Var(a:buffer, 'html_htmlhint_use_global')
+        return ale#Var(a:buffer, 'html_htmlhint_executable')
     endif
 
     return ale#util#ResolveLocalPath(
     \   a:buffer,
     \   'node_modules/.bin/htmlhint',
-    \   g:ale_html_htmlhint_executable
+    \   ale#Var(a:buffer, 'html_htmlhint_executable')
     \)
 endfunction
 
 function! ale_linters#html#htmlhint#GetCommand(buffer) abort
     return ale_linters#html#htmlhint#GetExecutable(a:buffer)
-    \   . ' ' . g:ale_html_htmlhint_options
+    \   . ' ' . ale#Var(a:buffer, 'html_htmlhint_options')
     \   . ' %t'
 endfunction
 
diff --git a/ale_linters/html/tidy.vim b/ale_linters/html/tidy.vim
index eab07a0f..764bea82 100644
--- a/ale_linters/html/tidy.vim
+++ b/ale_linters/html/tidy.vim
@@ -26,14 +26,14 @@ function! ale_linters#html#tidy#GetCommand(buffer) abort
     \ }, &fileencoding, '-utf8')
 
     return printf('%s %s %s -',
-    \   g:ale_html_tidy_executable,
-    \   g:ale_html_tidy_options,
+    \   ale#Var(a:buffer, 'html_tidy_executable'),
+    \   ale#Var(a:buffer, 'html_tidy_options'),
     \   l:file_encoding
     \)
 endfunction
 
 function! ale_linters#html#tidy#GetExecutable(buffer) abort
-    return g:ale_html_tidy_executable
+    return ale#Var(a:buffer, 'html_tidy_executable')
 endfunction
 
 function! ale_linters#html#tidy#Handle(buffer, lines) abort