vim: add mappings for vim-mkbuild

Use <leader>e to map to mkbuild#DmenuOpen('e').  Remove other
conflicting <leader>e mappings:

* <leader>e[x] mappings for various open methods.  I generally just use
  the '-' mapping to netrw.  Although open in a new split might be
  handy, I've never used it so far.
* <leader>e mapping for EasyMotion.  There isn't that much value in
* <leader>e when <leader>w is available.

diff --git a/vim/vimrc b/vim/vimrc
index 15e4b3c7576d056a4c0295f669edae5f6f4bdca0..39154607ea1c619e8eff78be1aaee957495df47d 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -176,12 +176,6 @@ set tags=tags;/
 " %% on an ex command line expands to the dir path of the current buffer
 cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'
 
-" Create some edit maps for opening new files
-map <leader>ew :e %%<CR>
-map <leader>es :sp %%<CR>
-map <leader>ev :vsp %%<CR>
-map <leader>et :tabe %%<CR>
-
 " Make <C-]> and g] work like g<C-]>, which uses :tjump
 nnoremap g] g<C-]>
 nnoremap <C-]> g<C-]>
@@ -270,10 +264,10 @@ nmap <Leader>w <Plug>(easymotion-bd-w)
 nmap <Leader>b <Plug>(easymotion-bd-w)
 nmap <Leader>W <Plug>(easymotion-bd-W)
 nmap <Leader>B <Plug>(easymotion-bd-W)
-nmap <Leader>e <Plug>(easymotion-bd-e)
-nmap <Leader>E <Plug>(easymotion-bd-E)
-nmap <Leader>ge <Plug>(easymotion-bd-e)
-nmap <Leader>gE <Plug>(easymotion-bd-E)
+"nmap <Leader>e <Plug>(easymotion-bd-e)
+"nmap <Leader>E <Plug>(easymotion-bd-E)
+"nmap <Leader>ge <Plug>(easymotion-bd-e)
+"nmap <Leader>gE <Plug>(easymotion-bd-E)
 nmap <Leader>j <Plug>(easymotion-bd-jk)
 nmap <Leader>k <Plug>(easymotion-bd-jk)
 nmap <Leader>n <Plug>(easymotion-bd-n)
@@ -355,6 +349,9 @@ nnoremap cop :DelimitMateSwitch<CR>
 " Rainbow Parenthesis -- off by default but set toggle
 nnoremap co( :RainbowParenthesesToggle<CR>
 
+" mkbuild tools
+nnoremap <silent> <leader>e :call mkbuild#DmenuOpen('e')<CR>
+
 " Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
 let g:load_doxygen_syntax=1