From 7c1656d33b7aaa37cf0501da6a2f9cea526f280a Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 9 Apr 2015 21:10:46 +0200 Subject: [PATCH] taskwiki: Do not source colors for priority values, color uniformly exclamation marks instead --- after/syntax/vimwiki.vim | 4 +--- taskwiki/taskwiki.py | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/after/syntax/vimwiki.vim b/after/syntax/vimwiki.vim index 9a5f918..3c46e05 100644 --- a/after/syntax/vimwiki.vim +++ b/after/syntax/vimwiki.vim @@ -18,9 +18,7 @@ endfor syntax match TaskWikiTaskActive containedin=TaskWikiTask /\s*\*\s\[S\]\s[^#]*/ syntax match TaskWikiTaskCompleted containedin=TaskWikiTask /\s*\*\s\[X\]\s[^#]*/ syntax match TaskWikiTaskDeleted containedin=TaskWikiTask /\s*\*\s*\[D\]\s[^#]*/ -syntax match TaskWikiTaskPriorityLow containedin=TaskWikiTask /\(\*\s\[.\]\s\)\@<=[^#]* ! [^#]*/ -syntax match TaskWikiTaskPriorityMedum containedin=TaskWikiTask /\(\*\s\[.\]\s\)\@<=[^#]* !! [^#]*/ -syntax match TaskWikiTaskPriorityHigh containedin=TaskWikiTask /\(\*\s\[.\]\s\)\@<=[^#]* !!! [^#]*/ +syntax match TaskWikiTaskPriority containedin=TaskWikiTask /\( ! \| !! \| !!! \)/ " Set concealed parts as really concealed in normal mode, and with cursor over setlocal conceallevel=3 diff --git a/taskwiki/taskwiki.py b/taskwiki/taskwiki.py index d070784..104e3fd 100644 --- a/taskwiki/taskwiki.py +++ b/taskwiki/taskwiki.py @@ -264,19 +264,13 @@ class Meta(object): 'TaskWikiTaskActive': 'color.active', 'TaskWikiTaskCompleted': 'color.completed', 'TaskWikiTaskDeleted': 'color.deleted', - 'TaskWikiTaskPriorityLow': 'color.uda.priority.L', - 'TaskWikiTaskPriorityMedium': 'color.uda.priority.M', - 'TaskWikiTaskPriorityHigh': 'color.uda.priority.H', - } taskwiki_native_colors = { 'TaskWikiTaskActive': 'Type', 'TaskWikiTaskCompleted': 'Comment', 'TaskWikiTaskDeleted': 'Error', - 'TaskWikiTaskPriorityLow': 'Constant', - 'TaskWikiTaskPriorityMedium': 'Statement', - 'TaskWikiTaskPriorityHigh': 'PreProc', + 'TaskWikiTaskPriority': 'Error', } # If tw support is enabled, try to find definition in TW first