# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1292258554 18000
# Node ID 9e7096459f94b4bc23e0816140863808b1d62532
# Parent  f0d5c7c0f70070ddb9def196da8066ebe14e008e
vim: fix CCM and add esc-autocomplete

diff -r f0d5c7c0f700 -r 9e7096459f94 vim/.vimrc
--- a/vim/.vimrc	Fri Dec 10 09:55:26 2010 -0500
+++ b/vim/.vimrc	Mon Dec 13 11:42:34 2010 -0500
@@ -190,9 +190,12 @@
 inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
 
 " Faster Esc
-inoremap <Esc> <nop>
 inoremap jj <ESC>
 
+" TextMate-Style Autocomplete
+inoremap <ESC> <C-P>
+inoremap <S-ESC> <C-N>
+
 " Scratch
 nmap <leader><tab> :Sscratch<cr><C-W>x<C-j>:resize 15<cr>
 
@@ -355,11 +358,11 @@
 endfunction
 
 " Camel Case Motion
-map <silent> \w <Plug>CamelCaseMotion_w
-map <silent> \b <Plug>CamelCaseMotion_b
+map <silent> ∑ <Plug>CamelCaseMotion_w
+map <silent> ∫ <Plug>CamelCaseMotion_b
 map <silent> \e <Plug>CamelCaseMotion_e
-omap <silent> i\w <Plug>CamelCaseMotion_iw
-xmap <silent> i\w <Plug>CamelCaseMotion_iw
+omap <silent> i∑ <Plug>CamelCaseMotion_iw
+xmap <silent> i∑ <Plug>CamelCaseMotion_iw
 
 if has('gui_running')
     set guifont=Menlo:h12