Skip to content
Browse files

Merge branch 'test-vimpowerline'

  • Loading branch information...
2 parents 7807435 + b258a7c commit 37f2c642a320120fff6bbc6f58d9bb9ddca7d3a2 @phil303 committed May 6, 2012
Showing with 12 additions and 8 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 vim/bundle/powerline
  3. +0 −1 vim/bundle/smartusline
  4. +8 −7 vimrc
View
3 .gitmodules
@@ -65,3 +65,6 @@
[submodule "vim/bundle/ctrlp"]
path = vim/bundle/ctrlp
url = git://github.com/kien/ctrlp.vim.git
+[submodule "vim/bundle/powerline"]
+ path = vim/bundle/powerline
+ url = git://github.com/Lokaltog/vim-powerline.git
1 vim/bundle/powerline
@@ -0,0 +1 @@
+Subproject commit 65e54dde89c73cae4cf089a83f5c26d605dda594
1 vim/bundle/smartusline
@@ -1 +0,0 @@
-Subproject commit a1c1f56b6e1579bfda1a4abb60a965833db3899b
View
15 vimrc
@@ -80,13 +80,14 @@ else
endif
" Status line {{{2
-set statusline=%F%m%r%h%w
-set statusline+=\ %{exists('g:loaded_fugitive')?fugitive#statusline():''}
-set statusline+=\ %#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-set statusline+=%=(%{&ff}/%Y)
-set statusline+=\ (line\ %l\/%L,\ col\ %c)
+" Turned off for Powerline
+"set statusline=%F%m%r%h%w
+"set statusline+=\ %{exists('g:loaded_fugitive')?fugitive#statusline():''}
+"set statusline+=\ %#warningmsg#
+"set statusline+=%{SyntasticStatuslineFlag()}
+"set statusline+=%*
+"set statusline+=%=(%{&ff}/%Y)
+"set statusline+=\ (line\ %l\/%L,\ col\ %c)
" }}}2
" Set colorscheme {{{2

0 comments on commit 37f2c64

Please sign in to comment.
Something went wrong with that request. Please try again.