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.

.gitignore

@@ -1,2 +1,3 @@
 *.swp
 doc/tags
+*.pyc

README.markdown

@@ -15,7 +15,7 @@
 1. [Release notes](#release-notes)
 2. [Introduction](#introduction)
     1. [Todo.txt rules](#todo.txt-rules)
-    2. [Why this Fork ?](#Why-this-fork-?)
+    2. [Why this Fork ?](#Why-this-fork)
     3. [Installation](#installation)
 3. [TodoTxt Files](#todotxt-files)
 4. [Completion](#completion)
@@ -28,8 +28,19 @@
 
 ## Release notes
 
-Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to
-update your vimrc (see [completion](#completion)).
++   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
+
+    [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.
+
+
++   Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to update your vimrc (see [completion](#completion)).
 
 ## Introduction
 
@@ -132,8 +143,8 @@ like this behavior, you can set the default done.txt name:
 This plugin provides a nice complete function for project and context, to use
 it add the following lines to your vimrc:
 
-    " Use todo#complete as the omni complete function for todo files
-    au filetype todo setlocal omnifunc=todo#complete
+    " Use todo#Complete as the omni complete function for todo files
+    au filetype todo setlocal omnifunc=todo#Complete
 
 You can also start automatically the completion when entering '+' or '@' by
 adding the next lines to your vimrc:
@@ -145,7 +156,7 @@ adding the next lines to your vimrc:
     au filetype todo imap <buffer> @ @<C-X><C-O>
 
 
-The `todo#complete` function is designed to complete projects (starting by `+`)
+The `todo#Complete` function is designed to complete projects (starting by `+`)
 and context (starting by `@`). If you use it on a regular word, it will do a
 normal keyword completion (on all buffers).
 
@@ -182,6 +193,13 @@ For more information on the available flags see `help :sort`
 
 ## Mappings
 
+By default todo-txt.vim set all the mappings secribed in this section. To
+prevent this behavior, add the following line to your vimrc
+
+   let g:Todo_txt_do_not_map=1
+
+
+
 `<LocalLeader>` is \  by default, so ̀`<LocaLeader>-s` means you type \s
 
 ### Sort
@@ -189,7 +207,7 @@ For more information on the available flags see `help :sort`
 + `<LocalLeader>s` : Sort the file by priority
 + `<LocalLeader>s+` : Sort the file on `+Projects`
 + `<LocalLeader>s@` : Sort the file on `@Contexts`
-+ `<LocalLeader>s@` : Sort the file on due dates
++ `<LocalLeader>sd` : Sort the file on due dates
 + `<LocalLeader>sc` : Sort the file by context then by priority
 + `<LocalLeader>scp` : Sort the file by context, project then by priority
 + `<LocalLeader>sp` : Sort the file by project then by priority

autoload/todo.vim

@@ -3,7 +3,6 @@
 " Author:      David Beniamine <david@beniamine.net>
 " Licence:     Vim licence
 " Website:     http://github.com/dbeniamine/todo.txt.vim
-" Version:     0.7.3
 " vim: ts=4 sw=4 :help tw=78 cc=80
 
 " These two variables are parameters for the successive calls the vim sort
@@ -23,6 +22,14 @@ endif
 
 " Functions {{{1
 
+
+function! todo#GetCurpos()
+    if exists("*getcurpos")
+        return getcurpos()
+    endif
+        return getpos('.')
+endfunction
+
 " Increment and Decrement The Priority
 :set nf=octal,hex,alpha
 
@@ -35,7 +42,7 @@ function! todo#PrioritizeDecrease()
 endfunction
 
 function! todo#PrioritizeAdd (priority)
-    let oldpos=getcurpos()
+    let oldpos=todo#GetCurpos()
     let line=getline('.')
     if line !~ '^([A-F])'
         :call todo#PrioritizeAddAction(a:priority)
@@ -55,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
 
@@ -84,7 +95,7 @@ function! todo#MarkAsDone(status)
     normal! Ix 
 endfunction
 
-function! todo#MarkAllAsDone()
+function! todo#MarkAllAsDone()
     :g!/^x /:call todo#MarkAsDone('')
 endfunction
 
@@ -130,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
@@ -179,16 +209,28 @@ function! todo#HierarchicalSort(symbol, symbolsub, dolastsort)
     let l:sortmodesub=Todo_txt_InsertSpaceIfNeeded(g:Todo_txt_second_level_sort_mode)
     let l:sortmodefinal=Todo_txt_InsertSpaceIfNeeded(g:Todo_txt_third_level_sort_mode)
 
-    " Count the number of lines
-    let l:position= getpos(".")
-    execute "silent normal g\<c-g>"
+    " Count the number of lines
+    let l:position= todo#GetCurpos()
+    execute "silent normal G"
+    let l:linecount=getpos(".")[1]
+    if(exists("g:Todo_txt_debug"))
+        echo "Linescount: ".l:linecount
+    endif
     execute "silent normal gg"
 
     " Get all the groups names
+    let l:groups=GetGroups(a:symbol,1,l:linecount)
+    if(exists("g:Todo_txt_debug"))
+        echo "Groups: "
+        echo l:groups
+        echo 'execute sort'.l:sortmode.' /.\{-}\ze'.a:symbol.'/'
     endif
     " Sort by groups
     execute 'sort'.l:sortmode.' /.\{-}\ze'.a:symbol.'/'
     for l:g in l:groups
+        let l:pat=a:symbol.l:g.'.*$'
+        if(exists("g:Todo_txt_debug"))
+            echo l:pat
         endif
         normal gg
         " Find the beginning of the group
@@ -217,6 +259,9 @@ function! todo#HierarchicalSort(symbol, symbolsub, dolastsort)
                     execute l:subgroupBegin.','.l:subgroupEnd.'sort'.l:sortmodefinal
                 endfor
             else
+                " Sort by priority
+                if(exists("g:Todo_txt_debug"))
+                    echo 'execute '.l:groupBegin.','.l:groupEnd.'sort'.l:sortmodefinal
                 endif
                 execute l:groupBegin.','.l:groupEnd.'sort'.l:sortmodefinal
             endif
@@ -231,7 +276,7 @@ function! GetGroups(symbol,begin, end)
 function! GetGroups(symbol,begin, end)
     let l:curline=a:begin
     let l:groups=[]
-    while l:curline <= a:end
+    while l:curline <= a:end
         let l:curproj=strpart(matchstr(getline(l:curline),a:symbol.'\S*'),1)
         if l:curproj != "" && index(l:groups,l:curproj) == -1
             let l:groups=add(l:groups , l:curproj)
@@ -254,7 +299,7 @@ endfunction
 " Completion {{{1
 
 " Simple keyword completion on all buffers {{{2
-function! TodoKeywordComplete(base)
+function! TodoKeywordComplete(base)
     " Search for matches
     let res = []
     for bufnr in range(1,bufnr('$'))
@@ -270,6 +315,25 @@ function! TodoKeywordComplete(base)
     endfor
     return res
 endfunction
+
+" Convert an item to the completion format and add it to the completion list
+fun! TodoAddToCompletionList(list,item,opp)
+    " Create the definitive item
+    let resitem={}
+    let resitem.word=a:item.word
+    let resitem.info=a:opp=='+'?"Projects":"Contexts"
+    let resitem.info.=": ".join(a:item.related, ", ")
+                \."\nBuffers: ".join(a:item.buffers, ", ")
+    call add(a:list,resitem)
+endfun
+
+fun! TodoCopyTempItem(item)
+    let ret={}
+    let ret.word=a:item.word
+    let ret.related=[a:item.related]
+    let ret.buffers=[a:item.buffers]
+    return ret
+endfun
 
 " Intelligent completion for projects and Contexts {{{2
 fun! todo#Complete(findstart, base)
@@ -290,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={}
@@ -304,10 +368,7 @@ fun! todo#Complete(findstart, base)
         call sort(res)
         " Here all results are sorted in res, but we need to merge them
         let ret=[]
-        if res != []
-            let curitem={}
-            let curitem.word=res[0].word
-            let curitem.related=[]
+        if res != []
             let curitem=TodoCopyTempItem(res[0])
             for it in res
                 if curitem.word==it.word
@@ -318,19 +379,14 @@ fun! todo#Complete(findstart, base)
                     if index(curitem.buffers,it.buffers) <0
                         call add(curitem.buffers,it.buffers)
                     endif
-                else
-                    " Create the definitive item
-                    let resitem={}
-                    let resitem.word=curitem.word
-                    let resitem.info=opp=='+'?"Projects":"Contexts"
-                    let resitem.info.=": ".join(curitem.related, ", ")
-                                \."\nBuffers: ".join(curitem.buffers, ", ")
+                else
+                    " Add to list
                     call TodoAddToCompletionList(ret,curitem,opp)
-                    " Init new item from it
-                    let curitem.word=it.word
-                    let curitem.related=[it.related]
+                    " Init new item from it
                     let curitem=TodoCopyTempItem(it)
                 endif
+            endfor
+            " Don't forget to add the list item
             call TodoAddToCompletionList(ret,curitem,opp)
         endif
         return ret

autoload/todo/txt.vim

@@ -0,0 +1,123 @@
+" File:        todo.txt.vim
+" Description: Todo.txt filetype detection
+" Author:      Leandro Freitas <freitass@gmail.com>
+" License:     Vim license
+" Website:     http://github.com/freitass/todo.txt-vim
+" Version:     0.4
+
+" Export Context Dictionary for unit testing {{{1
+function! s:get_SID()
+    return matchstr(expand('<sfile>'), '<SNR>\d\+_')
+endfunction
+let s:SID = s:get_SID()
+delfunction s:get_SID
+
+function! todo#txt#__context__()
+    return { 'sid': s:SID, 'scope': s: }
+endfunction
+
+" Functions {{{1
+function! s:remove_priority()
+    :s/^(\w)\s\+//ge
+endfunction
+
+function! s:get_current_date()
+    return strftime('%Y-%m-%d')
+endfunction
+
+function! todo#txt#prepend_date()
+    execute 'normal! I' . s:get_current_date() . ' '
+endfunction
+
+function! todo#txt#replace_date()
+    let current_line = getline('.')
+    if (current_line =~ '^\(([a-zA-Z]) \)\?\d\{2,4\}-\d\{2\}-\d\{2\} ') &&
+                \ exists('g:todo_existing_date') && g:todo_existing_date == 'n'
+        return
+    endif
+    execute 's/^\(([a-zA-Z]) \)\?\(\d\{2,4\}-\d\{2\}-\d\{2\} \)\?/\1' . s:get_current_date() . ' /'
+endfunction
+
+function! todo#txt#mark_as_done()
+    call s:remove_priority()
+    call todo#txt#prepend_date()
+    normal! Ix 
+endfunction
+
+function! todo#txt#mark_all_as_done()
+    :g!/^x /:call todo#txt#mark_as_done()
+endfunction
+
+function! s:append_to_file(file, lines)
+    let l:lines = []
+
+    " Place existing tasks in done.txt at the beggining of the list.
+    if filereadable(a:file)
+        call extend(l:lines, readfile(a:file))
+    endif
+
+    " Append new completed tasks to the list.
+    call extend(l:lines, a:lines)
+
+    " Write to file.
+    call writefile(l:lines, a:file)
+endfunction
+
+function! todo#txt#remove_completed()
+    " Check if we can write to done.txt before proceeding.
+
+    let l:target_dir = expand('%:p:h')
+    let l:todo_file = expand('%:p')
+    let l:done_file = substitute(substitute(l:todo_file, 'todo.txt$', 'done.txt', ''), 'Todo.txt$', 'Done.txt', '')
+    if !filewritable(l:done_file) && !filewritable(l:target_dir)
+        echoerr "Can't write to file 'done.txt'"
+        return
+    endif
+
+    let l:completed = []
+    :g/^x /call add(l:completed, getline(line(".")))|d
+    call s:append_to_file(l:done_file, l:completed)
+endfunction
+
+function! todo#txt#sort_by_context() range
+    execute a:firstline . "," . a:lastline . "sort /\\(^\\| \\)\\zs@[^[:blank:]]\\+/ r"
+endfunction
+
+function! todo#txt#sort_by_project() range
+    execute a:firstline . "," . a:lastline . "sort /\\(^\\| \\)\\zs+[^[:blank:]]\\+/ r"
+endfunction
+
+function! todo#txt#sort_by_date() range
+    let l:date_regex = "\\d\\{2,4\\}-\\d\\{2\\}-\\d\\{2\\}"
+    execute a:firstline . "," . a:lastline . "sort /" . l:date_regex . "/ r"
+    execute a:firstline . "," . a:lastline . "g!/" . l:date_regex . "/m" . a:lastline
+endfunction
+
+function! todo#txt#sort_by_due_date() range
+    let l:date_regex = "due:\\d\\{2,4\\}-\\d\\{2\\}-\\d\\{2\\}"
+    execute a:firstline . "," . a:lastline . "sort /" . l:date_regex . "/ r"
+    execute a:firstline . "," . a:lastline . "g!/" . l:date_regex . "/m" . a:lastline
+endfunction
+
+" Increment and Decrement The Priority
+:set nf=octal,hex,alpha
+
+function! todo#txt#prioritize_increase()
+    normal! 0f)h

+endfunction
+
+function! todo#txt#prioritize_decrease()
+    normal! 0f)h
+endfunction
+
+function! todo#txt#prioritize_add(priority)
+    " Need to figure out how to only do this if the first visible letter in a line is not (
+    :call todo#txt#prioritize_add_action(a:priority)
+endfunction
+
+function! todo#txt#prioritize_add_action(priority)
+    execute 's/^\(([a-zA-Z]) \)\?/(' . a:priority . ') /'
+endfunction
+
+" Modeline {{{1
+" vim: ts=8 sw=4 sts=4 et foldenable foldmethod=marker foldcolumn=1

doc/todo.txt

@@ -31,6 +31,18 @@ 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.
+
+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).
+
 Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to
 update your vimrc (see |TodoTxt-Completion|).
 
@@ -191,6 +203,12 @@ For more information on the available flags see |:sort|
 ===============================================================================
 6. Mappings                                                *TodoTxt-Mappings* ~
 
+By default todo-txt.vim set all the mappings secribed in this section. To
+prevent this behavior, add the following line to your vimrc
+>
+   let g:Todo_txt_do_not_map=1
+<
+
 6.1 Sort                                                         *TodoTxt-Sort*
 
     `<LocalLeader>s` : Sort the file by priority
@@ -199,7 +217,7 @@ For more information on the available flags see |:sort|
 
     `<LocalLeader>s@` : Sort the file on @Contexts
 
-    `<LocalLeader>s@` : Sort the file on due dates
+    `<LocalLeader>sd` : Sort the file on due dates
 
     `<LocalLeader>sc` : Sort the file by context then by priority
 

ftdetect/todo.vim

@@ -3,7 +3,7 @@
 " Author:      David Beniamine <david@beniamine.net>, Leandro Freitas <freitass@gmail.com>
 " License:     Vim license
 " Website:     http://github.com/dbeniamine/todo.txt-vim
-" Version:     0.7.2
+" vim: ts=4 sw=4 :help tw=78 cc=80
 
 autocmd BufNewFile,BufRead [Tt]odo.txt set filetype=todo
 autocmd BufNewFile,BufRead [Tt]odo-\d\\\{4\}-\d\\\{2\}-\d\\\{2\}.txt set filetype=todo

ftplugin/todo.vim

@@ -3,13 +3,18 @@
 " Author:      David Beniamine <David@Beniamine.net>, Leandro Freitas <freitass@gmail.com>
 " License:     Vim license
 " Website:     http://github.com/dbeniamine/todo.txt-vim
-" Version:     0.7.2
 " vim: ts=4 sw=4 :help tw=78 cc=80
 
 " Save context {{{1
 let s:save_cpo = &cpo
 set cpo&vim
 
+if exists("g:Todo_txt_loaded")
+    finish
+else
+    let g:Todo_txt_loaded=0.7.6
+endif
+
 " General options {{{1
 " Some options lose their values when window changes. They will be set every
 " time this script is invocated, which is whenever a file of this type is
@@ -19,139 +24,53 @@ setlocal wrapmargin=0
 
 " Mappings {{{1
 
+if !exists("g:Todo_txt_do_not_map")
 " Sort todo by (first) context
-if !hasmapto("<localleader>sc",'n')
     noremap <silent><localleader>sc :call todo#HierarchicalSort('@', '', 1)<CR>
-endif
-if !hasmapto("<localleader>scp",'n')
-    noremap <silent><localleader>scp :call todo#HierarchicalSort('@', '+', 1)<CR>
-endif
-" Sort todo by (first) project
-if !hasmapto("<localleader>sp",'n')
-    noremap <silent><localleader>sp :call todo#HierarchicalSort('+', '',1)<CR>
-endif
-if !hasmapto("<localleader>spc",'n')
-    noremap <silent><localleader>spc :call todo#HierarchicalSort('+', '@',1)<CR>
-endif
 
+    noremap <silent><localleader>scp :call todo#HierarchicalSort('@', '+', 1)<CR>
+" Sort todo by (first) project
+    noremap <silent><localleader>sp :call todo#HierarchicalSort('+', '',1)<CR>
+    noremap <silent><localleader>spc :call todo#HierarchicalSort('+', '@',1)<CR>
 
 " Sort tasks {{{2
-if !hasmapto("<localleader>s",'n')
     nnoremap <script> <silent> <buffer> <LocalLeader>s :call todo#Sort()<CR>
-endif
-
-if !hasmapto("<LocalLeader>s@",'n')
     nnoremap <script> <silent> <buffer> <LocalLeader>s@ :sort /.\{-}\ze@/ <CR>
-endif
-
-if !hasmapto("<LocalLeader>s+",'n')
     nnoremap <script> <silent> <buffer> <LocalLeader>s+ :sort /.\{-}\ze+/ <CR>
-endif
+" Priorities {{{2
+    noremap <script> <silent> <buffer> <LocalLeader>j :call todo#PrioritizeIncrease()<CR>
+    noremap <script> <silent> <buffer> <LocalLeader>k :call todo#PrioritizeDecrease()<CR>
 
-if !hasmapto("<LocalLeader>j",'n')
-    nnoremap <script> <silent> <buffer> <LocalLeader>j :call todo#PrioritizeIncrease()<CR>
-endif
-
-if !hasmapto("<LocalLeader>j",'v')
-    vnoremap <script> <silent> <buffer> <LocalLeader>j :call todo#PrioritizeIncrease()<CR>
-endif
-
-if !hasmapto("<LocalLeader>k",'n')
-    nnoremap <script> <silent> <buffer> <LocalLeader>k :call todo#PrioritizeDecrease()<CR>
-endif
-
-if !hasmapto("<LocalLeader>k",'v')
-    vnoremap <script> <silent> <buffer> <LocalLeader>k :call todo#PrioritizeDecrease()<CR>
-endif
-
-if !hasmapto("<LocalLeader>a",'n')
-    nnoremap <script> <silent> <buffer> <LocalLeader>a :call todo#PrioritizeAdd('A')<CR>
-endif
-
-if !hasmapto("<LocalLeader>a",'i')
-    inoremap <script> <silent> <buffer> <LocalLeader>a <ESC>:call todo#PrioritizeAdd('A')<CR>i
-endif
-
-if !hasmapto("<LocalLeader>a",'v')
-    vnoremap <script> <silent> <buffer> <LocalLeader>a :call todo#PrioritizeAdd('A')<CR>
-endif
-
-if !hasmapto("<LocalLeader>b",'n')
-    nnoremap <script> <silent> <buffer> <LocalLeader>b :call todo#PrioritizeAdd('B')<CR>
-endif
-
-if !hasmapto("<LocalLeader>b",'i')
-    inoremap <script> <silent> <buffer> <LocalLeader>b <ESC>:call todo#PrioritizeAdd('B')<CR>i
-endif
-
-if !hasmapto("<LocalLeader>b",'v')
-    vnoremap <script> <silent> <buffer> <LocalLeader>b :call todo#PrioritizeAdd('B')<CR>
-endif
-
-if !hasmapto("<LocalLeader>c",'n')
-    nnoremap <script> <silent> <buffer> <LocalLeader>c :call todo#PrioritizeAdd('C')<CR>
-endif
-if !hasmapto("<LocalLeader>c",'i')
-    inoremap <script> <silent> <buffer> <LocalLeader>c <ESC>:call todo#PrioritizeAdd('C')<CR>i
-endif
-
-if !hasmapto("<LocalLeader>c",'v')
-    vnoremap <script> <silent> <buffer> <LocalLeader>c :call todo#PrioritizeAdd('C')<CR>
-endif
+    noremap <script> <silent> <buffer> <LocalLeader>a :call todo#PrioritizeAdd('A')<CR>
+    noremap <script> <silent> <buffer> <LocalLeader>b :call todo#PrioritizeAdd('B')<CR>
+    noremap <script> <silent> <buffer> <LocalLeader>c :call todo#PrioritizeAdd('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("due:",'i')
     inoremap <script> <silent> <buffer> due: due:<C-R>=strftime("%Y-%m-%d")<CR>
-endif
-
-if !hasmapto("DUE:",'i')
     inoremap <script> <silent> <buffer> DUE: DUE:<C-R>=strftime("%Y-%m-%d")<CR>
-endif
 
-if !hasmapto("<localleader>d",'n')
-    nnoremap <script> <silent> <buffer> <localleader>d :call todo#PrependDate()<CR>
-endif
-
-if !hasmapto("<localleader>d",'v')
-    vnoremap <script> <silent> <buffer> <localleader>d :call todo#PrependDate()<CR>
-endif
+    noremap <script> <silent> <buffer> <localleader>d :call todo#PrependDate()<CR>
 
 " Mark done {{{2
-if !hasmapto("<localleader>x",'n')
-    nnoremap <script> <silent> <buffer> <localleader>x :call todo#ToggleMarkAsDone('')<CR>
-endif
-
-if !hasmapto("<localleader>x",'v')
-    vnoremap <script> <silent> <buffer> <localleader>x :call todo#ToggleMarkAsDone('')<CR>
-endif
+    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
-if !hasmapto("<localleader>C",'n')
-    nnoremap <script> <silent> <buffer> <localleader>C :call todo#ToggleMarkAsDone('Cancelled')<CR>
-endif
-
-if !hasmapto("<localleader>C",'v')
-    vnoremap <script> <silent> <buffer> <localleader>C :call todo#ToggleMarkAsDone('Cancelled')<CR>
-endif
-
-
+    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
-if !hasmapto("<localleader>X",'n')
-    nnoremap <script> <silent> <buffer> <localleader>X :call todo#MarkAllAsDone('')<CR>
-endif
+    noremap <script> <silent> <buffer> <localleader>X :call todo#MarkAllAsDone()<CR>
 
 " Remove completed {{{2
-if !hasmapto("<localleader>D",'n')
     nnoremap <script> <silent> <buffer> <localleader>D :call todo#RemoveCompleted()<CR>
-endif
 
 " Sort by due: date {{{2
-if !hasmapto("<localleader>sd".'n')
     nnoremap <script> <silent> <buffer> <localleader>sd :call todo#SortDue()<CR>
 endif
 
@@ -185,4 +104,3 @@ endfunction
 
 " Restore context {{{1
 let &cpo = s:save_cpo
-" Modeline {{{1

syntax/python/dateregex/dateregex/__init__.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# File:        __init__.py
+# Author:      Guilherme Victal <guilherme at victal.eti.br>
+# Description: Dateregex library entry point
+# License:     Vim license
+# Website:     http://github.com/freitass/todo.txt-vim
+# Version:     0.1
+
+from dateregex.after import regex_date_after
+from dateregex.before import regex_date_before

syntax/python/dateregex/dateregex/after.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# File:        after.py
+# Author:      Guilherme Victal <guilherme at victal.eti.br>
+# Description: Generates regexes after a certain date
+# License:     Vim license
+# Website:     http://github.com/freitass/todo.txt-vim
+# Version:     0.1
+
+from datetime import date, timedelta, MAXYEAR
+
+
+def _year_regex_after(year):
+    if int(year) > MAXYEAR:
+        return None
+
+    year_regex = r'(\d+\d{%s}' % len(year)
+    for idx, digit in enumerate(year):
+        if digit != '9':
+            regex = '|' + year[0:idx]
+            regex += '9' if digit == '8' else '[%s-9]' % str(int(digit) + 1)
+            if idx < len(year) - 1:
+                regex += '\d{%s}' % (len(year) - (idx + 1))
+            year_regex += regex
+
+    year_regex += ')'
+    return '-'.join((year_regex, r'\d{2}', r'\d{2}'))
+
+
+def _month_regex_after(year, month):
+    if month == '12':
+        return None
+
+    digit1, digit2 = month
+    if digit1 == '1':
+        month_regex = r'12' if month == '11' else r'1[12]'
+    else:
+        month_regex = r'1[0-2]'
+        if digit2 != '9':
+            if digit2 == '8':
+                month_regex = r'(' + month_regex + r'|09)'
+            else:
+                month_regex = r'(' + month_regex + r'|0[%s-9])'
+                month_regex = month_regex % str(int(digit2) + 1)
+    return '-'.join((year, month_regex, r'\d{2}'))
+
+def _day_regex_after(year, month, day):
+    last_month_day = str((date(int(year), (int(month) + 1) % 12, 1) + - date.resolution).day)
+    if day == last_month_day:
+        return None
+    day_regex = r'('
+    digit1, digit2 = day
+    last_digit1, last_digit2 = last_month_day
+    if digit1 == last_digit1:
+        day_regex = last_month_day if int(digit2) == int(last_digit2) - 1 else last_digit1 + r'[%s-%s]' % (str(int(digit2) + 1), last_digit2)
+    else:
+        day_regex = r'('
+        day_regex += last_digit1 if int(digit1) == int(last_digit1) - 1 else r'[%s-%s]' % (str(int(digit1) + 1), last_digit1)
+        day_regex +=r'\d'
+        if digit2 < '9':
+            day_regex += '|' + digit1
+            day_regex += '9' if digit2 == '8' else r'[%s-9]' % str(int(digit2) + 1)
+
+        day_regex += ')'
+    return '-'.join((year, month, day_regex))
+
+
+def regex_date_after(given_date):
+    year, month, day = given_date.isoformat().split('-')
+
+    year_regex = _year_regex_after(year)
+    month_regex = _month_regex_after(year, month)
+    day_regex = _day_regex_after(year, month, day)
+
+    date_regex = '(' + year_regex if year_regex else '('
+    date_regex += ('|' + month_regex) if month_regex else ''
+    date_regex += ('|' + day_regex) if day_regex else ''
+    date_regex += ')'
+    return date_regex
+
+
+def __main():
+    import re
+    date_regex = regex_date_after(date(1999,12,31))
+    print(date_regex)
+    pattern = re.compile(date_regex)
+
+
+    d = date.today() + date.resolution
+    assert pattern.match(date.strftime(d, '%Y-%m-%d')) is not None
+    print(date.strftime(d, '%Y-%m-%d') + ' is okay')
+    d += date.resolution
+
+if __name__ == '__main__':
+    __main()

syntax/python/dateregex/dateregex/before.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# File:        before.py
+# Author:      Guilherme Victal <guilherme at victal.eti.br>
+# Description: Generates regexes before a certain date
+# License:     Vim license
+# Website:     http://github.com/freitass/todo.txt-vim
+# Version:     0.1
+
+from datetime import date, timedelta, MINYEAR
+
+def _year_regex_before(year):
+    if int(year) <= MINYEAR:
+        return None
+    year_regex = r'('
+    year_regex += r'\d{1,%s}' % str(len(year) - 1) if len(year) > 1 else ''
+    for idx, digit in enumerate(year):
+        if digit != '0':
+            regex = '|' + year[0:idx]
+            regex += '0' if digit == '1' else '[0-%s]' % str(int(digit) - 1)
+            if idx < len(year) - 1:
+                regex += '\d{%s}' % (len(year) - (idx + 1))
+            year_regex += regex
+
+    year_regex += ')'
+    return '-'.join((year_regex, r'\d{2}', r'\d{2}'))
+
+def _month_regex_before(year, month):
+    if month == '01':
+        return None
+
+    digit1, digit2 = month
+    if digit1 == '0':
+        month_regex = '01' if month == '02' else r'0[1-%s]' % str(int(digit2) - 1)
+    elif month == '10':
+        month_regex = r'0\d'
+    elif month == '11':
+        month_regex = r'(0\d|10)'
+    else:
+        month_regex = r'(0\d|1[01])'
+
+    return '-'.join((year, month_regex, r'\d{2}'))
+
+def _day_regex_before(year, month, day):
+    if day == '01':
+        return None
+    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
+    if digit1 == '0':
+        day_regex = '01' if day == '02' else r'0[1-%s]' % str(int(digit2) - 1)
+    else:
+        day_regex = r'('
+        day_regex += '0' if digit1 == '1' else r'[0-%s]' % str(int(digit1) - 1)
+        day_regex += r'\d'
+        if digit2 != '0':
+            day_regex += '|'
+            day_regex += digit1
+            day_regex += '0' if digit2 == '1' else r'[0-%s]' % str(int(digit2) - 1)
+        day_regex += ')'
+
+    return '-'.join((year, month, day_regex))
+
+
+
+
+def regex_date_before(given_date):
+    year, month, day = given_date.isoformat().split('-')
+
+    year_regex = _year_regex_before(year)
+    month_regex = _month_regex_before(year, month)
+    day_regex = _day_regex_before(year, month, day)
+
+    date_regex = '(' + year_regex if year_regex else '('
+    date_regex += ('|' + month_regex) if month_regex else ''
+    date_regex += ('|' + day_regex) if day_regex else ''
+    date_regex += ')'
+    return date_regex

syntax/python/todo.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+# File:        todo.py
+# Description: Todo.txt overdue date syntax script
+# License:     Vim license
+# Website:     http://github.com/freitass/todo.txt-vim
+# Version:     0.1
+
+import vim
+import os
+import sys
+from datetime import date
+
+dateregex_dir = os.path.join(vim.eval('s:script_dir'), 'dateregex')
+if os.path.isdir(dateregex_dir):
+    sys.path.insert(0, dateregex_dir)
+
+def add_due_date_syntax_highlight():
+    try:
+        from dateregex import regex_date_before
+    except ImportError:
+        print("dateregex module not found. Overdue dates won't be highlighted")
+        return
+
+    regex = regex_date_before(date.today())
+    regex = r'(^|<)due:%s(>|$)' % regex
+
+    vim.command("syntax match OverDueDate '\\v%s'" % regex)
+    vim.command("highlight  default  link  OverDueDate       Error")
+
+add_due_date_syntax_highlight()

syntax/todo.vim

@@ -3,39 +3,39 @@
 " Author:      David Beniamine <David@Beniamine.net>,Leandro Freitas <freitass@gmail.com>
 " License:     Vim license
 " Website:     http://github.com/dbeniamine/todo.txt-vim
-" Version:     0.7.2
+" vim: ts=4 sw=4 :help tw=78 cc=80
 
 if exists("b:current_syntax")
     finish
 endif
 
-syntax  match  TodoDone       '^[xX]\s.\+$'               contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityA  '^([aA])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityB  '^([bB])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityC  '^([cC])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityD  '^([dD])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityE  '^([eE])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityF  '^([fF])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityG  '^([gG])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityH  '^([hH])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityI  '^([iI])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityJ  '^([jJ])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityK  '^([kK])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityL  '^([lL])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityM  '^([mM])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityN  '^([nN])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityO  '^([oO])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityP  '^([pP])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityQ  '^([qQ])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityR  '^([rR])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityS  '^([sS])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityT  '^([tT])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityU  '^([uU])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityV  '^([vV])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityW  '^([wW])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityX  '^([xX])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityY  '^([yY])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
-syntax  match  TodoPriorityZ  '^([zZ])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext
+syntax  match  TodoDone       '^[xX]\s.\+$'               contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityA  '^([aA])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityB  '^([bB])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityC  '^([cC])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityD  '^([dD])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityE  '^([eE])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityF  '^([fF])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityG  '^([gG])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityH  '^([hH])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityI  '^([iI])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityJ  '^([jJ])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityK  '^([kK])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityL  '^([lL])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityM  '^([mM])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityN  '^([nN])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityO  '^([oO])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityP  '^([pP])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityQ  '^([qQ])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityR  '^([rR])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityS  '^([sS])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityT  '^([tT])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityU  '^([uU])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityV  '^([vV])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityW  '^([wW])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityX  '^([xX])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityY  '^([yY])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
+syntax  match  TodoPriorityZ  '^([zZ])\s.\+$'             contains=TodoKey,TodoDate,TodoProject,TodoContext,OverDueDate
 syntax  match  TodoDate       '\d\{2,4\}-\d\{2\}-\d\{2\}' contains=NONE
 syntax  match  TodoKey        '\S*\S:\S\S*'                   contains=TodoDate
 syntax  match  TodoProject    '\(^\|\W\)+[^[:blank:]]\+'  contains=NONE
@@ -51,4 +51,12 @@ highlight  default  link  TodoDate       PreProc
 highlight  default  link  TodoProject    Special
 highlight  default  link  TodoContext    Special
 
+let b:curdir = expand('<sfile>:p:h')
+let s:script_dir = b:curdir . "/python/"
+if has('python3')
+    execute "py3file " . s:script_dir. "todo.py"
+elseif has('python')
+    execute "pyfile " . s:script_dir. "todo.py"
+endif
+
 let b:current_syntax = "todo"