From bd079b8ff830f0c88c38f35c0fa0df34d10e89e1 Mon Sep 17 00:00:00 2001
From: Bob Hiestand <bob.hiestand@gmail.com>
Date: Tue, 15 May 2007 18:03:48 +0000
Subject: [PATCH] Added 'VCSCommandDisableMappings' and
 'VCSCommandDisableExtensionMappings' options. These options prevent creation
 of all mappings, or only extension mappings, respectively.

git-svn-id: https://vcscommand.googlecode.com/svn/trunk@54 e7462f97-9721-0410-a4e7-d7c98e439057
---
 doc/vcscommand.txt    |  13 ++++++
 plugin/vcscommand.vim | 111 ++++++++++++++++++++++++++++----------------------
 2 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/doc/vcscommand.txt b/doc/vcscommand.txt
index fce02c6..30113ce 100644
--- a/doc/vcscommand.txt
+++ b/doc/vcscommand.txt
@@ -400,6 +400,8 @@ The following variables are available:
 |VCSCommandCVSExec|
 |VCSCommandDeleteOnHide|
 |VCSCommandDiffSplit|
+|VCSCommandDisableMappings|
+|VCSCommandDisableExtensionMappings|
 |VCSCommandEdit|
 |VCSCommandEnableBufferSetup|
 |VCSCommandResultBufferNameExtension|
@@ -437,6 +439,17 @@ VCSCommandDiffSplit				*VCSCommandDiffSplit*
 This variable overrides the |VCSCommandSplit| variable, but only for buffers
 created with |:VCSVimDiff|.
 
+VCSCommandDisableMappings			*VCSCommandDisableMappings*
+
+This variable, if set to a non-zero value, prevents the default command
+mappings from being set.  This supercedes 
+|VCSCommandDisableExtensionMappings|.
+
+VCSCommandDisableExtensionMappings	*VCSCommandDisableExtensionMappings*
+
+This variable, if set to a non-zero value, prevents the default command
+mappings from being set for commands specific to an individual VCS.
+
 VCSCommandEdit					*VCSCommandEdit*
 
 This variable controls whether the original buffer is replaced ('edit') or
diff --git a/plugin/vcscommand.vim b/plugin/vcscommand.vim
index 8d88afc..6a69c60 100644
--- a/plugin/vcscommand.vim
+++ b/plugin/vcscommand.vim
@@ -2,7 +2,7 @@
 "
 " Vim plugin to assist in working with files under control of CVS or SVN.
 "
-" Version:       Beta 17
+" Version:       Beta 18
 " Maintainer:    Bob Hiestand <bob.hiestand@gmail.com>
 " License:
 " Copyright (c) 2007 Bob Hiestand
@@ -183,6 +183,14 @@
 "   This variable overrides the VCSCommandSplit variable, but only for buffers
 "   created with VCSVimDiff.
 "
+" VCSCommandDisableMappings
+"   This variable, if set to a non-zero value, prevents the default command
+"   mappings from being set.
+"
+" VCSCommandDisableExtensionMappings
+"   This variable, if set to a non-zero value, prevents the default command
+"   mappings from being set for commands specific to an individual VCS.
+"
 " VCSCommandEdit
 "   This variable controls whether to split the current window to display a
 "   scratch buffer ('split'), or to display it in the current buffer ('edit').
@@ -891,7 +899,9 @@ function! VCSCommandRegisterModule(name, file, commandMap, mappingMap)
   let s:plugins[a:name] = a:commandMap
   call add(s:pluginFiles, a:file)
   let s:extendedMappings[a:name] = a:mappingMap
-  if(!empty(a:mappingMap))
+  if !empty(a:mappingMap)
+        \ && !VCSCommandGetOption('VCSCommandDisableMappings', 0)
+        \ && !VCSCommandGetOption('VCSCommandDisableExtensionMappings', 0)
     for mapname in keys(a:mappingMap)
       execute 'noremap <silent> <Leader>' . mapname ':call <SID>ExecuteExtensionMapping(''' . mapname . ''')<CR>'
     endfor
@@ -1100,53 +1110,56 @@ nnoremap <silent> <Plug>VCSUpdate :VCSUpdate<CR>
 nnoremap <silent> <Plug>VCSVimDiff :VCSVimDiff<CR>
 
 " Section: Default mappings {{{1
-if !hasmapto('<Plug>VCSAdd')
-  nmap <unique> <Leader>ca <Plug>VCSAdd
-endif
-if !hasmapto('<Plug>VCSAnnotate')
-  nmap <unique> <Leader>cn <Plug>VCSAnnotate
-endif
-if !hasmapto('<Plug>VCSClearAndGotoOriginal')
-  nmap <unique> <Leader>cG <Plug>VCSClearAndGotoOriginal
-endif
-if !hasmapto('<Plug>VCSCommit')
-  nmap <unique> <Leader>cc <Plug>VCSCommit
-endif
-if !hasmapto('<Plug>VCSDelete')
-  nmap <unique> <Leader>cD <Plug>VCSDelete
-endif
-if !hasmapto('<Plug>VCSDiff')
-  nmap <unique> <Leader>cd <Plug>VCSDiff
-endif
-if !hasmapto('<Plug>VCSGotoOriginal')
-  nmap <unique> <Leader>cg <Plug>VCSGotoOriginal
-endif
-if !hasmapto('<Plug>VCSInfo')
-  nmap <unique> <Leader>ci <Plug>VCSInfo
-endif
-if !hasmapto('<Plug>VCSLock')
-  nmap <unique> <Leader>cL <Plug>VCSLock
-endif
-if !hasmapto('<Plug>VCSLog')
-  nmap <unique> <Leader>cl <Plug>VCSLog
-endif
-if !hasmapto('<Plug>VCSRevert')
-  nmap <unique> <Leader>cq <Plug>VCSRevert
-endif
-if !hasmapto('<Plug>VCSReview')
-  nmap <unique> <Leader>cr <Plug>VCSReview
-endif
-if !hasmapto('<Plug>VCSStatus')
-  nmap <unique> <Leader>cs <Plug>VCSStatus
-endif
-if !hasmapto('<Plug>VCSUnlock')
-  nmap <unique> <Leader>cU <Plug>VCSUnlock
-endif
-if !hasmapto('<Plug>VCSUpdate')
-  nmap <unique> <Leader>cu <Plug>VCSUpdate
-endif
-if !hasmapto('<Plug>VCSVimDiff')
-  nmap <unique> <Leader>cv <Plug>VCSVimDiff
+
+if !VCSCommandGetOption('VCSCommandDisableMappings', 0)
+  if !hasmapto('<Plug>VCSAdd')
+    nmap <unique> <Leader>ca <Plug>VCSAdd
+  endif
+  if !hasmapto('<Plug>VCSAnnotate')
+    nmap <unique> <Leader>cn <Plug>VCSAnnotate
+  endif
+  if !hasmapto('<Plug>VCSClearAndGotoOriginal')
+    nmap <unique> <Leader>cG <Plug>VCSClearAndGotoOriginal
+  endif
+  if !hasmapto('<Plug>VCSCommit')
+    nmap <unique> <Leader>cc <Plug>VCSCommit
+  endif
+  if !hasmapto('<Plug>VCSDelete')
+    nmap <unique> <Leader>cD <Plug>VCSDelete
+  endif
+  if !hasmapto('<Plug>VCSDiff')
+    nmap <unique> <Leader>cd <Plug>VCSDiff
+  endif
+  if !hasmapto('<Plug>VCSGotoOriginal')
+    nmap <unique> <Leader>cg <Plug>VCSGotoOriginal
+  endif
+  if !hasmapto('<Plug>VCSInfo')
+    nmap <unique> <Leader>ci <Plug>VCSInfo
+  endif
+  if !hasmapto('<Plug>VCSLock')
+    nmap <unique> <Leader>cL <Plug>VCSLock
+  endif
+  if !hasmapto('<Plug>VCSLog')
+    nmap <unique> <Leader>cl <Plug>VCSLog
+  endif
+  if !hasmapto('<Plug>VCSRevert')
+    nmap <unique> <Leader>cq <Plug>VCSRevert
+  endif
+  if !hasmapto('<Plug>VCSReview')
+    nmap <unique> <Leader>cr <Plug>VCSReview
+  endif
+  if !hasmapto('<Plug>VCSStatus')
+    nmap <unique> <Leader>cs <Plug>VCSStatus
+  endif
+  if !hasmapto('<Plug>VCSUnlock')
+    nmap <unique> <Leader>cU <Plug>VCSUnlock
+  endif
+  if !hasmapto('<Plug>VCSUpdate')
+    nmap <unique> <Leader>cu <Plug>VCSUpdate
+  endif
+  if !hasmapto('<Plug>VCSVimDiff')
+    nmap <unique> <Leader>cv <Plug>VCSVimDiff
+  endif
 endif
 
 " Section: Menu items {{{1
-- 
2.11.4.GIT