diff options
| -rw-r--r-- | src/etc/vim/doc/rust.txt | 6 | ||||
| -rw-r--r-- | src/etc/vim/ftplugin/rust.vim | 23 |
2 files changed, 2 insertions, 27 deletions
diff --git a/src/etc/vim/doc/rust.txt b/src/etc/vim/doc/rust.txt index fdf3a052b2c..80f8c3ca5e1 100644 --- a/src/etc/vim/doc/rust.txt +++ b/src/etc/vim/doc/rust.txt @@ -34,12 +34,6 @@ g:rustc_makeprg_no_percent~ let g:rustc_makeprg_no_percent = 1 < - *g:rust_colorcolumn* -g:rust_colorcolumn~ - Set this option to use 'colorcolumn' to highlight the text width - indicate the 100 column recommended hard limit on line lengths: > - let g:rust_colorcolumn = 1 -< *g:rust_conceal* g:rust_conceal~ Set this option to turn on the basic |conceal| support: > diff --git a/src/etc/vim/ftplugin/rust.vim b/src/etc/vim/ftplugin/rust.vim index 2b1261c35b5..39edc1f9a20 100644 --- a/src/etc/vim/ftplugin/rust.vim +++ b/src/etc/vim/ftplugin/rust.vim @@ -2,7 +2,7 @@ " Description: Vim syntax file for Rust " Maintainer: Chris Morgan <me@chrismorgan.info> " Maintainer: Kevin Ballard <kevin@sb.org> -" Last Change: July 06, 2014 +" Last Change: Jul 07, 2014 if exists("b:did_ftplugin") finish @@ -37,22 +37,7 @@ setlocal smartindent nocindent setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab -" Line lengths {{{2 - -" Rust style conventions for line lengths say you SHOULD not go over 80 -" columns and MUST not go over 100. -" Without a good 'formatexpr' we can't automatically wrap code, but we can -" still wrap comments just fine with 'textwidth'. -setlocal textwidth=80 - -" We can also use 'colorcolumn' to highlight both the 80 and 100 limits. Not -" everyone likes this so it's gated. -if exists('g:rust_colorcolumn') - setlocal colorcolumn=+1,101 - let b:rust_colorcolumn=1 -endif - -" }}}2 +setlocal textwidth=99 " This includeexpr isn't perfect, but it's a good start setlocal includeexpr=substitute(v:fname,'::','/','g') @@ -112,10 +97,6 @@ endif let b:undo_ftplugin = " \ setlocal formatoptions< comments< commentstring< includeexpr< suffixesadd< \|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth< - \|if exists('b:rust_colorcolumn') - \|setlocal colorcolumn< - \|unlet b:rust_colorcolumn - \|endif \|if exists('b:rust_original_delimitMate_excluded_regions') \|let b:delimitMate_excluded_regions = b:rust_original_delimitMate_excluded_regions \|unlet b:rust_original_delimitMate_excluded_regions |