# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1331354505 28800
# Node ID 964afea39a30b6c9d3f033c3cae8b11a8f3bac6c
# Parent  b33a35c464946798d7ffadb3c8655c6a7bab2ff1# Parent  990968329a9bb28b0256c4172887a89827222343
Merged changes.

diff -r b33a35c46494 -r 964afea39a30 .hgsub
--- a/.hgsub	Fri Mar 09 20:41:30 2012 -0800
+++ b/.hgsub	Fri Mar 09 20:41:45 2012 -0800
@@ -1,6 +1,8 @@
+
+vim/bundle/gundo = https://bitbucket.org/sjl/gundo.vim
+vim/bundle/badwolf = https://bitbucket.org/sjl/badwolf
 
 vim/bundle/colorschemes = [git]https://github.com/flazz/vim-colorschemes.git
-vim/bundle/gundo = https://bitbucket.org/sjl/gundo.vim
 vim/bundle/markdown = [git]https://github.com/tpope/vim-markdown.git
 vim/bundle/surround = [git]https://github.com/tpope/vim-surround.git
 vim/bundle/commentary = [git]git://github.com/tpope/vim-commentary.git
diff -r b33a35c46494 -r 964afea39a30 .hgsubstate
--- a/.hgsubstate	Fri Mar 09 20:41:30 2012 -0800
+++ b/.hgsubstate	Fri Mar 09 20:41:45 2012 -0800
@@ -1,5 +1,6 @@
 32afa497834da2a702f14ff1100acfea3cd19cdc lib/hg/hg-git
 ef52038b4459ddd8c78f13c2789c658bbc6cacbc lib/hg/onsub
+0000000000000000000000000000000000000000 vim/bundle/badwolf
 c51066bd048ca47e9b6d1385703a4d3462ea8c93 vim/bundle/colorschemes
 62b72580aba57cb5185bd077ac7a905c1c6893ea vim/bundle/commentary
 c72a689f7f4deb7e7ad9947143383ada000476ae vim/bundle/fugitive
diff -r b33a35c46494 -r 964afea39a30 vim/vimrc
--- a/vim/vimrc	Fri Mar 09 20:41:30 2012 -0800
+++ b/vim/vimrc	Fri Mar 09 20:41:45 2012 -0800
@@ -31,6 +31,7 @@
 " Disable some plugins.
 let g:pathogen_disabled = []
 call add(g:pathogen_disabled, 'vimroom')
+call add(g:pathogen_disabled, 'minibufexpl')
 
 " Load pathogen.
 call pathogen#infect()
@@ -69,9 +70,22 @@
 " Use confirmation dialog.
 set confirm
 
+" Don't use annoying sounds.
+set visualbell
+
 " Remember lots of commands.
 set history=1000
 
+" Try to reduce flickering.
+set lazyredraw
+
+" Show matching braces but not for too long.
+set showmatch
+set matchtime=2
+
+" Show soft-broken/wrapped lines with a prefix.
+set showbreak=→
+
 " Use incremental search, with highlighting,
 " case-insensitive unless we actually type some
 " mixed-case stuff.
@@ -90,6 +104,10 @@
 set showcmd
 set ruler
 
+" Make sure splitting windows is done in a way that makes sense.
+set splitbelow
+set splitright
+
 " Don't pollute the hard-drive with *~ files. Only
 " create them in hidden backup/temp directories while
 " we edit the file, and then get rid of it.
@@ -106,9 +124,6 @@
 " Always display the tab-page line.
 set showtabline=2
 
-" Show matching braces.
-set showmatch
-
 " Set the file-formats.
 set ffs=unix,mac,dos
 
@@ -163,13 +178,24 @@
 else
     set background=dark
 endif
-colorscheme solarized
+colorscheme badwolf
 
 " Enable file type detection.
 filetype indent plugin on
 
 " }}}
 
+" Auto-Commands {{{
+
+" Only show the highlighted cursor line in the current window.
+augroup CursorLine
+    au!
+    au WinLeave * set nocursorline
+    au WinEnter * set cursorline
+augroup END
+
+" }}}
+
 " Plugin Settings {{{
 
 " Navigate MiniBufExplorer with CTRL+Tab/CTRL+Shift+Tab.
@@ -188,6 +214,12 @@
 
 let mapleader=","
 
+" Visual line navigation
+noremap <up> g<up>
+noremap <down> g<down>
+noremap <home> g<home>
+noremap <end> g<end>
+
 " Edit & source the VIMRC.
 nnoremap <leader>ev :vsplit $MYVIMRC<cr>
 nnoremap <leader>sv :source $MYVIMRC<cr>