Fix merge

lermit · Oct 17, 2014 · 26c8bf8 · 26c8bf8
2 parents 3feef7c + c01010e
commit 26c8bf8
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 1,144 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,18 +16,24 @@
 [submodule "bundle/surround"]
 	path = bundle/surround
 	url = https://github.com/vim-scripts/surround.vim.git
-[submodule "bundle/ShowFunc"]
-	path = bundle/ShowFunc
-	url = https://github.com/vim-scripts/ShowFunc.vim.git
-[submodule "bundle/zencoding"]
-	path = bundle/zencoding
-	url = https://github.com/mattn/zencoding-vim.git
-[submodule "bundle/XDebug-DBGp-client-for-PHP"]
-	path = bundle/XDebug-DBGp-client-for-PHP
-	url = https://github.com/vim-scripts/XDebug-DBGp-client-for-PHP.git
-[submodule "bundle/vim-javascript"]
-	path = bundle/vim-javascript
-	url = https://github.com/pangloss/vim-javascript.git
-[submodule "bundle/vim-javascript-syntax"]
-	path = bundle/vim-javascript-syntax
-	url = https://github.com/jelera/vim-javascript-syntax.git
+[submodule "bundle/emmet-vim"]
+	path = bundle/emmet-vim
+	url = http://github.com/mattn/emmet-vim.git
+[submodule "bundle/puppet-vim"]
+	path = bundle/puppet-vim
+	url = https://github.com/ajf/puppet-vim.git
+[submodule "bundle/tlib_vim"]
+	path = bundle/tlib_vim
+	url = https://github.com/tomtom/tlib_vim.git
+[submodule "bundle/vim-addon-mw-utils"]
+	path = bundle/vim-addon-mw-utils
+	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "bundle/vim-sensible"]
+	path = bundle/vim-sensible
+	url = https://github.com/tpope/vim-sensible.git
+[submodule "bundle/vim-snipmate"]
+	path = bundle/vim-snipmate
+	url = https://github.com/garbas/vim-snipmate.git
+[submodule "bundle/vim-lint"]
+	path = bundle/vim-lint
+	url = https://github.com/dbakker/vim-lint.git
diff --git a/bundle/.vundle/script-names.vim-scripts.org.json b/bundle/.vundle/script-names.vim-scripts.org.json
diff --git a/bundle/ShowFunc b/bundle/ShowFunc
diff --git a/bundle/Vundle.vim b/bundle/Vundle.vim
diff --git a/bundle/XDebug-DBGp-client-for-PHP b/bundle/XDebug-DBGp-client-for-PHP
diff --git a/bundle/emmet-vim b/bundle/emmet-vim
diff --git a/bundle/puppet-vim b/bundle/puppet-vim
diff --git a/bundle/syntastic b/bundle/syntastic
diff --git a/bundle/tlib_vim b/bundle/tlib_vim
diff --git a/bundle/vim-addon-mw-utils b/bundle/vim-addon-mw-utils
diff --git a/bundle/vim-airline b/bundle/vim-airline
diff --git a/bundle/vim-lint b/bundle/vim-lint
diff --git a/bundle/vim-sensible b/bundle/vim-sensible
diff --git a/bundle/vim-snipmate b/bundle/vim-snipmate
diff --git a/bundle/zencoding b/bundle/zencoding
diff --git a/plugin/debugger.py b/plugin/debugger.py
diff --git a/plugin/debugger.vim b/plugin/debugger.vim
diff --git a/spell/fr.utf-8.spl b/spell/fr.utf-8.spl
diff --git a/vimrc b/vimrc
@@ -1,8 +1,12 @@
 " Remove ALL autocommands for the current group
 :autocmd!
 
+
 " Enable pathogen
-call pathogen#runtime_append_all_bundles()
+execute pathogen#infect()
+"call pathogen#runtime_append_all_bundles()
+
+runtime macros/matchit.vim
 
 set encoding=utf-8 " Encodage par defaut
 set nocompatible " Pas de compatibilité vi
@@ -48,6 +52,28 @@ colorscheme default
 syntax on " Coloration syntaxique
 
 
+" Status line
+set statusline=%t       "tail of the filename
+set statusline+=[%{strlen(&fenc)?&fenc:'none'}, "file encoding
+set statusline+=%{&ff}] "file format
+set statusline+=%h      "help file flag
+set statusline+=%m      "modified flag
+set statusline+=%r      "read only flag
+set statusline+=%y      "filetype
+set statusline+=%=      "left/right separator
+set statusline+=%c,     "cursor column
+set statusline+=%l/%L   "cursor line/total lines
+set statusline+=\ %P    "percent through file
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+" syntastic
+let g:syntastic_enable_signs=1
+"let g:syntastic_quiet_messages = {'level': 'warnings'}
+let g:syntastic_auto_loc_list=1
+
+
 " Lier le plugin closetag au fichier html, xml, xsl et php
 au Filetype html,xml,xsl,php source ~/.vim/plugin/closetag.vim
 "filetype on
@@ -67,6 +93,7 @@ autocmd BufRead * silent! %s/[\r \t]\+$//
 
 filetype on
 filetype plugin on
+filetype plugin indent on
 
 " Activation de la correction grammaticale
 let g:languagetool_jar=$HOME .'/software/languagetool/1.5/LanguageTool.jar'
@@ -76,3 +103,10 @@ set nospell
 
 " Save a file you edited in vim without the needed permissions
 command W :execute ':silent w !sudo tee % > /dev/null' | :edit!
+
+" Vundle
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'gmarik/Vundle.vim'
+