From 998aa359f59ee74a2bd342cf9cd8e4ea5e6155df Mon Sep 17 00:00:00 2001
From: "R. Steve McKown" <rsmckown@gmail.com>
Date: Mon, 18 Jan 2016 16:39:15 -0700
Subject: [PATCH] vimrc: update for newest vim-mkbuild plugin

The vim-mkbuild plugin has been improved.  It supports two diferent file
search sources for Unite!

* <leader>E maps to unite using the mkbuild/file source, which provides
  all files in the project, including other projects referenced
  externally in the optional extrefs file.

* <leader>e maps to unite using the mkbuild/file_xref source, which
  provides that subset of files used in a specific mkbuild build.  This
  version requires the use of <leader>x first to set a build.  If no
  build is available, mkbuild/file_xref instead works just like
  mkbuild/file.
---
 vim/bundle/vim-mkbuild | 2 +-
 vim/vimrc              | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/vim/bundle/vim-mkbuild b/vim/bundle/vim-mkbuild
index 9930211..1530d2f 160000
--- a/vim/bundle/vim-mkbuild
+++ b/vim/bundle/vim-mkbuild
@@ -1 +1 @@
-Subproject commit 99302119376c0fef814a6ac7bd011e1ba924e828
+Subproject commit 1530d2f239ec1d862ad87a2437927f6b2add0f6f
diff --git a/vim/vimrc b/vim/vimrc
index 3d23deb..6ad73bf 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -342,9 +342,10 @@ nnoremap cop :DelimitMateSwitch<CR>
 " Toggle git gutter
 nnoremap cog :GitGutterToggle<CR>
 
-" mkbuild tools
-nnoremap <leader>e :<C-u>Unite -start-insert -buffer-name=files mkbfiles<CR>
-nnoremap <leader>x :<C-u>Unite -buffer-name=xrefs xrefs<cr>
+" mkbuild code search tools
+nnoremap <leader>e :<C-u>Unite -start-insert -buffer-name=files mkbuild/file_xref<CR>
+nnoremap <leader>E :<C-u>Unite -start-insert -buffer-name=files mkbuild/file<CR>
+nnoremap <leader>x :<C-u>Unite -buffer-name=xrefs mkbuild/xref<cr>
 
 " Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
 let g:load_doxygen_syntax=1
-- 
2.39.2