From 3a87fd222e7635b4e5fa767915c60e1c37844756 Mon Sep 17 00:00:00 2001
From: Hans Anderson <handerson@executiveboard.com>
Date: Fri, 31 Oct 2014 18:23:27 -0500
Subject: [PATCH 1/3] Easy to add a priority to the current line

- several new leader keys to add priority to the current line
- updated README
---
 README.markdown   | 14 ++++++++++
 ftplugin/todo.vim | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/README.markdown b/README.markdown
index f330803..9335148 100644
--- a/README.markdown
+++ b/README.markdown
@@ -10,6 +10,20 @@ mappings, to help with edition of these files:
 
 `<leader>-s` : Sort the file
 
+`<leader>-s+` : Sort the file on +Projects
+
+`<leader>-s@` : Sort the file on @Contexts
+
+`<leader>-j` : Lower the priority of the current line
+
+`<leader>-k` : Increase the priority of the current line
+
+`<leader>-a` : Add the priority (A) to the current line
+
+`<leader>-c` : Add the priority (B) to the current line
+
+`<leader>-b` : Add the priority (C) to the current line
+
 `<leader>-d` : Insert the current date
 
 `date<tab>`  : (Insert mode) Insert the current date
diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index e892288..7dd9f39 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -45,6 +45,74 @@ if !hasmapto("<leader>s",'n')
     nnoremap <script> <silent> <buffer> <leader>s :sort<CR>
 endif
 
+if !hasmapto("<leader>s@",'n')
+    nnoremap <script> <silent> <buffer> <leader>s@ :sort /.\{-}\ze@/ <CR>
+endif
+
+if !hasmapto("<leader>s+",'n')
+    nnoremap <script> <silent> <buffer> <leader>s+ :sort /.\{-}\ze+/ <CR>
+endif
+
+" Increment and Decrement The Priority
+:set nf=octal,hex,alpha
+
+function! TodoTxtPrioritizeIncrease()
+    normal! 0f)h

+endfunction
+
+function! TodoTxtPrioritizeDecrease()
+    normal! 0f)h
+endfunction
+
+function! TodoTxtPrioritizeAdd (priority)
+    " Need to figure out how to only do this if the first visible letter in a line is not (
+    :call TodoTxtPrioritizeAddAction(a:priority)
+endfunction
+
+function! TodoTxtPrioritizeAddAction (priority)
+    execute "normal! mq0i(".a:priority.") \<esc>`q"
+endfunction
+
+if !hasmapto("<leader>j",'n')
+    nnoremap <script> <silent> <buffer> <leader>j :call TodoTxtPrioritizeIncrease()<CR>
+endif
+
+if !hasmapto("<leader>j",'v')
+    vnoremap <script> <silent> <buffer> <leader>j :call TodoTxtPrioritizeIncrease()<CR>
+endif
+
+if !hasmapto("<leader>k",'n')
+    nnoremap <script> <silent> <buffer> <leader>k :call TodoTxtPrioritizeDecrease()<CR>
+endif
+
+if !hasmapto("<leader>k",'v')
+    vnoremap <script> <silent> <buffer> <leader>k :call TodoTxtPrioritizeDecrease()<CR>
+endif
+
+if !hasmapto("<leader>a",'n')
+    nnoremap <script> <silent> <buffer> <leader>a :call TodoTxtPrioritizeAdd('A')<CR>
+endif
+
+if !hasmapto("<leader>a",'v')
+    vnoremap <script> <silent> <buffer> <leader>a :call TodoTxtPrioritizeAdd('A')<CR>
+endif
+
+if !hasmapto("<leader>b",'n')
+    nnoremap <script> <silent> <buffer> <leader>b :call TodoTxtPrioritizeAdd('B')<CR>
+endif
+
+if !hasmapto("<leader>b",'v')
+    vnoremap <script> <silent> <buffer> <leader>b :call TodoTxtPrioritizeAdd('B')<CR>
+endif
+
+if !hasmapto("<leader>c",'n')
+    nnoremap <script> <silent> <buffer> <leader>c :call TodoTxtPrioritizeAdd('C')<CR>
+endif
+
+if !hasmapto("<leader>c",'v')
+    vnoremap <script> <silent> <buffer> <leader>c :call TodoTxtPrioritizeAdd('C')<CR>
+endif
+
 " Insert date {{{2
 if !hasmapto("date<Tab>",'i')
     inoremap <script> <silent> <buffer> date<Tab> <C-R>=strftime("%Y-%m-%d")<CR>

From 8d8913a6006221bd867f0bdf27883b456706b39f Mon Sep 17 00:00:00 2001
From: Hans Anderson <handerson@executiveboard.com>
Date: Fri, 31 Oct 2014 18:23:27 -0500
Subject: [PATCH 2/3] Easy to add a priority to the current line

- several new leader keys to add priority to the current line
- updated README
---
 README.markdown   | 10 ++++++++--
 ftplugin/todo.vim | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 6eefede..9335148 100644
--- a/README.markdown
+++ b/README.markdown
@@ -14,9 +14,15 @@ mappings, to help with edition of these files:
 
 `<leader>-s@` : Sort the file on @Contexts
 
-`<leader>-j` : Lower the priority (cursor must by on priority)
+`<leader>-j` : Lower the priority of the current line
 
-`<leader>-k` : Increase the priority (cursor must by on priority)
+`<leader>-k` : Increase the priority of the current line
+
+`<leader>-a` : Add the priority (A) to the current line
+
+`<leader>-c` : Add the priority (B) to the current line
+
+`<leader>-b` : Add the priority (C) to the current line
 
 `<leader>-d` : Insert the current date
 
diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index a9b73a6..7dd9f39 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -64,6 +64,15 @@ function! TodoTxtPrioritizeDecrease()
     normal! 0f)h
 endfunction
 
+function! TodoTxtPrioritizeAdd (priority)
+    " Need to figure out how to only do this if the first visible letter in a line is not (
+    :call TodoTxtPrioritizeAddAction(a:priority)
+endfunction
+
+function! TodoTxtPrioritizeAddAction (priority)
+    execute "normal! mq0i(".a:priority.") \<esc>`q"
+endfunction
+
 if !hasmapto("<leader>j",'n')
     nnoremap <script> <silent> <buffer> <leader>j :call TodoTxtPrioritizeIncrease()<CR>
 endif
@@ -80,6 +89,30 @@ if !hasmapto("<leader>k",'v')
     vnoremap <script> <silent> <buffer> <leader>k :call TodoTxtPrioritizeDecrease()<CR>
 endif
 
+if !hasmapto("<leader>a",'n')
+    nnoremap <script> <silent> <buffer> <leader>a :call TodoTxtPrioritizeAdd('A')<CR>
+endif
+
+if !hasmapto("<leader>a",'v')
+    vnoremap <script> <silent> <buffer> <leader>a :call TodoTxtPrioritizeAdd('A')<CR>
+endif
+
+if !hasmapto("<leader>b",'n')
+    nnoremap <script> <silent> <buffer> <leader>b :call TodoTxtPrioritizeAdd('B')<CR>
+endif
+
+if !hasmapto("<leader>b",'v')
+    vnoremap <script> <silent> <buffer> <leader>b :call TodoTxtPrioritizeAdd('B')<CR>
+endif
+
+if !hasmapto("<leader>c",'n')
+    nnoremap <script> <silent> <buffer> <leader>c :call TodoTxtPrioritizeAdd('C')<CR>
+endif
+
+if !hasmapto("<leader>c",'v')
+    vnoremap <script> <silent> <buffer> <leader>c :call TodoTxtPrioritizeAdd('C')<CR>
+endif
+
 " Insert date {{{2
 if !hasmapto("date<Tab>",'i')
     inoremap <script> <silent> <buffer> date<Tab> <C-R>=strftime("%Y-%m-%d")<CR>

From 2a66ed26ff0ebb38f34f492e8517d56883026198 Mon Sep 17 00:00:00 2001
From: Leandro Freitas <freitass@gmail.com>
Date: Sat, 1 Nov 2014 19:44:07 -0200
Subject: [PATCH 3/3] Updated documentation and minor fixes.

---
 README.markdown   |  3 +--
 Todo.txt          | 11 ++++++-----
 doc/todo.txt      | 10 ++++++++--
 ftplugin/todo.vim |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/README.markdown b/README.markdown
index e2b9fdd..7239a42 100644
--- a/README.markdown
+++ b/README.markdown
@@ -5,8 +5,7 @@
     cp -R * ~/.vim
 
 
-This plugin gives syntax highlighting to [todo.txt](http://todotxt.com/) files. It also defines a few
-mappings, to help with editing these files:
+This plugin gives syntax highlighting to [todo.txt](http://todotxt.com/) files. It also defines a few mappings, to help with editing these files:
 
 `<leader>-s` : Sort the file
 
diff --git a/Todo.txt b/Todo.txt
index ad5e0cb..5d904a1 100644
--- a/Todo.txt
+++ b/Todo.txt
@@ -1,8 +1,4 @@
-(A) 2011-05-30 Map commands to add, rm, ls, pri, depri etc @ftplugin
-(A) 2011-06-06 Check file syntax @syntax
-(B) 2011-05-31 Start documentation @doc
-(C) 2011-06-01 Improve syntax file @syntax
-x 2014-04-27 2011-05-30 Contact main project for reference
+2014-11-01 Find a way to import text into markdown and vim doc @doc
 x 2011-05-30 Create README.markdown to be published in github @doc
 x 2011-05-30 Implement colorized priorities @syntax
 x 2011-05-30 Implement filetype detection @ftdetect
@@ -11,3 +7,8 @@ x 2011-05-31 Highlight date, project and context of tasks with no priority @synt
 x 2011-05-31 Stop breaking lines automatically @ftplugin
 x 2011-06-06 Easier date input @ftplugin
 x 2011-06-06 Implement foldings @ftplugin
+x 2014-04-27 2011-05-30 Contact main project for reference
+x 2014-11-01 2011-05-30 Map commands to add, rm, ls, pri, depri etc @ftplugin
+x 2014-11-01 2011-05-31 Start documentation @doc
+x 2014-11-01 2011-06-01 Improve syntax file @syntax
+x 2014-11-01 2011-06-06 Check file syntax @syntax
diff --git a/doc/todo.txt b/doc/todo.txt
index de3bc90..1a04834 100644
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -9,9 +9,15 @@ COMMANDS                                                       *todo-commands*
 
 `<leader>-s@` : Sort the file on @Contexts
 
-`<leader>-j` : Lower the priority (cursor must by on priority)
+`<leader>-j` : Lower the priority of the current line
 
-`<leader>-k` : Increase the priority (cursor must by on priority)
+`<leader>-k` : Increase the priority of the current line
+
+`<leader>-a` : Add the priority (A) to the current line
+
+`<leader>-c` : Add the priority (B) to the current line
+
+`<leader>-b` : Add the priority (C) to the current line
 
 `<leader>-d` : Insert the current date
 
diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index 3dd47f9..dce3bb2 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -16,7 +16,7 @@ set cpo&vim
 setlocal textwidth=0
 setlocal wrapmargin=0
 
-" Functions {{{!
+" Functions {{{1
 function! s:TodoTxtRemovePriority()
     :s/^(\w)\s\+//ge
 endfunction
@@ -28,7 +28,7 @@ endfunction
 function! TodoTxtMarkAsDone()
     call s:TodoTxtRemovePriority()
     call TodoTxtPrependDate()
-    normal! Ix
+    normal! Ix 
 endfunction
 
 function! TodoTxtMarkAllAsDone()