summaryrefslogtreecommitdiffstats
path: root/after/syntax/rust.vim
diff options
context:
space:
mode:
Diffstat (limited to 'after/syntax/rust.vim')
-rw-r--r--after/syntax/rust.vim23
1 files changed, 15 insertions, 8 deletions
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 9a317956..3e2c2077 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,12 +1,14 @@
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-if !exists('g:rust_conceal') || g:rust_conceal == 0 || !has('conceal') || &enc != 'utf-8'
- finish
+scriptencoding utf-8
+
+if !get(g:, 'rust_conceal', 0) || !has('conceal') || &encoding !=# 'utf-8'
+ finish
endif
" For those who don't want to see `::`...
-if exists('g:rust_conceal_mod_path') && g:rust_conceal_mod_path != 0
- syn match rustNiceOperator "::" conceal cchar=ㆍ
+if get(g:, 'rust_conceal_mod_path', 0)
+ syn match rustNiceOperator "::" conceal cchar=ㆍ
endif
syn match rustRightArrowHead contained ">" conceal cchar= 
@@ -20,7 +22,7 @@ syn match rustNiceOperator "=>" contains=rustFatRightArrowHead,rustFatRightArrow
syn match rustNiceOperator /\<\@!_\(_*\>\)\@=/ conceal cchar=′
" For those who don't want to see `pub`...
-if exists('g:rust_conceal_pub') && g:rust_conceal_pub != 0
+if get(g:, 'rust_conceal_pub', 0)
syn match rustPublicSigil contained "pu" conceal cchar=*
syn match rustPublicRest contained "b" conceal cchar= 
syn match rustNiceOperator "pub " contains=rustPublicSigil,rustPublicRest
@@ -28,11 +30,16 @@ endif
hi link rustNiceOperator Operator
-if !(exists('g:rust_conceal_mod_path') && g:rust_conceal_mod_path != 0)
+if !get(g:, 'rust_conceal_mod_path', 0)
hi! link Conceal Operator
- " And keep it after a colorscheme change
- au ColorScheme <buffer> hi! link Conceal Operator
+ augroup rust.vim.after
+ autocmd!
+ " And keep it after a colorscheme change
+ autocmd ColorScheme <buffer> hi! link Conceal Operator
+ augroup END
endif
+" vim: set et sw=4 sts=4 ts=8:
+
endif