From b936475564a915140a33c17b6cd8319864d1193f Mon Sep 17 00:00:00 2001
From: Bob Hiestand <bob.hiestand@gmail.com>
Date: Thu, 2 Sep 2010 14:47:40 -0500
Subject: [PATCH] Factored menu addition into a single function and shared with
 extensions.

---
 plugin/vcscommand.vim | 68 ++++++++++++++++++++++++++++++++++-----------------
 plugin/vcscvs.vim     | 25 +++++++++++--------
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/plugin/vcscommand.vim b/plugin/vcscommand.vim
index db154ae..6fbb2e5 100644
--- a/plugin/vcscommand.vim
+++ b/plugin/vcscommand.vim
@@ -231,7 +231,7 @@
 "   shortcuts.
 "
 " VCSCommandMenuRoot
-"   This variable, if set, overrides the default menu root 'Plugin'
+"   This variable, if set, overrides the default menu root 'Plugin.VCS'
 "
 " VCSCommandMenuPriority
 "   This variable, if set, overrides the default menu priority '' (empty)
@@ -366,7 +366,7 @@ function! s:ReportError(error)
 	echohl WarningMsg|echomsg 'VCSCommand:  ' . a:error|echohl None
 endfunction
 
-" Function s:VCSCommandUtility.system(...) {{{2
+" Function: s:VCSCommandUtility.system(...) {{{2
 " Replacement for system() function.  This version protects the quoting in the
 " command line on Windows systems.
 
@@ -384,6 +384,23 @@ function! s:VCSCommandUtility.system(...)
 	endtry
 endfunction
 
+" Function: s:VCSCommandUtility.addMenuItem(shortcut, command) {{{2
+" Adds the given menu item.
+
+function! s:VCSCommandUtility.addMenuItem(shortcut, command)
+	if s:menuEnabled
+	    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.'.a:shortcut.' '.a:command
+	endif
+endfunction
+
+" Function: s:ClearMenu() {{{2
+" Removes all VCSCommand menu items
+function! s:ClearMenu()
+	if s:menuEnabled
+		execute 'aunmenu' s:menuRoot
+	endif
+endfunction
+
 " Function: s:CreateMapping(shortcut, expansion, display) {{{2
 " Creates the given mapping by prepending the contents of
 " 'VCSCommandMapPrefix' (by default '<Leader>c') to the given shortcut and
@@ -1289,7 +1306,7 @@ com! VCSCommandDisableBufferSetup call VCSCommandDisableBufferSetup()
 com! VCSCommandEnableBufferSetup call VCSCommandEnableBufferSetup()
 
 " Allow reloading VCSCommand.vim
-com! VCSReload let savedPlugins = s:plugins|let s:plugins = {}|execute 'aunmenu '.VCSCommandGetOption('VCSCommandMenuRoot', '&Plugin').'.VCS' |unlet! g:loaded_VCSCommand|runtime plugin/vcscommand.vim|for plugin in values(savedPlugins)|execute 'source' plugin[0]|endfor|unlet savedPlugins
+com! VCSReload let savedPlugins = s:plugins|let s:plugins = {}|call s:ClearMenu()|unlet! g:loaded_VCSCommand|runtime plugin/vcscommand.vim|for plugin in values(savedPlugins)|execute 'source' plugin[0]|endfor|unlet savedPlugins
 
 " Section: Plugin command mappings {{{1
 nnoremap <silent> <Plug>VCSAdd :VCSAdd<CR>
@@ -1333,29 +1350,36 @@ let s:defaultMappings = [
 			\]
 
 if !VCSCommandGetOption('VCSCommandDisableMappings', 0)
-	for [shortcut, vcsFunction] in VCSCommandGetOption('VCSCommandMappings', s:defaultMappings)
-		call s:CreateMapping(shortcut, '<Plug>' . vcsFunction, '''' . vcsFunction . '''')
+	for [s:shortcut, s:vcsFunction] in VCSCommandGetOption('VCSCommandMappings', s:defaultMappings)
+		call s:CreateMapping(s:shortcut, '<Plug>' . s:vcsFunction, '''' . s:vcsFunction . '''')
 	endfor
+	unlet s:shortcut s:vcsFunction
 endif
+unlet s:defaultMappings
 
 " Section: Menu items {{{1
-if !VCSCommandGetOption('VCSCommandDisableMenu', 0)
-    let s:menuRoot = VCSCommandGetOption('VCSCommandMenuRoot', '&Plugin')
-    let s:menuPriority = VCSCommandGetOption('VCSCommandMenuPriority', '')
-
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Add        <Plug>VCSAdd'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.A&nnotate   <Plug>VCSAnnotate'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Commit     <Plug>VCSCommit'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.Delete      <Plug>VCSDelete'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Diff       <Plug>VCSDiff'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Info       <Plug>VCSInfo'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Log        <Plug>VCSLog'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.Revert      <Plug>VCSRevert'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Review     <Plug>VCSReview'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Status     <Plug>VCSStatus'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&Update     <Plug>VCSUpdate'
-    exe 'amenu <silent> '.s:menuPriority.' '.s:menuRoot.'.VCS.&VimDiff    <Plug>VCSVimDiff'
-endif
+
+let s:menuEnabled = !VCSCommandGetOption('VCSCommandDisableMenu', 0)
+let s:menuRoot = VCSCommandGetOption('VCSCommandMenuRoot', '&Plugin.VCS')
+let s:menuPriority = VCSCommandGetOption('VCSCommandMenuPriority', '')
+
+for [s:shortcut, s:command] in [
+			\['&Add', '<Plug>VCSAdd'],
+			\['A&nnotate', '<Plug>VCSAnnotate'],
+			\['&Commit', '<Plug>VCSCommit'],
+			\['Delete', '<Plug>VCSDelete'],
+			\['&Diff', '<Plug>VCSDiff'],
+			\['&Info', '<Plug>VCSInfo'],
+			\['&Log', '<Plug>VCSLog'],
+			\['Revert', '<Plug>VCSRevert'],
+			\['&Review', '<Plug>VCSReview'],
+			\['&Status', '<Plug>VCSStatus'],
+			\['&Update', '<Plug>VCSUpdate'],
+			\['&VimDiff', '<Plug>VCSVimDiff']
+			\]
+	call s:VCSCommandUtility.addMenuItem(s:shortcut, s:command)
+endfor
+unlet s:shortcut s:command
 
 " Section: Autocommands to restore vimdiff state {{{1
 augroup VimDiffRestore
diff --git a/plugin/vcscvs.vim b/plugin/vcscvs.vim
index e29da46..73d6a7f 100644
--- a/plugin/vcscvs.vim
+++ b/plugin/vcscvs.vim
@@ -428,17 +428,22 @@ for [pluginName, commandText, shortCut] in mappingInfo
 	endif
 endfor
 
-" Section: Menu items {{{1
-amenu <silent> &Plugin.VCS.CVS.&Edit       <Plug>CVSEdit
-amenu <silent> &Plugin.VCS.CVS.Ed&itors    <Plug>CVSEditors
-amenu <silent> &Plugin.VCS.CVS.Unedi&t     <Plug>CVSUnedit
-amenu <silent> &Plugin.VCS.CVS.&Watchers   <Plug>CVSWatchers
-amenu <silent> &Plugin.VCS.CVS.WatchAdd    <Plug>CVSWatchAdd
-amenu <silent> &Plugin.VCS.CVS.WatchOn     <Plug>CVSWatchOn
-amenu <silent> &Plugin.VCS.CVS.WatchOff    <Plug>CVSWatchOff
-amenu <silent> &Plugin.VCS.CVS.WatchRemove <Plug>CVSWatchRemove
-
 " Section: Plugin Registration {{{1
 let s:VCSCommandUtility = VCSCommandRegisterModule('CVS', expand('<sfile>'), s:cvsFunctions, s:cvsExtensionMappings)
 
+" Section: Menu items {{{1
+for [s:shortcut, s:command] in [
+			\['CVS.&Edit', '<Plug>CVSEdit'],
+			\['CVS.Ed&itors', '<Plug>CVSEditors'],
+			\['CVS.Unedi&t', '<Plug>CVSUnedit'],
+			\['CVS.&Watchers', '<Plug>CVSWatchers'],
+			\['CVS.WatchAdd', '<Plug>CVSWatchAdd'],
+			\['CVS.WatchOn', '<Plug>CVSWatchOn'],
+			\['CVS.WatchOff', '<Plug>CVSWatchOff'],
+			\['CVS.WatchRemove', '<Plug>CVSWatchRemove']
+			\]
+	call s:VCSCommandUtility.addMenuItem(s:shortcut, s:command)
+endfor
+unlet s:shortcut s:command
+
 let &cpo = s:save_cpo
-- 
2.11.4.GIT