diff options
| author | bors <bors@rust-lang.org> | 2014-07-05 16:26:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-05 16:26:44 +0000 |
| commit | aaff4e05e19b48d81e4ecb3337f288f42d06edd0 (patch) | |
| tree | daac1e6f4f709236dfb9775326536b54901f79a8 /src/etc/vim | |
| parent | 98eb5f7498902de6ff19a1bb70155ca0cd16907c (diff) | |
| parent | 4c1fdd065b28b85d879a01870525e2f0699262e9 (diff) | |
| download | rust-aaff4e05e19b48d81e4ecb3337f288f42d06edd0.tar.gz rust-aaff4e05e19b48d81e4ecb3337f288f42d06edd0.zip | |
auto merge of #15429 : kballard/rust/vim_tab_conventions, r=pcwalton
Diffstat (limited to 'src/etc/vim')
| -rw-r--r-- | src/etc/vim/ftplugin/rust.vim | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/etc/vim/ftplugin/rust.vim b/src/etc/vim/ftplugin/rust.vim index 65f9f4105ad..16ed43415c3 100644 --- a/src/etc/vim/ftplugin/rust.vim +++ b/src/etc/vim/ftplugin/rust.vim @@ -31,6 +31,12 @@ setlocal formatoptions-=t formatoptions+=croqnl " j was only added in 7.3.541, so stop complaints about its nonexistence silent! setlocal formatoptions+=j +" smartindent will be overridden by indentexpr if filetype indent is on, but +" otherwise it's better than nothing. +setlocal smartindent nocindent + +setlocal tabstop=4 shiftwidth=4 expandtab + " This includeexpr isn't perfect, but it's a good start setlocal includeexpr=substitute(v:fname,'::','/','g') |