--- a/vim/.vimrc Tue Feb 22 12:55:21 2011 -0500
+++ b/vim/.vimrc Fri Feb 25 10:45:30 2011 -0500
@@ -40,6 +40,7 @@
set listchars=tab:▸\ ,eol:¬
set shell=/bin/bash
set lazyredraw
+set wildignore+=*.pyc,.hg
" Save when losing focus
au FocusLost * :wa
@@ -292,13 +293,16 @@
" Faster Esc
inoremap jk <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>
+" Better Completion
+set completeopt=longest,menuone
+inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+inoremap <expr> <C-p> pumvisible() ? '<C-n>' : '<C-n><C-r>=pumvisible() ? "\<lt>up>" : ""<CR>'
+inoremap <expr> <C-n> pumvisible() ? '<C-n>' : '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
+
+
" Make selecting inside an HTML tag less dumb
nnoremap Vit vitVkoj
nnoremap Vat vatV
@@ -366,6 +370,9 @@
let g:syntastic_enable_signs=1
let g:syntastic_disabled_filetypes = ['html', 'python']
" }}}
+" Command-T {{{
+let g:CommandTMaxHeight = 20
+" }}}
" }}}
" Synstack -------------------------------------------------------------------- {{{--- a/vim/castrate.py Tue Feb 22 12:55:21 2011 -0500
+++ b/vim/castrate.py Fri Feb 25 10:45:30 2011 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Original source: http://forrst.com/posts/An_unball_script_for_vimball_plugins-CHM
import os, sys