# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1311599681 14400
# Node ID 73e852660d631a8c2335b71a7938ccb44cc77bcf
# Parent  70b52dd375415122bf2196237e43e68c3384daa0# Parent  50df9ce82ada4927da10dc66f241b1f0bc0f4b25
Merge.

diff -r 70b52dd37541 -r 73e852660d63 vim/.vimrc
--- a/vim/.vimrc	Mon Jul 25 09:14:14 2011 -0400
+++ b/vim/.vimrc	Mon Jul 25 09:14:41 2011 -0400
@@ -175,24 +175,11 @@
 
 " Directional Keys {{{
 
-" Why stretch?
-noremap h ;
-noremap j h
-noremap k gj
-noremap l gk
-noremap ; l
-
 " Easy buffer navigation
-" Note: For this section to make any sense you need to remap Ctrl-; to Ctrl-g at
-"       the KEYBOARD level.  The reason is that for some reason the OS X doesn't
-"       recognize the Ctrl+; combination as something special, so it just passes it
-"       to Vim as a semicolon.
-"
-"       Yeah, it's dumb.
-noremap <C-j>  <C-w>h
-noremap <C-k>  <C-w>j
-noremap <C-l>  <C-w>k
-noremap <C-g>  <C-w>l
+noremap <C-h>  <C-w>h
+noremap <C-j>  <C-w>j
+noremap <C-k>  <C-w>k
+noremap <C-l>  <C-w>l
 noremap <leader>g <C-w>v
 
 " }}}
@@ -485,7 +472,7 @@
 inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
 
 " Faster Esc
-inoremap jk <ESC>
+inoremap <c-t> <ESC>
 
 " Cmdheight switching
 nnoremap <leader>1 :set cmdheight=1<cr>