From a77ead8fd460ae9a1d807f4426366d7928610e21 Mon Sep 17 00:00:00 2001
From: darkelfe <jul.rosset@gmail.com>
Date: Tue, 5 Nov 2013 19:42:49 +0100
Subject: [PATCH] =?UTF-8?q?[vim]=20Am=C3=A9lioration=20fonction=20fold?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vim/bundle/html5.vim   | 2 +-
 vim/bundle/syntastic   | 2 +-
 vim/bundle/tagbar      | 2 +-
 vim/bundle/vim-airline | 2 +-
 vim/vimrc              | 8 ++++++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/vim/bundle/html5.vim b/vim/bundle/html5.vim
index 929d57f..d4161cd 160000
--- a/vim/bundle/html5.vim
+++ b/vim/bundle/html5.vim
@@ -1 +1 @@
-Subproject commit 929d57fd1ec18fb68d0fa5d7b4ad9073cc0802a3
+Subproject commit d4161cdc685c22d2f419ccf3814b2406ddeb4b0a
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
index c035ac2..2c1c0d0 160000
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit c035ac24269b999a4caebb5bb7b318ee96614129
+Subproject commit 2c1c0d0eeb7d36d8cbea22bd63144a104846047a
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar
index fd79a17..b60d08c 160000
--- a/vim/bundle/tagbar
+++ b/vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit fd79a1718902f3eee78a40547d9a792b0e54927f
+Subproject commit b60d08c468337f65bad2f1a041779b05e64d6bf8
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
index 592cc41..3c9f8bb 160000
--- a/vim/bundle/vim-airline
+++ b/vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit 592cc412cfe7df63120b0b8afc9dd205f37ae681
+Subproject commit 3c9f8bb979a0bc451811c33a73c26df3ca3ea58e
diff --git a/vim/vimrc b/vim/vimrc
index 4a5c2a7..ba909fa 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -17,6 +17,7 @@ set noexpandtab				" Utilise le caractère tabulation, pas des espaces
 set nostartofline			" Conserve le caractère sur la même colonne quand on change de ligne
 set autoindent				" Indentation automatique
 set smartindent				" Idem
+set paste				" Pas d'insertion d'indentation lors du copier-coller
 
 set showcmd				" Montre la commande en cours
 set ignorecase				" Pas de casse pour les recherches
@@ -165,11 +166,14 @@ set statusline=%f%m%r%h%w\ \ \ \ \ [%{&fileencoding}]\ \ \ \ [%{&fileformat}]\ \
 "=====================================================================
 function! MyFoldFunction()
 	let line = getline(v:foldstart)
+	
 	"Cleanup unwanted things in first line
-	let sub = substitute(line, '/\*\|\*/\|^\s+', '', 'g')
+	let sub_space = substitute(line, '/\*\|\*/\|{', '', 'g')
+	let sub = substitute(sub_space, '\(^\s*\)\@<=\s', '-', 'g')
+
 	"Calculate lines in folded text
 	let lines = v:foldend - v:foldstart + 1
-	return v:folddashes.sub.' {...'.lines.' lignes...}'
+	return sub.' {...'.lines.' lignes...}'
 endfunction
 
 set foldtext=MyFoldFunction()