Skip to content

Commit 2805297

Browse files
committed
Merge pull request #42: Added 'In Progress' state
See pull request #42 on GitHub: #42
2 parents 4907b6c + 85902b5 commit 2805297

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ See the documentation of the [:highlight] [highlight] command for more informati
282282
* `notesTodo` - `TODO` markers
283283
* `notesXXX` - `XXX` markers
284284
* `notesFixMe` - `FIXME` markers
285+
* `notesInProgress` - `CURRENT`, `INPROGRESS`, `STARTED` and `WIP` markers
285286
* `notesDoneItem` - lines containing the marker `DONE`, usually highlighted as a comment
286287
* `notesDoneMarker` - `DONE` markers
287288
* `notesVimCmd` - Vim commands, words preceded by an `:` character

autoload/xolox/notes.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
" Vim auto-load script
22
" Author: Peter Odding <peter@peterodding.com>
3-
" Last Change: June 23, 2013
3+
" Last Change: July 16, 2013
44
" URL: http://peterodding.com/code/vim/notes/
55

66
" Note: This file is encoded in UTF-8 including a byte order mark so
77
" that Vim loads the script using the right encoding transparently.
88

9-
let g:xolox#notes#version = '0.22'
9+
let g:xolox#notes#version = '0.23'
1010
let g:xolox#notes#url_pattern = '\<\(mailto:\|javascript:\|\w\{3,}://\)\(\S*\w\)\+/\?'
1111
let s:scriptdir = expand('<sfile>:p:h')
1212

doc/notes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ are the names of the syntax items defined by the notes syntax mode:
577577
- 'notesTodo' - 'TODO' markers
578578
- 'notesXXX' - 'XXX' markers
579579
- 'notesFixMe' - 'FIXME' markers
580+
- 'notesInProgress' - 'CURRENT', 'INPROGRESS', 'STARTED' and 'WIP' markers
580581
- 'notesDoneItem' - lines containing the marker 'DONE', usually highlighted
581582
as a comment
582583
- 'notesDoneMarker' - 'DONE' markers

syntax/notes.vim

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Vim syntax script
22
" Author: Peter Odding <peter@peterodding.com>
3-
" Last Change: June 23, 2013
3+
" Last Change: July 16, 2013
44
" URL: http://peterodding.com/code/vim/notes/
55

66
" Note: This file is encoded in UTF-8 including a byte order mark so
@@ -51,7 +51,7 @@ highlight def link notesDoubleQuoted String
5151
" Highlight text emphasized in italic font. {{{2
5252
if has('conceal')
5353
syntax region notesItalic matchgroup=notesItalicMarker start=/\<_\k\@=/ end=/_\>\|\n/ contains=@Spell concealends
54-
highlight link notesItalicMarker notesHiddenMarker
54+
highlight link notesItalicMarker notesHiddenMarker
5555
else
5656
syntax match notesItalic /\<_\k[^_]*\k_\>/
5757
endif
@@ -61,7 +61,7 @@ highlight notesItalic gui=italic cterm=italic
6161
" Highlight text emphasized in bold font. {{{2
6262
if has('conceal')
6363
syntax region notesBold matchgroup=notesBoldMarker start=/\*\k\@=/ end=/\S\@<=\*/ contains=@Spell concealends
64-
highlight link notesBoldMarker notesHiddenMarker
64+
highlight link notesBoldMarker notesHiddenMarker
6565
else
6666
syntax match notesBold /\*\k[^*]*\k\*/
6767
endif
@@ -99,13 +99,15 @@ highlight def link notesWindowsPath Directory
9999
syntax match notesTodo /\<TODO\>/
100100
syntax match notesXXX /\<XXX\>/
101101
syntax match notesFixMe /\<FIXME\>/
102+
syntax match notesInProgress /\<\(CURRENT\|INPROGRESS\|STARTED\|WIP\)\>/
102103
syntax match notesDoneItem /^\(\s\+\).*\<DONE\>.*\(\n\1\s.*\)*/ contains=@notesInline
103104
syntax match notesDoneMarker /\<DONE\>/ containedin=notesDoneItem
104105
highlight def link notesTodo WarningMsg
105106
highlight def link notesXXX WarningMsg
106107
highlight def link notesFixMe WarningMsg
107108
highlight def link notesDoneItem Comment
108109
highlight def link notesDoneMarker Question
110+
highlight def link notesInProgress Directory
109111

110112
" Highlight Vim command names in :this notation. {{{2
111113
syntax match notesVimCmd /:\w\+\(!\|\>\)/ contains=ALLBUT,@Spell

0 commit comments

Comments
 (0)