0447325b2bc3

--- a/.hgrc	Mon Apr 02 18:52:43 2012 -0400
+++ b/.hgrc	Tue Apr 03 14:43:20 2012 -0400
@@ -264,6 +264,5 @@
 #     M lol.py
 sub = !grep = "`$HG root`/.hgsub" | cut -d' ' -f1 | grep "$1" | tr -d '\n ' | xargs -0 -I SUB $HG -R SUB $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20
 
-
 # Local settings
 %include ~/.hgrc_local

--- a/.hgsub	Mon Apr 02 18:52:43 2012 -0400
+++ b/.hgsub	Tue Apr 03 14:43:20 2012 -0400
@@ -2,6 +2,7 @@
 
 vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
 vim/bundle/gundo = [hg]https://bitbucket.org/sjl/gundo.vim/
+vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/
 vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
 vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
 vim/bundle/vim-commentary = [git]git://github.com/tpope/vim-commentary.git

--- a/.hgsubstate	Mon Apr 02 18:52:43 2012 -0400
+++ b/.hgsubstate	Tue Apr 03 14:43:20 2012 -0400
@@ -3,6 +3,7 @@
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
 7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf
+521f6d200d6feee5de8e86c57468f06335c6811d vim/bundle/clam
 c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
 4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive

--- a/vim/.vimrc	Mon Apr 02 18:52:43 2012 -0400
+++ b/vim/.vimrc	Tue Apr 03 14:43:20 2012 -0400
@@ -900,6 +900,11 @@
 let g:badwolf_html_link_underline = 0
 
 " }}}
+" Clam {{{
+
+nnoremap ! :Clam<space>
+
+" }}}
 " Commentary {{{
 
 nmap <leader>c <Plug>CommentaryLine
@@ -1549,26 +1554,6 @@
 endfunction
 
 " }}}
-" Shell {{{
-
-function! s:ExecuteInShell(command) " {{{
-    let command = join(map(split(a:command), 'expand(v:val)'))
-    let winnr = bufwinnr('^' . command . '$')
-    silent! execute  winnr < 0 ? 'botright vnew ' . fnameescape(command) : winnr . 'wincmd w'
-    setlocal buftype=nowrite bufhidden=wipe nobuflisted noswapfile nowrap nonumber
-    echo 'Execute ' . command . '...'
-    silent! execute 'silent %!'. command
-    silent! redraw
-    silent! execute 'au BufUnload <buffer> execute bufwinnr(' . bufnr('#') . ') . ''wincmd w'''
-    silent! execute 'nnoremap <silent> <buffer> <LocalLeader>r :call <SID>ExecuteInShell(''' . command . ''')<CR>:AnsiEsc<CR>'
-    silent! execute 'nnoremap <silent> <buffer> q :q<CR>'
-    silent! execute 'AnsiEsc'
-    echo 'Shell command ' . command . ' executed.'
-endfunction " }}}
-command! -complete=shellcmd -nargs=+ Shell call s:ExecuteInShell(<q-args>)
-nnoremap <leader>! :Shell<space>
-
-" }}}
 " Indent Guides {{{
 
 let g:indentguides_state = 0