From 421916b25d3858b3c9f86055aa79ab3467aaf1a9 Mon Sep 17 00:00:00 2001
From: Leandro Freitas <llf@certi.org.br>
Date: Mon, 3 Aug 2015 14:21:49 -0300
Subject: [PATCH] Fixes #42

---
 ftplugin/todo.vim | 119 ++++++++++------------------------------------
 1 file changed, 25 insertions(+), 94 deletions(-)

diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index b8709da..65252db 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -18,110 +18,41 @@ setlocal wrapmargin=0
 
 " Mappings {{{1
 " Sort tasks {{{2
-if !hasmapto("<localleader>s",'n')
-    nnoremap <script> <silent> <buffer> <localleader>s :%sort<CR>
-endif
-
-if !hasmapto("<localleader>s",'v')
-    vnoremap <script> <silent> <buffer> <localleader>s :sort<CR>
-endif
-
-if !hasmapto("<localleader>s@",'n')
-    nnoremap <script> <silent> <buffer> <localleader>s@ :%call todo#txt#sort_by_context()<CR>
-endif
-
-if !hasmapto("<localleader>s@",'v')
-    vnoremap <script> <silent> <buffer> <localleader>s@ :call todo#txt#sort_by_context()<CR>
-endif
-
-if !hasmapto("<localleader>s+",'n')
-    nnoremap <script> <silent> <buffer> <localleader>s+ :%call todo#txt#sort_by_project()<CR>
-endif
-
-if !hasmapto("<localleader>s+",'v')
-    vnoremap <script> <silent> <buffer> <localleader>s+ :call todo#txt#sort_by_project()<CR>
-endif
-
-if !hasmapto("<localleader>sd",'n')
-    nnoremap <script> <silent> <buffer> <localleader>sd :%call todo#txt#sort_by_date()<CR>
-endif
-
-if !hasmapto("<localleader>sd",'v')
-    vnoremap <script> <silent> <buffer> <localleader>sd :call todo#txt#sort_by_date()<CR>
-endif
+nnoremap <script> <silent> <buffer> <localleader>s :%sort<CR>
+vnoremap <script> <silent> <buffer> <localleader>s :sort<CR>
+nnoremap <script> <silent> <buffer> <localleader>s@ :%call todo#txt#sort_by_context()<CR>
+vnoremap <script> <silent> <buffer> <localleader>s@ :call todo#txt#sort_by_context()<CR>
+nnoremap <script> <silent> <buffer> <localleader>s+ :%call todo#txt#sort_by_project()<CR>
+vnoremap <script> <silent> <buffer> <localleader>s+ :call todo#txt#sort_by_project()<CR>
+nnoremap <script> <silent> <buffer> <localleader>sd :%call todo#txt#sort_by_date()<CR>
+vnoremap <script> <silent> <buffer> <localleader>sd :call todo#txt#sort_by_date()<CR>
 
 " Change priority {{{2
-if !hasmapto("<localleader>j",'n')
-    nnoremap <script> <silent> <buffer> <localleader>j :call todo#txt#prioritize_increase()<CR>
-endif
-
-if !hasmapto("<localleader>j",'v')
-    vnoremap <script> <silent> <buffer> <localleader>j :call todo#txt#prioritize_increase()<CR>
-endif
-
-if !hasmapto("<localleader>k",'n')
-    nnoremap <script> <silent> <buffer> <localleader>k :call todo#txt#prioritize_decrease()<CR>
-endif
-
-if !hasmapto("<localleader>k",'v')
-    vnoremap <script> <silent> <buffer> <localleader>k :call todo#txt#prioritize_decrease()<CR>
-endif
-
-if !hasmapto("<localleader>a",'n')
-    nnoremap <script> <silent> <buffer> <localleader>a :call todo#txt#prioritize_add('A')<CR>
-endif
-
-if !hasmapto("<localleader>a",'v')
-    vnoremap <script> <silent> <buffer> <localleader>a :call todo#txt#prioritize_add('A')<CR>
-endif
-
-if !hasmapto("<localleader>b",'n')
-    nnoremap <script> <silent> <buffer> <localleader>b :call todo#txt#prioritize_add('B')<CR>
-endif
-
-if !hasmapto("<localleader>b",'v')
-    vnoremap <script> <silent> <buffer> <localleader>b :call todo#txt#prioritize_add('B')<CR>
-endif
-
-if !hasmapto("<localleader>c",'n')
-    nnoremap <script> <silent> <buffer> <localleader>c :call todo#txt#prioritize_add('C')<CR>
-endif
-
-if !hasmapto("<localleader>c",'v')
-    vnoremap <script> <silent> <buffer> <localleader>c :call todo#txt#prioritize_add('C')<CR>
-endif
+nnoremap <script> <silent> <buffer> <localleader>j :call todo#txt#prioritize_increase()<CR>
+vnoremap <script> <silent> <buffer> <localleader>j :call todo#txt#prioritize_increase()<CR>
+nnoremap <script> <silent> <buffer> <localleader>k :call todo#txt#prioritize_decrease()<CR>
+vnoremap <script> <silent> <buffer> <localleader>k :call todo#txt#prioritize_decrease()<CR>
+nnoremap <script> <silent> <buffer> <localleader>a :call todo#txt#prioritize_add('A')<CR>
+vnoremap <script> <silent> <buffer> <localleader>a :call todo#txt#prioritize_add('A')<CR>
+nnoremap <script> <silent> <buffer> <localleader>b :call todo#txt#prioritize_add('B')<CR>
+vnoremap <script> <silent> <buffer> <localleader>b :call todo#txt#prioritize_add('B')<CR>
+nnoremap <script> <silent> <buffer> <localleader>c :call todo#txt#prioritize_add('C')<CR>
+vnoremap <script> <silent> <buffer> <localleader>c :call todo#txt#prioritize_add('C')<CR>
 
 " Insert date {{{2
-if !hasmapto("date<Tab>",'i')
-    inoremap <script> <silent> <buffer> date<Tab> <C-R>=strftime("%Y-%m-%d")<CR>
-endif
-
-if !hasmapto("<localleader>d",'n')
-    nnoremap <script> <silent> <buffer> <localleader>d :call todo#txt#replace_date()<CR>
-endif
-
-if !hasmapto("<localleader>d",'v')
-    vnoremap <script> <silent> <buffer> <localleader>d :call todo#txt#replace_date()<CR>
-endif
+inoremap <script> <silent> <buffer> date<Tab> <C-R>=strftime("%Y-%m-%d")<CR>
+nnoremap <script> <silent> <buffer> <localleader>d :call todo#txt#replace_date()<CR>
+vnoremap <script> <silent> <buffer> <localleader>d :call todo#txt#replace_date()<CR>
 
 " Mark done {{{2
-if !hasmapto("<localleader>x",'n')
-    nnoremap <script> <silent> <buffer> <localleader>x :call todo#txt#mark_as_done()<CR>
-endif
-
-if !hasmapto("<localleader>x",'v')
-    vnoremap <script> <silent> <buffer> <localleader>x :call todo#txt#mark_as_done()<CR>
-endif
+nnoremap <script> <silent> <buffer> <localleader>x :call todo#txt#mark_as_done()<CR>
+vnoremap <script> <silent> <buffer> <localleader>x :call todo#txt#mark_as_done()<CR>
 
 " Mark all done {{{2
-if !hasmapto("<localleader>X",'n')
-    nnoremap <script> <silent> <buffer> <localleader>X :call todo#txt#mark_all_as_done()<CR>
-endif
+nnoremap <script> <silent> <buffer> <localleader>X :call todo#txt#mark_all_as_done()<CR>
 
 " Remove completed {{{2
-if !hasmapto("<localleader>D",'n')
-    nnoremap <script> <silent> <buffer> <localleader>D :call todo#txt#remove_completed()<CR>
-endif
+nnoremap <script> <silent> <buffer> <localleader>D :call todo#txt#remove_completed()<CR>
 
 " Folding {{{1
 " Options {{{2