From b6bd4eafe7c01514ccc15dc22b3d902b7f1dc194 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Wed, 21 Nov 2012 14:13:00 +0100 Subject: [PATCH] vim updates --- vim/filetype.vim | 1 + vimrc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vim/filetype.vim b/vim/filetype.vim index 2042a4f..b37fe6c 100644 --- 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 --- 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. -- 2.20.1