From 3bc267184e541c8f7d4516dcf1a444e81f786cc8 Mon Sep 17 00:00:00 2001
From: Christophe Buffenoir <christophe@buffenoir.org>
Date: Fri, 11 Oct 2013 17:34:19 +0200
Subject: [PATCH] Fix shortcut gitpull. Fix config file for jedi.

---
 common/.vimrc | 4 +++-
 common/.zshrc | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/.vimrc b/common/.vimrc
index bed0c38..6c913f5 100644
--- a/common/.vimrc
+++ b/common/.vimrc
@@ -163,6 +163,8 @@ autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
 autocmd FileType css set omnifunc=csscomplete#CompleteCSS
 autocmd FileType php set omnifunc=phpcomplete#CompletePHP
 
+autocmd BufRead,BufWinEnter,BufWrite * SyntasticCheck
+
 
 
 """"""""""""""""""""""""""""""""""""""""""""""""""
@@ -226,4 +228,4 @@ if ! has('gui_running')
     augroup END
 endif
 
-let g:jedi#autocompletion_command = "<C-f>"
+let g:jedi#completions_command = "<C-f>"
diff --git a/common/.zshrc b/common/.zshrc
index 9e1dc33..b2cc97c 100644
--- a/common/.zshrc
+++ b/common/.zshrc
@@ -108,6 +108,7 @@ alias gittree='git log --graph'
 alias gitlstags='git describe --tags'
 alias gittag='git tag -a'
 alias gitw='git instaweb --httpd=webrick'
+alias gitpull='git pull --stat --progress'
 
 gitgrephistory(){
 if [ $# = 1 ] ; then