Skip to content

Commit

Permalink
Fixes #28
Browse files Browse the repository at this point in the history
  • Loading branch information
freitass committed Apr 17, 2015
1 parent 0e3c5cb commit 1f8b706
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 75 deletions.
26 changes: 13 additions & 13 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@

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
`<localleader>-s` : Sort the file

`<leader>-s+` : Sort the file on +Projects
`<localleader>-s+` : Sort the file on +Projects

`<leader>-s@` : Sort the file on @Contexts
`<localleader>-s@` : Sort the file on @Contexts

`<leader>-sd` : Sort the file on dates
`<localleader>-sd` : Sort the file on dates

`<leader>-j` : Lower the priority of the current line
`<localleader>-j` : Lower the priority of the current line

`<leader>-k` : Increase the priority of the current line
`<localleader>-k` : Increase the priority of the current line

`<leader>-a` : Add the priority (A) to the current line
`<localleader>-a` : Add the priority (A) to the current line

`<leader>-b` : Add the priority (B) to the current line
`<localleader>-b` : Add the priority (B) to the current line

`<leader>-c` : Add the priority (C) to the current line
`<localleader>-c` : Add the priority (C) to the current line

`<leader>-d` : Insert the current date
`<localleader>-d` : Insert the current date

`date<tab>` : (Insert mode) Insert the current date

`<leader>-x` : Mark task as done (inserts current date as completion date)
`<localleader>-x` : Mark task as done (inserts current date as completion date)

`<leader>-X` : Mark all tasks as completed
`<localleader>-X` : Mark all tasks as completed

`<leader>-D` : Move completed tasks to done.txt
`<localleader>-D` : Move completed tasks to done.txt

If you want the help installed, run ":helptags ~/.vim/doc" inside vim after having copied the files.
Then you will be able to get the commands help with: :h todo.txt
28 changes: 14 additions & 14 deletions doc/todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@
==============================================================================
COMMANDS *todo-commands*

`<leader>-s` : Sort the file
`<localleader>-s` : Sort the file

`<leader>-s+` : Sort the file on +Projects
`<localleader>-s+` : Sort the file on +Projects

`<leader>-s@` : Sort the file on @Contexts
`<localleader>-s@` : Sort the file on @Contexts

`<leader>-sd` : Sort the file on dates
`<localleader>-sd` : Sort the file on dates

`<leader>-j` : Lower the priority of the current line
`<localleader>-j` : Lower the priority of the current line

`<leader>-k` : Increase the priority of the current line
`<localleader>-k` : Increase the priority of the current line

`<leader>-a` : Add the priority (A) to the current line
`<localleader>-a` : Add the priority (A) to the current line

`<leader>-b` : Add the priority (B) to the current line
`<localleader>-b` : Add the priority (B) to the current line

`<leader>-c` : Add the priority (C) to the current line
`<localleader>-c` : Add the priority (C) to the current line

`<leader>-d` : Insert the current date
`<localleader>-d` : Insert the current date

`date<tab>` : (Insert mode) Insert the current date

`<leader>-x` : Mark task as done (inserts current date as completion date)
`<localleader>-x` : Mark task as done (inserts current date as completion date)

`<leader>-X` : Mark all tasks as completed
`<localleader>-X` : Mark all tasks as completed

`<leader>-D` : Move completed tasks to done.txt
`<localleader>-D` : Move completed tasks to done.txt

<leader> is \ by default, so <leader>-s means you type \s
See :h <localleader> for more information about the commands' prefix.
96 changes: 48 additions & 48 deletions ftplugin/todo.vim
Original file line number Diff line number Diff line change
Expand Up @@ -18,109 +18,109 @@ setlocal wrapmargin=0

" Mappings {{{1
" Sort tasks {{{2
if !hasmapto("<leader>s",'n')
nnoremap <script> <silent> <buffer> <leader>s :%sort<CR>
if !hasmapto("<localleader>s",'n')
nnoremap <script> <silent> <buffer> <localleader>s :%sort<CR>
endif

if !hasmapto("<leader>s",'v')
vnoremap <script> <silent> <buffer> <leader>s :sort<CR>
if !hasmapto("<localleader>s",'v')
vnoremap <script> <silent> <buffer> <localleader>s :sort<CR>
endif

if !hasmapto("<leader>s@",'n')
nnoremap <script> <silent> <buffer> <leader>s@ :%call todo#txt#sort_by_context()<CR>
if !hasmapto("<localleader>s@",'n')
nnoremap <script> <silent> <buffer> <localleader>s@ :%call todo#txt#sort_by_context()<CR>
endif

if !hasmapto("<leader>s@",'v')
vnoremap <script> <silent> <buffer> <leader>s@ :call todo#txt#sort_by_context()<CR>
if !hasmapto("<localleader>s@",'v')
vnoremap <script> <silent> <buffer> <localleader>s@ :call todo#txt#sort_by_context()<CR>
endif

if !hasmapto("<leader>s+",'n')
nnoremap <script> <silent> <buffer> <leader>s+ :%call todo#txt#sort_by_project()<CR>
if !hasmapto("<localleader>s+",'n')
nnoremap <script> <silent> <buffer> <localleader>s+ :%call todo#txt#sort_by_project()<CR>
endif

if !hasmapto("<leader>s+",'v')
vnoremap <script> <silent> <buffer> <leader>s+ :call todo#txt#sort_by_project()<CR>
if !hasmapto("<localleader>s+",'v')
vnoremap <script> <silent> <buffer> <localleader>s+ :call todo#txt#sort_by_project()<CR>
endif

if !hasmapto("<leader>sd",'n')
nnoremap <script> <silent> <buffer> <leader>sd :%call todo#txt#sort_by_date()<CR>
if !hasmapto("<localleader>sd",'n')
nnoremap <script> <silent> <buffer> <localleader>sd :%call todo#txt#sort_by_date()<CR>
endif

if !hasmapto("<leader>sd",'v')
vnoremap <script> <silent> <buffer> <leader>sd :call todo#txt#sort_by_date()<CR>
if !hasmapto("<localleader>sd",'v')
vnoremap <script> <silent> <buffer> <localleader>sd :call todo#txt#sort_by_date()<CR>
endif

" Change priority {{{2
if !hasmapto("<leader>j",'n')
nnoremap <script> <silent> <buffer> <leader>j :call todo#txt#prioritize_increase()<CR>
if !hasmapto("<localleader>j",'n')
nnoremap <script> <silent> <buffer> <localleader>j :call todo#txt#prioritize_increase()<CR>
endif

if !hasmapto("<leader>j",'v')
vnoremap <script> <silent> <buffer> <leader>j :call todo#txt#prioritize_increase()<CR>
if !hasmapto("<localleader>j",'v')
vnoremap <script> <silent> <buffer> <localleader>j :call todo#txt#prioritize_increase()<CR>
endif

if !hasmapto("<leader>k",'n')
nnoremap <script> <silent> <buffer> <leader>k :call todo#txt#prioritize_decrease()<CR>
if !hasmapto("<localleader>k",'n')
nnoremap <script> <silent> <buffer> <localleader>k :call todo#txt#prioritize_decrease()<CR>
endif

if !hasmapto("<leader>k",'v')
vnoremap <script> <silent> <buffer> <leader>k :call todo#txt#prioritize_decrease()<CR>
if !hasmapto("<localleader>k",'v')
vnoremap <script> <silent> <buffer> <localleader>k :call todo#txt#prioritize_decrease()<CR>
endif

if !hasmapto("<leader>a",'n')
nnoremap <script> <silent> <buffer> <leader>a :call todo#txt#prioritize_add('A')<CR>
if !hasmapto("<localleader>a",'n')
nnoremap <script> <silent> <buffer> <localleader>a :call todo#txt#prioritize_add('A')<CR>
endif

if !hasmapto("<leader>a",'v')
vnoremap <script> <silent> <buffer> <leader>a :call todo#txt#prioritize_add('A')<CR>
if !hasmapto("<localleader>a",'v')
vnoremap <script> <silent> <buffer> <localleader>a :call todo#txt#prioritize_add('A')<CR>
endif

if !hasmapto("<leader>b",'n')
nnoremap <script> <silent> <buffer> <leader>b :call todo#txt#prioritize_add('B')<CR>
if !hasmapto("<localleader>b",'n')
nnoremap <script> <silent> <buffer> <localleader>b :call todo#txt#prioritize_add('B')<CR>
endif

if !hasmapto("<leader>b",'v')
vnoremap <script> <silent> <buffer> <leader>b :call todo#txt#prioritize_add('B')<CR>
if !hasmapto("<localleader>b",'v')
vnoremap <script> <silent> <buffer> <localleader>b :call todo#txt#prioritize_add('B')<CR>
endif

if !hasmapto("<leader>c",'n')
nnoremap <script> <silent> <buffer> <leader>c :call todo#txt#prioritize_add('C')<CR>
if !hasmapto("<localleader>c",'n')
nnoremap <script> <silent> <buffer> <localleader>c :call todo#txt#prioritize_add('C')<CR>
endif

if !hasmapto("<leader>c",'v')
vnoremap <script> <silent> <buffer> <leader>c :call todo#txt#prioritize_add('C')<CR>
if !hasmapto("<localleader>c",'v')
vnoremap <script> <silent> <buffer> <localleader>c :call todo#txt#prioritize_add('C')<CR>
endif

" Insert date {{{2
if !hasmapto("date<Tab>",'i')
inoremap <script> <silent> <buffer> date<Tab> <C-R>=strftime("%Y-%m-%d")<CR>
endif

if !hasmapto("<leader>d",'n')
nnoremap <script> <silent> <buffer> <leader>d :call todo#txt#prepend_date()<CR>
if !hasmapto("<localleader>d",'n')
nnoremap <script> <silent> <buffer> <localleader>d :call todo#txt#prepend_date()<CR>
endif

if !hasmapto("<leader>d",'v')
vnoremap <script> <silent> <buffer> <leader>d :call todo#txt#prepend_date()<CR>
if !hasmapto("<localleader>d",'v')
vnoremap <script> <silent> <buffer> <localleader>d :call todo#txt#prepend_date()<CR>
endif

" Mark done {{{2
if !hasmapto("<leader>x",'n')
nnoremap <script> <silent> <buffer> <leader>x :call todo#txt#mark_as_done()<CR>
if !hasmapto("<localleader>x",'n')
nnoremap <script> <silent> <buffer> <localleader>x :call todo#txt#mark_as_done()<CR>
endif

if !hasmapto("<leader>x",'v')
vnoremap <script> <silent> <buffer> <leader>x :call todo#txt#mark_as_done()<CR>
if !hasmapto("<localleader>x",'v')
vnoremap <script> <silent> <buffer> <localleader>x :call todo#txt#mark_as_done()<CR>
endif

" Mark all done {{{2
if !hasmapto("<leader>X",'n')
nnoremap <script> <silent> <buffer> <leader>X :call todo#txt#mark_all_as_done()<CR>
if !hasmapto("<localleader>X",'n')
nnoremap <script> <silent> <buffer> <localleader>X :call todo#txt#mark_all_as_done()<CR>
endif

" Remove completed {{{2
if !hasmapto("<leader>D",'n')
nnoremap <script> <silent> <buffer> <leader>D :call todo#txt#remove_completed()<CR>
if !hasmapto("<localleader>D",'n')
nnoremap <script> <silent> <buffer> <localleader>D :call todo#txt#remove_completed()<CR>
endif

" Folding {{{1
Expand Down

0 comments on commit 1f8b706

Please sign in to comment.