Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	vimrc

2 files changed, 26 insertions, 25 deletions

diff --git a/vim/after/ftplugin/vim/folding.vim b/vim/after/ftplugin/vim/folding.vim
index 7f8f28d..1454cbe 100644
--- a/vim/after/ftplugin/vim/folding.vim
+++ b/vim/after/ftplugin/vim/folding.vim
@@ -1,25 +1,25 @@
-" function! VimFolds()
-"     let thisline = getline(v:lnum)
-"     if match(thisline,'^""  ') >= 0
-"         return ">1"
-"     elseif match(thisline,'^"  ') >=0
-"         return ">1"
-"     else
-"         return "="
-"     endif
-" endfunction
-"
-" function! VimFoldText()
-"     let startline = getline(v:foldstart)
-"     if match(startline,'^""  ') >= 0
-"         let title = substitute(startline,'^""  \(.*\)$','\1',"")
-"         return '# ' . title
-"     elseif match(startline,'^"  ') >=0
-"         let title = substitute(startline,'^"  \(.*\)$','\1',"")
-"         return '    ## ' .title
-"     endif
-" endfunction
-"
-" setlocal foldmethod=expr
-" setlocal foldexpr=VimFolds()
-" setlocal foldtext=VimFoldText()
+function! VimFolds()
+    let thisline = getline(v:lnum)
+    if match(thisline,'^"" ') >= 0
+        return ">1"
+    elseif match(thisline,'^" ') >=0
+        return ">1"
+    else
+        return "="
+    endif
+endfunction
+
+function! VimFoldText()
+    let startline = getline(v:foldstart)
+    if match(startline,'^"" ') >= 0
+        let title = substitute(startline,'^"" \(.*\)$','\1',"")
+        return '# ' . title
+    elseif match(startline,'^" ') >=0
+        let title = substitute(startline,'^" \(.*\)$','\1',"")
+        return '    ## ' .title
+    endif
+endfunction
+
+setlocal foldmethod=expr
+setlocal foldexpr=VimFolds()
+setlocal foldtext=VimFoldText()
diff --git a/vim/vim b/vim/vim
new file mode 120000
index 0000000..7c09735
--- /dev/null
+++ b/vim/vim
@@ -0,0 +1 @@
+/home/urbain/dotfiles/vim
\ No newline at end of file