From e82813e03b033d04207bd3a2d704c74d54968017 Mon Sep 17 00:00:00 2001
From: mrossinek <rmax@ethz.ch>
Date: Thu, 31 Jan 2019 11:19:12 +0100
Subject: [PATCH] Add mapping-suppressing option

---
 doc/taskwiki.txt              |  9 ++++
 ftplugin/vimwiki/taskwiki.vim | 80 ++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/doc/taskwiki.txt b/doc/taskwiki.txt
index 8341517..b35a599 100644
--- a/doc/taskwiki.txt
+++ b/doc/taskwiki.txt
@@ -713,6 +713,15 @@ constructs.
     Example:
     let g:taskwiki_use_python2="yes"
 
+*taskwiki_suppress_mappings*
+        Setting this variable to a non-empty value (such as "yes") will
+        prevent taskwiki from setting up any |<Leader>|-mappings. This is
+        useful if you would rather specify your own mappings or have
+        conflicting mappings.
+
+        Example:
+        let g:taskwiki_suppress_mappings="yes"
+
 
 =============================================================================
 9. TROUBLESHOOTING					   *taskwiki-trouble*
diff --git a/ftplugin/vimwiki/taskwiki.vim b/ftplugin/vimwiki/taskwiki.vim
index ddbab2e..b53a99d 100644
--- a/ftplugin/vimwiki/taskwiki.vim
+++ b/ftplugin/vimwiki/taskwiki.vim
@@ -93,43 +93,45 @@ endif
 execute "nnoremap <silent><buffer> <CR> :" . g:taskwiki_py . "Mappings.task_info_or_vimwiki_follow_link()<CR>"
 
 " Leader-related mappings. Mostly <Leader>t + <first letter of the action>
-nmap <silent><buffer> <Leader>ta :TaskWikiAnnotate<CR>
-nmap <silent><buffer> <Leader>tbd :TaskWikiBurndownDaily<CR>
-nmap <silent><buffer> <Leader>tbw :TaskWikiBurndownWeekly<CR>
-nmap <silent><buffer> <Leader>tbm :TaskWikiBurndownMonthly<CR>
-nmap <silent><buffer> <Leader>tcp :TaskWikiChooseProject<CR>
-nmap <silent><buffer> <Leader>tct :TaskWikiChooseTag<CR>
-nmap <silent><buffer> <Leader>tC :TaskWikiCalendar<CR>
-nmap <silent><buffer> <Leader>td :TaskWikiDone<CR>
-nmap <silent><buffer> <Leader>tD :TaskWikiDelete<CR>
-nmap <silent><buffer> <Leader>te :TaskWikiEdit<CR>
-nmap <silent><buffer> <Leader>tg :TaskWikiGrid<CR>
-nmap <silent><buffer> <Leader>tGm :TaskWikiGhistoryMonthly<CR>
-nmap <silent><buffer> <Leader>tGa :TaskWikiGhistoryAnnual<CR>
-nmap <silent><buffer> <Leader>thm :TaskWikiHistoryMonthly<CR>
-nmap <silent><buffer> <Leader>tha :TaskWikiHistoryAnnual<CR>
-nmap <silent><buffer> <Leader>ti :TaskWikiInfo<CR>
-nmap <silent><buffer> <Leader>tl :TaskWikiLink<CR>
-nmap <silent><buffer> <Leader>tm :TaskWikiMod<CR>
-nmap <silent><buffer> <Leader>tp :TaskWikiProjects<CR>
-nmap <silent><buffer> <Leader>ts :TaskWikiProjectsSummary<CR>
-nmap <silent><buffer> <Leader>tS :TaskWikiStats<CR>
-nmap <silent><buffer> <Leader>tt :TaskWikiTags<CR>
-nmap <silent><buffer> <Leader>t. :TaskWikiRedo<CR>
-nmap <silent><buffer> <Leader>t+ :TaskWikiStart<CR>
-nmap <silent><buffer> <Leader>t- :TaskWikiStop<CR>
+if !exists('g:taskwiki_suppress_mappings')
+        nmap <silent><buffer> <Leader>ta :TaskWikiAnnotate<CR>
+        nmap <silent><buffer> <Leader>tbd :TaskWikiBurndownDaily<CR>
+        nmap <silent><buffer> <Leader>tbw :TaskWikiBurndownWeekly<CR>
+        nmap <silent><buffer> <Leader>tbm :TaskWikiBurndownMonthly<CR>
+        nmap <silent><buffer> <Leader>tcp :TaskWikiChooseProject<CR>
+        nmap <silent><buffer> <Leader>tct :TaskWikiChooseTag<CR>
+        nmap <silent><buffer> <Leader>tC :TaskWikiCalendar<CR>
+        nmap <silent><buffer> <Leader>td :TaskWikiDone<CR>
+        nmap <silent><buffer> <Leader>tD :TaskWikiDelete<CR>
+        nmap <silent><buffer> <Leader>te :TaskWikiEdit<CR>
+        nmap <silent><buffer> <Leader>tg :TaskWikiGrid<CR>
+        nmap <silent><buffer> <Leader>tGm :TaskWikiGhistoryMonthly<CR>
+        nmap <silent><buffer> <Leader>tGa :TaskWikiGhistoryAnnual<CR>
+        nmap <silent><buffer> <Leader>thm :TaskWikiHistoryMonthly<CR>
+        nmap <silent><buffer> <Leader>tha :TaskWikiHistoryAnnual<CR>
+        nmap <silent><buffer> <Leader>ti :TaskWikiInfo<CR>
+        nmap <silent><buffer> <Leader>tl :TaskWikiLink<CR>
+        nmap <silent><buffer> <Leader>tm :TaskWikiMod<CR>
+        nmap <silent><buffer> <Leader>tp :TaskWikiProjects<CR>
+        nmap <silent><buffer> <Leader>ts :TaskWikiProjectsSummary<CR>
+        nmap <silent><buffer> <Leader>tS :TaskWikiStats<CR>
+        nmap <silent><buffer> <Leader>tt :TaskWikiTags<CR>
+        nmap <silent><buffer> <Leader>t. :TaskWikiRedo<CR>
+        nmap <silent><buffer> <Leader>t+ :TaskWikiStart<CR>
+        nmap <silent><buffer> <Leader>t- :TaskWikiStop<CR>
 
-" Mappings for visual mode.
-vmap <silent><buffer> <Leader>ta :TaskWikiAnnotate<CR>
-vmap <silent><buffer> <Leader>tcp :TaskWikiChooseProject<CR>
-vmap <silent><buffer> <Leader>tct :TaskWikiChooseTag<CR>
-vmap <silent><buffer> <Leader>td :TaskWikiDone<CR>
-vmap <silent><buffer> <Leader>tD :TaskWikiDelete<CR>
-vmap <silent><buffer> <Leader>te :TaskWikiEdit<CR>
-vmap <silent><buffer> <Leader>tg :TaskWikiGrid<CR>
-vmap <silent><buffer> <Leader>ti :TaskWikiInfo<CR>
-vmap <silent><buffer> <Leader>tl :TaskWikiLink<CR>
-vmap <silent><buffer> <Leader>tm :TaskWikiMod<CR>
-vmap <silent><buffer> <Leader>t. :TaskWikiRedo<CR>
-vmap <silent><buffer> <Leader>t+ :TaskWikiStart<CR>
-vmap <silent><buffer> <Leader>t- :TaskWikiStop<CR>
+        " Mappings for visual mode.
+        vmap <silent><buffer> <Leader>ta :TaskWikiAnnotate<CR>
+        vmap <silent><buffer> <Leader>tcp :TaskWikiChooseProject<CR>
+        vmap <silent><buffer> <Leader>tct :TaskWikiChooseTag<CR>
+        vmap <silent><buffer> <Leader>td :TaskWikiDone<CR>
+        vmap <silent><buffer> <Leader>tD :TaskWikiDelete<CR>
+        vmap <silent><buffer> <Leader>te :TaskWikiEdit<CR>
+        vmap <silent><buffer> <Leader>tg :TaskWikiGrid<CR>
+        vmap <silent><buffer> <Leader>ti :TaskWikiInfo<CR>
+        vmap <silent><buffer> <Leader>tl :TaskWikiLink<CR>
+        vmap <silent><buffer> <Leader>tm :TaskWikiMod<CR>
+        vmap <silent><buffer> <Leader>t. :TaskWikiRedo<CR>
+        vmap <silent><buffer> <Leader>t+ :TaskWikiStart<CR>
+        vmap <silent><buffer> <Leader>t- :TaskWikiStop<CR>
+endif