From 05e45b9e365edad947ff4de10680127686e39a04 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Wed, 13 Aug 2014 16:52:26 -0700 Subject: [PATCH] vim: Stop setting conceallevel in the syntax file We shouldn't be setting conceallevel in the syntax file. Besides not being able to undo this if we switch to another syntax later, it also interferes with embedding rust in other filetypes (such as markdown). Instead, set it in the ftplugin, where it belongs. --- src/etc/vim/after/syntax/rust.vim | 2 -- src/etc/vim/ftplugin/rust.vim | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/etc/vim/after/syntax/rust.vim b/src/etc/vim/after/syntax/rust.vim index 1ab8394e565a0..735c1e153a60d 100644 --- a/src/etc/vim/after/syntax/rust.vim +++ b/src/etc/vim/after/syntax/rust.vim @@ -29,5 +29,3 @@ hi link rustNiceOperator Operator if !exists('g:rust_conceal_mod_path') hi! link Conceal Operator endif - -setlocal conceallevel=2 diff --git a/src/etc/vim/ftplugin/rust.vim b/src/etc/vim/ftplugin/rust.vim index 39edc1f9a20d7..8a538177403d3 100644 --- a/src/etc/vim/ftplugin/rust.vim +++ b/src/etc/vim/ftplugin/rust.vim @@ -56,6 +56,11 @@ if exists("g:loaded_delimitMate") let b:delimitMate_excluded_regions = delimitMate#Get("excluded_regions") . ',rustLifetimeCandidate,rustGenericLifetimeCandidate' endif +if has('conceal') && exists('g:rust_conceal') + let b:rust_set_conceallevel=1 + setlocal conceallevel=2 +endif + " Motion Commands {{{1 " Bind motion commands to support hanging indents @@ -103,6 +108,10 @@ let b:undo_ftplugin = " \|else \|unlet! b:delimitMate_excluded_regions \|endif + \|if exists('b:rust_set_conceallevel') + \|setlocal conceallevel< + \|unlet b:rust_set_conceallevel + \|endif \|unlet! b:rust_last_rustc_args b:rust_last_args \|delcommand RustRun \|delcommand RustExpand