# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1333662853 14400
# Node ID fa7da5d82131e89ccf34afa2a14f70a445419487
# Parent  ce0c6a84897ab73e0844bc7ab46d2c843cae2b6a
Moar

diff -r ce0c6a84897a -r fa7da5d82131 .hgsubstate
--- a/.hgsubstate	Tue Apr 03 14:47:23 2012 -0400
+++ b/.hgsubstate	Thu Apr 05 17:54:13 2012 -0400
@@ -2,8 +2,8 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf
-fa37ec671fb5fe854e56c02616f9adcfd1003686 vim/bundle/clam
+513f0b205c699ffda0a45ed316c140298855d9bd vim/bundle/badwolf
+2b5144befdbb88a4606c62f891741d21656232b5 vim/bundle/clam
 c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
 4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive
diff -r ce0c6a84897a -r fa7da5d82131 bin/pb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/pb	Thu Apr 05 17:54:13 2012 -0400
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+curl -F 'sprunge=<-' http://paste.stevelosh.com | tr -d '\n' | pbcopy
diff -r ce0c6a84897a -r fa7da5d82131 bin/sprunge
--- a/bin/sprunge	Tue Apr 03 14:47:23 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-curl -F 'sprunge=<-' http://sprunge.us | tr -d '\n' | pbcopy
diff -r ce0c6a84897a -r fa7da5d82131 vim/.vimrc
--- a/vim/.vimrc	Tue Apr 03 14:47:23 2012 -0400
+++ b/vim/.vimrc	Thu Apr 05 17:54:13 2012 -0400
@@ -46,6 +46,7 @@
 set title
 set linebreak
 set dictionary=/usr/share/dict/words
+set spellfile=~/.vim/custom-dictionary.utf-8.add
 
 " Time out on key codes but not mappings.
 " Basically this makes terminal Vim work sanely.
@@ -56,6 +57,9 @@
 " Make Vim able to edit crontab files again.
 set backupskip=/tmp/*,/private/tmp/*"
 
+" Better Completion
+set completeopt=longest,menuone,preview
+
 " Save when losing focus
 au FocusLost * :silent! wall
 
@@ -231,8 +235,8 @@
 " Kill window
 nnoremap K :q<cr>
 
-" Redraw
-nnoremap <leader>rr :redraw!<cr>
+" The "unfuck my screen" mapping.
+nnoremap <leader>U :syntax sync fromstart<cr>:redraw!<cr>
 
 " System clipboard interaction
 " From https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim
@@ -264,11 +268,10 @@
 " vnoremap <leader>G :w !gist -p -t %:e \| pbcopy<cr>
 " vnoremap <leader>UG :w !gist -p \| pbcopy<cr>
 
-" Send visual selection to sprunge.us
-vnoremap <leader>G :w !curl -sF 'sprunge=<-' 'http://sprunge.us' \| tr -d '\n ' \| pbcopy<cr>
+" Send visual selection to paste.stevelosh.com
+vnoremap <leader>G :w !curl -sF 'sprunge=<-' 'http://paste.stevelosh.com' \| tr -d '\n ' \| pbcopy<cr>
 
 " Change case
-nnoremap U gUiw
 inoremap <C-u> <esc>gUiwea
 
 " Emacs bindings in command line mode
@@ -315,9 +318,6 @@
 " Great for pasting Python lines into REPLs.
 nnoremap vv ^vg_
 
-" Better Completion
-set completeopt=longest,menuone,preview
-
 " Sudo to write
 cnoremap w!! w !sudo tee % >/dev/null
 
@@ -340,7 +340,7 @@
 set pastetoggle=<F6>
 
 " Toggle [i]nvisible characters
-nnoremap <leader>i :set list!<cr>
+  nnoremap <leader>i :set list!<cr>
 
 " Drag Lines {{{
 
@@ -365,22 +365,23 @@
 " }}}
 " Insert Mode Completion {{{
 
-inoremap <c-l> <c-x><c-l>
+inoremap <c-l><c-l> <c-x><c-l>
 inoremap <c-f> <c-x><c-f>
 inoremap <c-]> <c-x><c-]>
 
 " }}}
 " Quick editing {{{
 
-nnoremap <leader>ev <C-w>v<C-w>j:e $MYVIMRC<cr>
-nnoremap <leader>es <C-w>v<C-w>j:e ~/.vim/snippets/<cr>
-nnoremap <leader>eo <C-w>v<C-w>j:e ~/Dropbox/Org<cr>4j
-nnoremap <leader>eh <C-w>v<C-w>j:e ~/.hgrc<cr>
-nnoremap <leader>ep <C-w>v<C-w>j:e ~/.pentadactylrc<cr>
-nnoremap <leader>em <C-w>v<C-w>j:e ~/.mutt/muttrc<cr>
-nnoremap <leader>ez <C-w>v<C-w>j:e ~/lib/dotfiles/zsh<cr>4j
-nnoremap <leader>ek <C-w>v<C-w>j:e ~/lib/dotfiles/keymando/keymandorc.rb<cr>
-nnoremap <leader>et <C-w>v<C-w>j:e ~/.tmux.conf<cr>
+nnoremap <leader>ev :vsplit $MYVIMRC<cr>
+nnoremap <leader>es :vsplit ~/.vim/snippets/<cr>
+nnoremap <leader>ed :vsplit ~/.vim/custom-dictionary.utf-8.add<cr>
+nnoremap <leader>eo :vsplit ~/Dropbox/Org<cr>4j
+nnoremap <leader>eh :vsplit ~/.hgrc<cr>
+nnoremap <leader>ep :vsplit ~/.pentadactylrc<cr>
+nnoremap <leader>em :vsplit ~/.mutt/muttrc<cr>
+nnoremap <leader>ez :vsplit ~/lib/dotfiles/zsh<cr>4j
+nnoremap <leader>ek :vsplit ~/lib/dotfiles/keymando/keymandorc.rb<cr>
+nnoremap <leader>et :vsplit ~/.tmux.conf<cr>
 
 " }}}
 
@@ -903,6 +904,7 @@
 " Clam {{{
 
 nnoremap ! :Clam<space>
+let g:clam_autoreturn = 1
 
 " }}}
 " Commentary {{{