# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1424461554 28800
# Node ID 44c9d65cfa74cf2aba53aa55858286cb2b0f3671
# Parent  a29080fb35d934f3410c0aa127a0fb39f0a0efd8
Readjust some Vim config stuff around folding.
Don't remove trailing space in C++ files because other people don't.

diff -r a29080fb35d9 -r 44c9d65cfa74 vim/vimrc
--- a/vim/vimrc	Fri Feb 20 11:44:04 2015 -0800
+++ b/vim/vimrc	Fri Feb 20 11:45:54 2015 -0800
@@ -169,9 +169,6 @@
 " How to show invisible characters
 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:.
 
-" Folds are defined by markers in the text.
-set foldmethod=marker
-
 " Nice auto-complete menu.
 set completeopt=longest,menuone,preview
 
@@ -350,7 +347,7 @@
 
 augroup VimRCFileType_c
     au!
-    autocmd FileType c,c++ setlocal foldmethod=marker foldmarker={,}
+    autocmd FileType c,c++,cpp setlocal foldmethod=syntax
 augroup END
 
 augroup VimRCFileType_css
@@ -370,7 +367,7 @@
 
 augroup VimRCTrailingWhitespaces
     au!
-    autocmd FileType c,cpp,java,php,ruby,python,js,css,less autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
+    autocmd FileType php,ruby,python,js,css,less autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
 augroup END       
 
 " }}}
@@ -491,8 +488,8 @@
 
 " Folding {{{
 
-" Always start with all folds closed.
-set foldlevelstart=0
+" Folds are defined by markers in the text.
+set foldmethod=marker
 
 " Toggle folds with <space>.
 nnoremap <space> za