Integrating sietse's work, version 0.7.6

Add logic to place the completion date after the priority, if it exists,
when completing a task.

README.markdown

@@ -28,19 +28,19 @@
 
 ## Release notes
 
-v0.7.5 Incorporates [Fievel's work](https://github.com/fievel/todo.txt-vim/commit/0863e1434e9a89ace06c4856b6cb32ba9906e3de) to make overduedates work on python3. I have no version of vim with python3 thus it is only tested on his side, do not hesitate to report issues.
++   v0.7.6 Incorporates [Sietse's work](https://github.com/sietse/todo.txt-vim/commit/57d45200c8b033d31c9191ee0eb0711c801cdb1d) to make cancel and mark as done mapping repeatable using [vim-repeat](https://github.com/tpope/vim-repeat).
++   v0.7.5 Incorporates [Fievel's work](https://github.com/fievel/todo.txt-vim/commit/0863e1434e9a89ace06c4856b6cb32ba9906e3de) to make overduedates work on python3.
++   v0.7.4 includes the overduedate support from Guilherme Victal (see pull
 
-v0.7.4 includes the overduedate support from Guilherme Victal (see pull
-[request #45 on freitass version](https://github.com/freitass/todo.txt-vim/pull/45)),
-it highlight dates in overdue tasks as an Error. It depends on a
-Python library, however, and as such will only be able to work if your version
-of Vim was compiled with the `+python` option (as most common versions do).
+    [request #45 on freitass version](https://github.com/freitass/todo.txt-vim/pull/45)),
+    it highlight dates in overdue tasks as an Error. It depends on a
+    Python library, however, and as such will only be able to work if your version
+    of Vim was compiled with the `+python` option (as most common versions do).
  
-If your Vim installation does **not** have Python support, this plugin **will work just fine** but this feature will be disabled.
+    If your Vim installation does **not** have Python support, this plugin **will work just fine** but this feature will be disabled.
 
 
-Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to
-update your vimrc (see [completion](#completion)).
++   Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to update your vimrc (see [completion](#completion)).
 
 ## Introduction
 

autoload/todo.vim

@@ -62,7 +62,11 @@ function! todo#RemovePriority()
 endfunction
 
 function! todo#PrependDate()
-    normal! 0"=strftime("%Y-%m-%d ")
+    if (getline(".") =~ '\v^\(')
+	execute "normal! 0f)a\<space>\<esc>l\"=strftime(\"%Y-%m-%d\")\<esc>P"
+    else
+        normal! 0"=strftime("%Y-%m-%d ")
+P
     endif
 endfunction
 
@@ -137,9 +141,28 @@ function! todo#Sort()
         silent! %s/\(x\s*\d\{4}\)-\(\d\{2}\)-\(\d\{2}\)/\1\2\3/g
         sort n /^x\s*/
         silent! %s/\(x\s*\d\{4}\)\(\d\{2}\)/\1-\2-/g
+    else
+        let oldcursor=getpos(".")
+        silent normal gg
+        let l:first=search('^\s*x')
+        if  l:first != 0
+            sort /^./r
+            " at this point done tasks are at the end
+            let l:first=search('^\s*x')
+            let l:last=search('^\s*x','b')
+            let l:diff=l:last-l:first+1
+            " Cut the done lines
+            execute ':'.l:first.'d a '.l:diff
         endif
         sort /@[a-zA-Z]*/ r
-        sort /+[a-zA-Z]*/ r
+        sort /+[a-zA-Z]*/ r
+        sort /\v([A-Z])/ r
+        if l:first != 0
+            silent normal G"ap
+            execute ':'.l:first.','.l:last.'sort /@[a-zA-Z]*/ r'
+            execute ':'.l:first.','.l:last.'sort /+[a-zA-Z]*/ r'
+            execute ':'.l:first.','.l:last.'sort /\v([A-Z])/ r'
+        endif
         call cursor(oldcursor)
     endif
 endfunction
@@ -331,7 +354,7 @@ fun! todo#Complete(findstart, base)
         let res = []
         for bufnr in range(1,bufnr('$'))
             let lines=getbufline(bufnr,1,"$")
-            for line in lines
+            for line in lines
                 if line =~ " ".a:base
                     " init temporary item
                     let item={}

doc/todo.txt

@@ -31,10 +31,11 @@ Table of Contents                                          *TodoTxt-Contents* ~
 ===============================================================================
 1. Release notes                                       *TodoTxt-ReleaseNotes* ~
 
+v0.7.6 Incorporates [Sietse's work](https://github.com/sietse/todo.txt-vim/commit/57d45200c8b033d31c9191ee0eb0711c801cdb1d) to make cancel and mark as done mapping repeatable using [vim-repeat](https://github.com/tpope/vim-repeat).
+
 v0.7.5 Incorporates Fievel's work
 (https://github.com/fievel/todo.txt-vim/commit/0863e1434e9a89ace06c4856b6cb32ba9906e3de)
-to make overduedates work on python3. I have no version of vim with python3
-thus it is only tested on his side, do not hesitate to report issues.
+to make overduedates work on python3.
 
 v0.7.4 includes the overduedate support from Guilherme Victal (see pull
 request #45 on freitass version (https://github.com/freitass/todo.txt-vim/pull/45)),

ftplugin/todo.vim

@@ -12,7 +12,7 @@ set cpo&vim
 if exists("g:Todo_txt_loaded")
     finish
 else
-    let g:Todo_txt_loaded=0.7.5
+    let g:Todo_txt_loaded=0.7.6
 endif
 
 " General options {{{1
@@ -54,12 +54,15 @@ if !exists("g:Todo_txt_do_not_map")
     noremap <script> <silent> <buffer> <localleader>d :call todo#PrependDate()<CR>
 
 " Mark done {{{2
-    noremap <script> <silent> <buffer> <localleader>x :call todo#ToggleMarkAsDone('')<CR>
+    noremap <script> <silent> <buffer> <Plug>DoToggleMarkAsDone :call todo#ToggleMarkAsDone('')<CR>
+                \:call repeat#set("\<Plug>DoToggleMarkAsDone")<CR>
+    nmap <localleader>x <Plug>DoToggleMarkAsDone
+    " noremap <script> <silent> <buffer> <localleader>x :call todo#ToggleMarkAsDone('')<CR>
 
 " Mark done {{{2
-    noremap <script> <silent> <buffer> <localleader>C :call todo#ToggleMarkAsDone('Cancelled')<CR>
-
-
+    noremap <script> <silent> <buffer> <Plug>DoCancel :call todo#ToggleMarkAsDone('Cancelled')<CR>
+                \:call repeat#set("\<Plug>DoCancel")<CR>
+    nmap <localleader>C <Plug>DoCancel
 
 " Mark all done {{{2
     noremap <script> <silent> <buffer> <localleader>X :call todo#MarkAllAsDone()<CR>

syntax/python/dateregex/dateregex/before.py

@@ -44,7 +44,7 @@ def _month_regex_before(year, month):
 def _day_regex_before(year, month, day):
     if day == '01':
         return None
-    last_month_day = str((date(int(year), (int(month) + 1) % 12, 1) + - date.resolution).day)
+    last_month_day = str((date(int(year), int(month) % 12 + 1, 1) + - date.resolution).day)
     last_digit1, last_digit2 = last_month_day
 
     digit1, digit2 = day