summaryrefslogtreecommitdiffstats
path: root/autoload/rust
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/rust
parentc8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
downloadvim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
Improve guard to support concatenated files
Diffstat (limited to 'autoload/rust')
-rw-r--r--autoload/rust/debugging.vim6
-rw-r--r--autoload/rust/delimitmate.vim6
-rw-r--r--autoload/rust/tags.vim6
3 files changed, 6 insertions, 12 deletions
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 6392a024..40a691c3 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.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
" For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
let s:global_variable_list = [
@@ -105,3 +102,4 @@ function! rust#debugging#InfoToFile(filename) abort
endfunction
" vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index 5e599f6a..8d88a8f4 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.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
let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
" For this buffer, when delimitMate issues the `User delimitMate_map`
@@ -46,3 +43,4 @@ endfunction
" vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 74e2f9f0..d3a3e645 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.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
" Tagbar support code, for the sake of not automatically overriding its
" configuration in case Universal Ctags is detected.
@@ -19,3 +16,4 @@ function! rust#tags#IsUCtags() abort
endfunction
" vim: set et sw=4 sts=4 ts=8:
+endif