From b99919de871984d1f8e0dc5244d168552bde0790 Mon Sep 17 00:00:00 2001
From: Barak Michener <barakmich@google.com>
Date: Wed, 14 Nov 2012 14:25:21 -0800
Subject: [PATCH] vimrc simplification

---
 .vimrc | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/.vimrc b/.vimrc
index 1ced1fb..2078ec8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -137,6 +137,14 @@ inoremap <C-a> <C-O>^
 inoremap <C-e> <C-O>$
 imap <C-c> <Esc>
 
+
+nmap <silent> <C-j> :FocusNextWindow<CR>
+nmap <silent> <C-k> :FocusPrevWindow<CR>
+nmap <silent> <C-m> :FocusMasterWindow<CR>
+nmap <silent> <C-Enter> :SwapWithMasterWindow<CR>
+nmap <silent> <C-Down> :SwapWithNextWindow<CR>
+nmap <silent> <C-Up> :SwapWithPrevWindow<CR>
+
 set laststatus=2
 set statusline=%t       "tail of the filename
 "set statusline+=[%{&ff}] "file format
@@ -257,31 +265,18 @@ let g:disable_google_optional_settings = 1
 if filereadable("/usr/share/vim/google/google.vim")
   source /usr/share/vim/google/google.vim
   let g:google = 1
-else
-  if filereadable("/google/src/head/depot/eng/vim/google.vim")
-      source /google/src/head/depot/eng/vim/google.vim
-      let g:google = 1
-  else
-      if filereadable("/home/build/public/eng/vim/google.vim")
-          source /home/build/public/eng/vim/google.vim
-          let g:google = 1
-      endif
-  endif
 endif
 
 if g:google != 0
   augroup filetypedetect
   au WinEnter,BufNewFile,BufRead * call HighlightTooLongLines()
   augroup END
-  if filereadable("/home/williasr/.vim.d/blaze.vim")
-    source /home/williasr/.vim.d/blaze.vim
-    " Load Blaze errors into quickfix mode
-    nmap <Leader>bl :call LoadBlazeErrors():cc<CR> 
-    " Run the most appropriate blaze command on the target for the current file.
-    nmap <Leader>bb :call BlazeDwim()  
-    " Run update_deps on the target for the current file.
-    nmap <Leader>bu :call UpdateDepsDwim()<CR> 
-  endif
+  " Load Blaze errors into quickfix mode
+  nmap <Leader>bl :call LoadBlazeErrors():cc<CR> 
+  " Run the most appropriate blaze command on the target for the current file.
+  nmap <Leader>bb :call BlazeDwim()  
+  " Run update_deps on the target for the current file.
+  nmap <Leader>bu :call UpdateDepsDwim()<CR> 
   " Configure a 'Comments' command to import CL code review comments into the
   " quickfix buffer.
   command! Comments cexpr system('git5 comments -q -u')
@@ -289,11 +284,6 @@ if g:google != 0
   nmap <leader>bs :!google-chrome https://cs.corp.google.com/'<cword>'<CR><CR>
 endif
 
-if filereadable("/home/build/nonconf/google3/tools/tags/gtags.vim")
-    source /home/build/nonconf/google3/tools/tags/gtags.vim
-    nmap <C-]> :exe 'Gtlist ' . expand('<cword>')<CR>
-endif
-
 " Configure browser for haskell_doc.vim
 let g:haddock_browser = "open"
 let g:haddock_browser_callformat = "%s %s"