summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2018-08-17 10:10:49 +0100
committerw0rp <devw0rp@gmail.com>2018-08-17 10:11:10 +0100
commit3c6af5f68d911a7fa2dda470224a09f344419d36 (patch)
treedc6bc1eac11a4bc4aaa6c178456eeb29dfb3d8ce
parent277313b58d367b0895ac078a4c9a1b969a43e20c (diff)
downloadale-3c6af5f68d911a7fa2dda470224a09f344419d36.zip
Use &l:equalprg so local options do not override global ones
-rw-r--r--autoload/ale/fix/registry.vim2
-rw-r--r--autoload/ale/linter.vim4
-rw-r--r--autoload/ale/util.vim2
3 files changed, 4 insertions, 4 deletions
diff --git a/autoload/ale/fix/registry.vim b/autoload/ale/fix/registry.vim
index e60d67b6..ef287358 100644
--- a/autoload/ale/fix/registry.vim
+++ b/autoload/ale/fix/registry.vim
@@ -243,7 +243,7 @@ endfunction
" (name, func, filetypes, desc, aliases)
function! ale#fix#registry#Add(name, func, filetypes, desc, ...) abort
" This command will throw from the sandbox.
- let &equalprg=&equalprg
+ let &l:equalprg=&l:equalprg
if type(a:name) isnot v:t_string
throw '''name'' must be a String'
diff --git a/autoload/ale/linter.vim b/autoload/ale/linter.vim
index ab86d77e..aad386aa 100644
--- a/autoload/ale/linter.vim
+++ b/autoload/ale/linter.vim
@@ -53,7 +53,7 @@ endfunction
" Do not call this function.
function! ale#linter#GetLintersLoaded() abort
" This command will throw from the sandbox.
- let &equalprg=&equalprg
+ let &l:equalprg=&l:equalprg
return s:linters
endfunction
@@ -295,7 +295,7 @@ endfunction
function! ale#linter#Define(filetype, linter) abort
" This command will throw from the sandbox.
- let &equalprg=&equalprg
+ let &l:equalprg=&l:equalprg
if !has_key(s:linters, a:filetype)
let s:linters[a:filetype] = []
diff --git a/autoload/ale/util.vim b/autoload/ale/util.vim
index e9b5688d..8c69c54f 100644
--- a/autoload/ale/util.vim
+++ b/autoload/ale/util.vim
@@ -268,7 +268,7 @@ endfunction
" See :help sandbox
function! ale#util#InSandbox() abort
try
- let &equalprg=&equalprg
+ let &l:equalprg=&l:equalprg
catch /E48/
" E48 is the sandbox error.
return 1