# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1326468212 18000
# Node ID 824dfcda2807ead9c88e6f1da8bb4eab96cf4407
# Parent  2e71d84847c976b3dae02d11469c10e19ceb9a87
From screencast.

diff -r 2e71d84847c9 -r 824dfcda2807 .hgsubstate
--- a/.hgsubstate	Thu Jan 12 17:29:36 2012 -0500
+++ b/.hgsubstate	Fri Jan 13 10:23:32 2012 -0500
@@ -15,7 +15,7 @@
 4df0cdc009e590c1d6ec32a2a3c12ff8deeb6f25 vim/bundle/powerline
 67033ee4b9ee6d4916752da5e360b65ddf2fb525 vim/bundle/python-mode
 fa3563dda862c1dc46ddac32d8a9f939e9077379 vim/bundle/rainbow-parentheses
-fbc884de41302bb08b93b9d4d9c6921248a31a4c vim/bundle/slimv
+ab6c6f093b5937d631390bb69678217dc10e8018 vim/bundle/slimv
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 80ec6539e4139a2e0281a0f1e36d5038d55ad980 vim/bundle/supertab
diff -r 2e71d84847c9 -r 824dfcda2807 vim/.vimrc
--- a/vim/.vimrc	Thu Jan 12 17:29:36 2012 -0500
+++ b/vim/.vimrc	Fri Jan 13 10:23:32 2012 -0500
@@ -117,7 +117,7 @@
 set backupdir=~/.vim/tmp/backup// " backups
 set directory=~/.vim/tmp/swap//   " swap files
 set backup                        " enable backups
-set noswapfile                    " It's 2011, Vim.
+set noswapfile                    " It's 2012, Vim.
 
 " }}}
 " Leader {{{
@@ -739,9 +739,6 @@
 " The normal use of S is covered by cc, so don't worry about shadowing it.
 nnoremap S i<cr><esc><right>
 
-" Preview Files
-nnoremap <leader>p :w<cr>:Hammer<cr>
-
 " HTML tag closing
 inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
 
@@ -801,42 +798,6 @@
 " Toggle paste
 set pastetoggle=<F8>
 
-" Split/Join {{{
-"
-" Basically this splits the current line into two new ones at the cursor position,
-" then joins the second one with whatever comes next.
-"
-" Example:                      Cursor Here
-"                                    |
-"                                    V
-" foo = ('hello', 'world', 'a', 'b', 'c',
-"        'd', 'e')
-"
-"            becomes
-"
-" foo = ('hello', 'world', 'a', 'b',
-"        'c', 'd', 'e')
-"
-" Especially useful for adding items in the middle of long lists/tuples in Python
-" while maintaining a sane text width.
-nnoremap K h/[^ ]<cr>"zd$jyyP^v$h"zpJk:s/\v +$//<cr>:noh<cr>j^
-" }}}
-
-" Handle URL {{{
-" Stolen from https://github.com/askedrelic/homedir/blob/master/.vimrc
-" OSX only: Open a web-browser with the URL in the current line
-function! HandleURI()
-    let s:uri = matchstr(getline("."), '[a-z]*:\/\/[^ >,;]*')
-    echo s:uri
-    if s:uri != ""
-        exec "!open \"" . s:uri . "\""
-    else
-        echo "No URI found in line."
-    endif
-endfunction
-map <leader>u :call HandleURI()<CR>
-" }}}
-
 " Quickreturn
 inoremap <c-cr> <esc>A<cr>
 inoremap <s-cr> <esc>A:<cr>
@@ -892,7 +853,7 @@
 nnoremap A<esc> <nop>
 
 " }}}
-" CTags  ------------------------------------------------------------------ {{{
+" CTags ------------------------------------------------------------------- {{{
 
 " For some reason ctags refuses to ignore Python variables, so I'll just hack
 " the tags file with sed and strip them out myself.
@@ -1230,14 +1191,6 @@
 endfunction
 
 " }}}
-" CamelCase {{{
-
-" onoremap c :<c-u>call search('[A-Z]')<cr>
-" xnoremap c :<c-u>call search('[A-Z]')<cr>
-" onoremap C :<c-u>call search('[A-Z]', 'b')<cr>
-" xnoremap C :<c-u>call search('[A-Z]', 'b')<cr>
-
-" }}}
 
 " }}}
 " Ack motions ------------------------------------------------------------- {{{