diff options
| author | James Miller <bladeon@gmail.com> | 2013-05-06 16:05:07 +1200 |
|---|---|---|
| committer | James Miller <bladeon@gmail.com> | 2013-05-08 11:16:27 +1200 |
| commit | 80b2926357232f8674df2c1db24bb91f24628e2f (patch) | |
| tree | 0d873adfa3280d6b7bf14bdafc9805dbe80092d7 | |
| parent | 0addefa68a85974a0b3906e7a46376a98ad513cc (diff) | |
| download | rust-80b2926357232f8674df2c1db24bb91f24628e2f.tar.gz rust-80b2926357232f8674df2c1db24bb91f24628e2f.zip | |
General fixes for vim
Makes colorcolumn setlocal instead of set. Makes conceal opt-in. Removes the seem-to-be obsolete old keywords/types
| -rw-r--r-- | src/etc/vim/after/ftplugin/rust.vim | 2 | ||||
| -rw-r--r-- | src/etc/vim/after/syntax/rust.vim | 2 | ||||
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/vim/after/ftplugin/rust.vim b/src/etc/vim/after/ftplugin/rust.vim index f0f1c85ee97..a053f8b40f8 100644 --- a/src/etc/vim/after/ftplugin/rust.vim +++ b/src/etc/vim/after/ftplugin/rust.vim @@ -1,5 +1,5 @@ "Highlight the 100th text column "Feature became available in v7.3 if version >= 703 - set colorcolumn=100 + setlocal colorcolumn=100 endif diff --git a/src/etc/vim/after/syntax/rust.vim b/src/etc/vim/after/syntax/rust.vim index 58a623cb4e4..75afe3d0368 100644 --- a/src/etc/vim/after/syntax/rust.vim +++ b/src/etc/vim/after/syntax/rust.vim @@ -1,4 +1,4 @@ -if exists('g:no_rust_conceal') || !has('conceal') || &enc != 'utf-8' +if !exists('g:rust_conceal') || !has('conceal') || &enc != 'utf-8' finish endif diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index eab3627ae16..3b5324f5cce 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -29,7 +29,7 @@ syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:spac syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained " Reserved words -syn keyword rustKeyword m32 m64 m128 f80 f16 f128 be +"syn keyword rustKeyword m32 m64 m128 f80 f16 f128 be " These are obsolete syn keyword rustType int uint float char bool u8 u16 u32 u64 f32 syn keyword rustType f64 i8 i16 i32 i64 str Self |