vim/vimrc: <leader>x now calls unite xrefs

[smckown/dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 4c2547318ce43b0ff74ac46e4e0b74d7224b660c..11dc04114584043e39a60179ed5b6d0dcdb4e428 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -355,7 +355,7 @@ nnoremap co( :RainbowParenthesesToggle<CR>
 
 " mkbuild tools
 nnoremap <silent> <leader>e :call mkbuild#DmenuOpen('e')<CR>
-nnoremap <silent> <leader>x :call mkbuild#SelectXrefs()<CR>
+nnoremap <leader>x :<C-u>Unite -buffer-name=xrefs xrefs<cr>
 
 " Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
 let g:load_doxygen_syntax=1
@@ -417,15 +417,17 @@ let g:unite_source_history_yank_enable = 1
 nnoremap <leader>uf :<C-u>Unite -no-split -start-insert -buffer-name=files file_rec<cr>
 nnoremap <leader>uy :<C-u>Unite -no-split -buffer-name=yank history/yank<cr>
 nnoremap <leader>ub :<C-u>Unite -no-split -start-insert -buffer-name=buffer buffer<cr>
+nnoremap <leader>uo :<C-u>Unite -no-split -start-insert -buffer-name=outline outline<cr>
 
 " Custom mappings for the unite buffer
 autocmd FileType unite call s:unite_settings()
 function! s:unite_settings()
-  setlocal noswapfile undolevels=-1
+  "setlocal noswapfile undolevels=-1
   " Play nice with supertab
   let b:SuperTabDisabled=1
   " Enable navigation with control-j and control-k in insert mode
   imap <buffer> <C-n> <Plug>(unite_select_next_line)
   imap <buffer> <C-p> <Plug>(unite_select_previous_line)
+  imap <buffer> <CR> <Plug>(unite_do_default_action)
   nmap <buffer> <ESC> <Plug>(unite_exit)
 endfunction