# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1404704144 14400
# Node ID 6fb9403f0c8002037adb08465a1a09aefed085a4
# Parent  2d8b8117e32d5cebdeacdd0e55b1ec98f2c2c8c4# Parent  99cc7b56719587160592e6f20bbe6551bf7ffbd3
Merge from default

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -108,19 +108,26 @@ else
 endif
 
 " F-n keys call out to normal mode from insert mode
-imap <F1> <C-O><F1>
-imap <F2> <C-O><F2>
+" only :noh seems smart to do.
+"imap <F1> <C-O><F1>
+"imap <F2> <C-O><F2>
 "imap <F3> <C-O><F3>
 imap <F4> <C-O><F4>
-imap <F5> <C-O><F5>
+"imap <F5> <C-O><F5>
 "imap <F6> <C-O><F6>
 "imap <F7> <C-O><F7>
-imap <F8> <C-O><F8>
+"imap <F8> <C-O><F8>
 
 " chdir to the directory of the open buffer
 map <leader>cd :cd %:p:h<cr>:pwd<cr>
 
 map <leader>pp :setlocal paste!<cr>
+
+" faster window nav
+nmap <C-h> <C-w>h
+nmap <C-j> <C-w>j
+nmap <C-k> <C-w>k
+nmap <C-l> <C-w>l
 "}}}