From 0addefa68a85974a0b3906e7a46376a98ad513cc Mon Sep 17 00:00:00 2001 From: James Miller Date: Mon, 6 May 2013 15:24:38 +1200 Subject: [PATCH 1/2] Improved vim indent file for rust --- src/etc/vim/indent/rust.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/etc/vim/indent/rust.vim b/src/etc/vim/indent/rust.vim index 43fd917fc97bb..8d973c9a87069 100644 --- a/src/etc/vim/indent/rust.vim +++ b/src/etc/vim/indent/rust.vim @@ -5,4 +5,7 @@ if exists("b:did_indent") endif let b:did_indent = 1 -setlocal smartindent + +setlocal cindent +setlocal cinoptions=L0,(0,Ws,JN +setlocal cinkeys=0{,0},!^F,o,O From 80b2926357232f8674df2c1db24bb91f24628e2f Mon Sep 17 00:00:00 2001 From: James Miller Date: Mon, 6 May 2013 16:05:07 +1200 Subject: [PATCH 2/2] General fixes for vim Makes colorcolumn setlocal instead of set. Makes conceal opt-in. Removes the seem-to-be obsolete old keywords/types --- src/etc/vim/after/ftplugin/rust.vim | 2 +- src/etc/vim/after/syntax/rust.vim | 2 +- 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 f0f1c85ee9720..a053f8b40f863 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 58a623cb4e478..75afe3d03684f 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 eab3627ae16d1..3b5324f5cced3 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