# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1331054022 18000
# Node ID 5111987c92352ef3a4529bf057539dfb3f1163c0
# Parent  6d600c293c966127112fc766d7de50a87097e4c3
more.

diff -r 6d600c293c96 -r 5111987c9235 .gitconfig
--- a/.gitconfig	Mon Mar 05 11:01:06 2012 -0500
+++ b/.gitconfig	Tue Mar 06 12:13:42 2012 -0500
@@ -10,7 +10,7 @@
 [alias]
     l   = log -16 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
     ll  = log     --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
-    gl  = log -16 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
+    gl  = log -10 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
     gll = log     --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
 
     pull = pull --ff-only
diff -r 6d600c293c96 -r 5111987c9235 vim/.vimrc
--- a/vim/.vimrc	Mon Mar 05 11:01:06 2012 -0500
+++ b/vim/.vimrc	Tue Mar 06 12:13:42 2012 -0500
@@ -39,7 +39,6 @@
 set splitbelow
 set splitright
 set fillchars=diff:⣿,vert:│
-set notimeout
 set autowrite
 set shiftround
 set autoread
@@ -789,9 +788,6 @@
 " Diffoff
 nnoremap <leader>D :diffoff!<cr>
 
-" Yankring
-nnoremap <silent> <F6> :YRShow<cr>
-
 " Formatting, TextMate-style
 nnoremap Q gqip
 vnoremap Q gq
@@ -862,7 +858,7 @@
 vnoremap - =
 
 " Toggle paste
-set pastetoggle=<F8>
+set pastetoggle=<F6>
 
 " Quickreturn
 inoremap <c-cr> <esc>A<cr>
@@ -1079,8 +1075,7 @@
 " Powerline {{{
 
 let g:Powerline_symbols = 'fancy'
-" let g:Powerline_cache_enabled = 0
-" let g:Powerline_theme = 'derp'
+let g:Powerline_cache_enabled = 1
 " let g:Powerline_colorscheme = 'badwolf'
 
 " }}}
@@ -1091,6 +1086,7 @@
 let g:pydoc = 'pydoc'
 let g:pymode_syntax = 1
 let g:pymode_syntax_all = 0
+let g:pymode_syntax_builtin_objs = 1
 let g:pymode_syntax_print_as_function = 0
 let g:pymode_syntax_space_errors = 0
 let g:pymode_run = 0
@@ -1690,6 +1686,16 @@
     end
 else
     " Console Vim
+    let &t_SI = "\<Esc>]50;CursorShape=1\x7"
+    let &t_EI = "\<Esc>]50;CursorShape=0\x7"
+
+    if exists('$TMUX')
+        let &t_SI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=1\x7\<Esc>\\"
+        let &t_EI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=0\x7\<Esc>\\"
+    else
+        let &t_SI = "\<Esc>]50;CursorShape=1\x7"
+        let &t_EI = "\<Esc>]50;CursorShape=0\x7"
+    endif
 endif
 
 " }}}