summaryrefslogtreecommitdiffstats
path: root/autoload/cargo
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
commit48e07bc5014fecfdff24f75124a65634c216c9e2 (patch)
tree2e16f9a515364e27ac451acbc313b1d7ca518790 /autoload/cargo
parentc8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
downloadvim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
Improve guard to support concatenated files
Diffstat (limited to '')
-rw-r--r--autoload/cargo.vim6
-rw-r--r--autoload/cargo/quickfix.vim6
2 files changed, 4 insertions, 8 deletions
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index fe28ef3a..ea63bd7a 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
function! cargo#Load()
" Utility call to get this script loaded, for debugging
endfunction
@@ -117,3 +114,4 @@ function! cargo#runtarget(args)
endfunction
" vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index ac66d298..b108da2f 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
function! cargo#quickfix#CmdPre() abort
if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
" Preserve the current directory, and 'lcd' to the nearest Cargo file.
@@ -28,3 +25,4 @@ function! cargo#quickfix#CmdPost() abort
endfunction
" vim: set et sw=4 sts=4 ts=8:
+endif