X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vimrc;h=866efcbf83c6fb72d7c927b75e36edbdd15b143c;hb=fc60a1c2639da396a8cf80ab636e2e413bc9d27c;hp=32995bd72e17296251937c8f05bdfefd6c91dc5e;hpb=22d2f52e5262d5ef553f6a0dcffd7a4d1281e5c0;p=cmccabe-etc

diff --git a/.vimrc b/.vimrc
index 32995bd..866efcb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -68,13 +68,16 @@ map ,," :s/^\"//<CR>:nohlsearch<CR>
 " whitespace stripper
 map ,w :s/[\t ][\t ]*$//<CR>
 
+" More ergonomic key binding for omni-complete
+inoremap <C-k><C-k> <C-x><C-o>
+
 "*************** shortcuts **************
 map \b :ConqueTermSplit /bin/bash<CR>
 map \B :ConqueTermVSplit /bin/bash<CR>
 "command Bash execute ":ConqueTerm bash"
 
 "*************** grep plugin ***************
-:let Grep_Default_Filelist = '*.c *.cpp *.cc *.hpp *.rb *.h *.t *.py *.rst *.go *.java *.S'
+:let Grep_Default_Filelist = '*.c *.cpp *.cc *.hpp *.rb *.h *.t *.py *.rst *.go *.java *.S *.scala'
 :let Grep_Skip_Files = 'core.* *.svn *~ *.swp *.swo *.bak cscope.out cscope.files'
 
 "*************** pre-filled registers ******************