Permalink
Browse files

Merge pull request #42: Added 'In Progress' state

See pull request #42 on GitHub:
  #42
  • Loading branch information...
2 parents 4907b6c + 85902b5 commit 2805297eb9450d8eb8bd6120537e71e94cb7976e @xolox committed Jul 16, 2013
Showing with 9 additions and 5 deletions.
  1. +1 −0 README.md
  2. +2 −2 autoload/xolox/notes.vim
  3. +1 −0 doc/notes.txt
  4. +5 −3 syntax/notes.vim
View
@@ -282,6 +282,7 @@ See the documentation of the [:highlight] [highlight] command for more informati
* `notesTodo` - `TODO` markers
* `notesXXX` - `XXX` markers
* `notesFixMe` - `FIXME` markers
+ * `notesInProgress` - `CURRENT`, `INPROGRESS`, `STARTED` and `WIP` markers
* `notesDoneItem` - lines containing the marker `DONE`, usually highlighted as a comment
* `notesDoneMarker` - `DONE` markers
* `notesVimCmd` - Vim commands, words preceded by an `:` character
View
@@ -1,12 +1,12 @@
" Vim auto-load script
" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 23, 2013
+" Last Change: July 16, 2013
" URL: http://peterodding.com/code/vim/notes/
" Note: This file is encoded in UTF-8 including a byte order mark so
" that Vim loads the script using the right encoding transparently.
-let g:xolox#notes#version = '0.22'
+let g:xolox#notes#version = '0.23'
let g:xolox#notes#url_pattern = '\<\(mailto:\|javascript:\|\w\{3,}://\)\(\S*\w\)\+/\?'
let s:scriptdir = expand('<sfile>:p:h')
View
@@ -577,6 +577,7 @@ are the names of the syntax items defined by the notes syntax mode:
- 'notesTodo' - 'TODO' markers
- 'notesXXX' - 'XXX' markers
- 'notesFixMe' - 'FIXME' markers
+- 'notesInProgress' - 'CURRENT', 'INPROGRESS', 'STARTED' and 'WIP' markers
- 'notesDoneItem' - lines containing the marker 'DONE', usually highlighted
as a comment
- 'notesDoneMarker' - 'DONE' markers
View
@@ -1,6 +1,6 @@
" Vim syntax script
" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 23, 2013
+" Last Change: July 16, 2013
" URL: http://peterodding.com/code/vim/notes/
" Note: This file is encoded in UTF-8 including a byte order mark so
@@ -51,7 +51,7 @@ highlight def link notesDoubleQuoted String
" Highlight text emphasized in italic font. {{{2
if has('conceal')
syntax region notesItalic matchgroup=notesItalicMarker start=/\<_\k\@=/ end=/_\>\|\n/ contains=@Spell concealends
- highlight link notesItalicMarker notesHiddenMarker
+ highlight link notesItalicMarker notesHiddenMarker
else
syntax match notesItalic /\<_\k[^_]*\k_\>/
endif
@@ -61,7 +61,7 @@ highlight notesItalic gui=italic cterm=italic
" Highlight text emphasized in bold font. {{{2
if has('conceal')
syntax region notesBold matchgroup=notesBoldMarker start=/\*\k\@=/ end=/\S\@<=\*/ contains=@Spell concealends
- highlight link notesBoldMarker notesHiddenMarker
+ highlight link notesBoldMarker notesHiddenMarker
else
syntax match notesBold /\*\k[^*]*\k\*/
endif
@@ -99,13 +99,15 @@ highlight def link notesWindowsPath Directory
syntax match notesTodo /\<TODO\>/
syntax match notesXXX /\<XXX\>/
syntax match notesFixMe /\<FIXME\>/
+syntax match notesInProgress /\<\(CURRENT\|INPROGRESS\|STARTED\|WIP\)\>/
syntax match notesDoneItem /^\(\s\+\).*\<DONE\>.*\(\n\1\s.*\)*/ contains=@notesInline
syntax match notesDoneMarker /\<DONE\>/ containedin=notesDoneItem
highlight def link notesTodo WarningMsg
highlight def link notesXXX WarningMsg
highlight def link notesFixMe WarningMsg
highlight def link notesDoneItem Comment
highlight def link notesDoneMarker Question
+highlight def link notesInProgress Directory
" Highlight Vim command names in :this notation. {{{2
syntax match notesVimCmd /:\w\+\(!\|\>\)/ contains=ALLBUT,@Spell

0 comments on commit 2805297

Please sign in to comment.