|
2 | 2 | " Description: Vim syntax file for Rust
|
3 | 3 | " Maintainer: Chris Morgan <me@chrismorgan.info>
|
4 | 4 | " Maintainer: Kevin Ballard <kevin@sb.org>
|
5 |
| -" Last Change: July 06, 2014 |
| 5 | +" Last Change: Jul 07, 2014 |
6 | 6 |
|
7 | 7 | if exists("b:did_ftplugin")
|
8 | 8 | finish
|
@@ -37,22 +37,7 @@ setlocal smartindent nocindent
|
37 | 37 |
|
38 | 38 | setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
|
39 | 39 |
|
40 |
| -" Line lengths {{{2 |
41 |
| - |
42 |
| -" Rust style conventions for line lengths say you SHOULD not go over 80 |
43 |
| -" columns and MUST not go over 100. |
44 |
| -" Without a good 'formatexpr' we can't automatically wrap code, but we can |
45 |
| -" still wrap comments just fine with 'textwidth'. |
46 |
| -setlocal textwidth=80 |
47 |
| - |
48 |
| -" We can also use 'colorcolumn' to highlight both the 80 and 100 limits. Not |
49 |
| -" everyone likes this so it's gated. |
50 |
| -if exists('g:rust_colorcolumn') |
51 |
| - setlocal colorcolumn=+1,101 |
52 |
| - let b:rust_colorcolumn=1 |
53 |
| -endif |
54 |
| - |
55 |
| -" }}}2 |
| 40 | +setlocal textwidth=99 |
56 | 41 |
|
57 | 42 | " This includeexpr isn't perfect, but it's a good start
|
58 | 43 | setlocal includeexpr=substitute(v:fname,'::','/','g')
|
@@ -112,10 +97,6 @@ endif
|
112 | 97 | let b:undo_ftplugin = "
|
113 | 98 | \ setlocal formatoptions< comments< commentstring< includeexpr< suffixesadd<
|
114 | 99 | \|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
|
115 |
| - \|if exists('b:rust_colorcolumn') |
116 |
| - \|setlocal colorcolumn< |
117 |
| - \|unlet b:rust_colorcolumn |
118 |
| - \|endif |
119 | 100 | \|if exists('b:rust_original_delimitMate_excluded_regions')
|
120 | 101 | \|let b:delimitMate_excluded_regions = b:rust_original_delimitMate_excluded_regions
|
121 | 102 | \|unlet b:rust_original_delimitMate_excluded_regions
|
|
0 commit comments