Merge branch 'master' of ssh://miranda.barakmich.com/home/barak

.vimrc

@@ -73,6 +73,13 @@ let g:NERDChristmasTree = 1
 let g:NERDChristmasTree = 1
 let g:NERDTreeQuitOnOpen = 1
 let g:NERDTreeWinPos = "right"
+let g:NERDTreeWinSize = 40
+
+" Tagbar plugin settings
+let g:tagbar_width = 40
+let g:tagbar_autofocus = 1
+
+" Taglist plugin settings (deprecated)
 let Tlist_GainFocus_On_ToggleOpen = 1
 let Tlist_Use_Right_Window = 1
 let Tlist_Inc_Winwidth = 0
@@ -101,9 +108,10 @@ au BufEnter *.org            call org#SetOrgFileType()
 "nnoremap gn gt
 "nnoremap gp gT
 nmap gt :NERDTreeToggle<CR>
-nmap gT :TlistToggle<CR>
+nmap gb :TlistToggle<CR>
 "nnoremap gx :Kwbd<CR>
-nnoremap gc :bdelete<CR>
+nnoremap gc :Kwbd<CR>
+"nnoremap gc :bdelete<CR>
 nnoremap gK :bdelete!<CR>
 nnoremap gn :bn<CR>
 nnoremap gp :bp<CR>
@@ -225,10 +233,13 @@ augroup QFixToggle
  autocmd BufWinLeave * if exists("g:qfix_win") && expand("<abuf>") == g:qfix_win | unlet! g:qfix_win | endif
 augroup END
 
-nnoremap <Leader>qf :QFix<CR>
-nnoremap <Leader>aw :AckWord<CR>
+nnoremap <Leader>ff :QFix<CR>
+nnoremap <Leader>fn :cnext<CR>
+nnoremap <Leader>fp :cprev<CR>
+nnoremap <Leader>aw :exe 'Ack ' . expand('<cword>')<CR>
 nnoremap <Leader>ac :Ack 
 nnoremap <Leader>hh :A<CR>
+nnoremap <silent> <Leader>o :CommandTBuffer<CR>
 nnoremap <Leader>j <C-^>
 nnoremap <Leader>p  :PTW 
 
@@ -265,15 +276,17 @@ if g:google != 0
   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  
+    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()  
+    nmap <Leader>bu :call UpdateDepsDwim()<CR> 
   endif
   " Configure a 'Comments' command to import CL code review comments into the
   " quickfix buffer.
   command! Comments cexpr system('git5 comments -q -u')
+  command! Lint cexpr system('git5 lint -q')
+  nmap <leader>bs :!google-chrome https://cs.corp.google.com/'<cword>'<CR><CR>
 endif
 
 if filereadable("/home/build/nonconf/google3/tools/tags/gtags.vim")