Skip to content

vim file improvements #6259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2013
Merged

vim file improvements #6259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0addefa
Improved vim indent file for rust
May 6, 2013
80b2926
General fixes for vim
May 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/etc/vim/after/ftplugin/rust.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/etc/vim/after/syntax/rust.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 4 additions & 1 deletion src/etc/vim/indent/rust.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/etc/vim/syntax/rust.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down