vim updates

diff --git a/vim/filetype.vim b/vim/filetype.vim
index 2042a4f..b37fe6c 100644 (file)
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -15,6 +15,7 @@ augroup filetypedetect
   au BufRead,BufNewFile *.adoc             setf asciidoc
 
   au BufRead,BufNewFile massif.*.txt       setf massif
+  au BufRead,BufNewFile peer*.log          setf ubiquity-log
 
   " HTML (.shtml and .stm for server side)
   au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call s:FThtml()

diff --git a/vimrc b/vimrc
index c2992b3..636b68a 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -34,7 +34,7 @@ set report=0                    " show a report when N lines were changed.
 
 set laststatus=2                " show status line?  Yes, always!
 set noruler                       " show cursor position?  Yep!
-set statusline=[\ %f%m\ %r%y\ %=\ hex:%B\ \ %l,%c%V\ \ %P\ ]
+set statusline=[\ %f%m\ %r%y\ %{fugitive#statusline()}\ %=\ hex:%B\ \ %l,%c%V\ \ %P\ ]
 
 set shiftwidth=4                " Number of spaces to use for each insertion of
                                 " (auto)indent.