# HG changeset patch # User Steve Losh # Date 1383145090 14400 # Node ID 6908dae7c07b16bad71796a38613393973ebe7cd # Parent a9942801b4db6154a5ce0ccae604da6821051cac moar diff -r a9942801b4db -r 6908dae7c07b gitconfig --- a/gitconfig Fri Oct 25 11:03:58 2013 -0400 +++ b/gitconfig Wed Oct 30 10:58:10 2013 -0400 @@ -49,6 +49,7 @@ delete-local-branch = branch -D delete-remote-branch = push origin --delete delete-local-reference-to-remote-branch = branch -rd + delete-branch = "!sh -c 'git delete-local-branch $1; git delete-local-reference-to-remote-branch origin/$1; git delete-local-reference-to-remote-branch upstream/$1' -" currentbranch = rev-parse --abbrev-ref HEAD diff -r a9942801b4db -r 6908dae7c07b vim/vimrc --- a/vim/vimrc Fri Oct 25 11:03:58 2013 -0400 +++ b/vim/vimrc Wed Oct 30 10:58:10 2013 -0400 @@ -124,6 +124,7 @@ augroup trailing au! au InsertEnter * :set listchars-=trail:⌴ + au InsertLeave * :set listchars+=trail:⌴ augroup END " }}} @@ -1943,7 +1944,7 @@ execute '2match IndentGuides /\%(\_^\s*\)\@<=\%(\%'.(0*&sw+1).'v\|\%'.(1*&sw+1).'v\|\%'.(2*&sw+1).'v\|\%'.(3*&sw+1).'v\|\%'.(4*&sw+1).'v\|\%'.(5*&sw+1).'v\|\%'.(6*&sw+1).'v\|\%'.(7*&sw+1).'v\)\s/' endif endfunction " }}} -hi def IndentGuides guibg=#303030 +hi def IndentGuides guibg=#303030 ctermbg=234 nnoremap I :call IndentGuides() " }}}