diff --git a/scripts/vim/README b/scripts/vim/README index acb725fea..cd9e84845 100644 --- a/scripts/vim/README +++ b/scripts/vim/README @@ -5,7 +5,7 @@ syntax highlighting enabled when you use VIM. This happens to be the default for most VIM installations, but it is usually quite simple if that doesn't happen to be so in your case. Rather than repeat the excellent VIM documentation here, please see the appropriate VIM documentation itself. -Generally this can be made seen by starting vim and issuing the following +Generally this can be made seen by starting vim/gvim and issuing the following command: :help syntax @@ -25,7 +25,3 @@ these files into your home directory so that you have: You should then be ready to go. - -For more information regarding task, the official site may be referecend at - - http://taskwarrior.org diff --git a/scripts/vim/ftdetect/task.vim b/scripts/vim/ftdetect/task.vim index 35dbfd283..868d05063 100644 --- a/scripts/vim/ftdetect/task.vim +++ b/scripts/vim/ftdetect/task.vim @@ -1,33 +1,6 @@ " Vim support file to detect task data files and single task edits " " Maintainer: John Florian -" -" -" Copyright 2009 John Florian -" All rights reserved. -" -" This file is part of the task project. -" -" This program is free software; you can redistribute it and/or modify it under -" the terms of the GNU General Public License as published by the Free Software -" Foundation; either version 2 of the License, or (at your option) any later -" version. -" -" This program is distributed in the hope that it will be useful, but WITHOUT -" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -" FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -" details. -" -" You should have received a copy of the GNU General Public License along with -" this program; if not, write to the -" -" Free Software Foundation, Inc., -" 51 Franklin Street, Fifth Floor, -" Boston, MA -" 02110-1301 -" USA -" -" " for the raw data files diff --git a/scripts/vim/syntax/taskdata.vim b/scripts/vim/syntax/taskdata.vim index f7893fde7..403cc03c0 100644 --- a/scripts/vim/syntax/taskdata.vim +++ b/scripts/vim/syntax/taskdata.vim @@ -1,33 +1,6 @@ " Vim syntax file " Language: task data " Maintainer: John Florian -" -" -" Copyright 2009 John Florian -" All rights reserved. -" -" This file is part of the task project. -" -" This program is free software; you can redistribute it and/or modify it under -" the terms of the GNU General Public License as published by the Free Software -" Foundation; either version 2 of the License, or (at your option) any later -" version. -" -" This program is distributed in the hope that it will be useful, but WITHOUT -" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -" FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -" details. -" -" You should have received a copy of the GNU General Public License along with -" this program; if not, write to the -" -" Free Software Foundation, Inc., -" 51 Franklin Street, Fifth Floor, -" Boston, MA -" 02110-1301 -" USA -" -" " For version 5.x: Clear all syntax items. @@ -39,39 +12,27 @@ elseif exists("b:current_syntax") endif " Key Names for values. -syn keyword taskKey description due end entry imask mask parent priority -syn keyword taskKey project recur start status tags uuid -syn match taskKey "annotation_\d\+" +syn keyword taskdataKey description due end entry imask mask parent +syn keyword taskdataKey priority project recur start status tags uuid +syn match taskdataKey "annotation_\d\+" " Values associated with key names. " " Strings -syn region taskString matchgroup=Normal start=+"+ end=+"+ - \ contains=taskEncoded,taskUUID,@Spell +syn region taskdataString matchgroup=Normal start=+"+ end=+"+ + \ contains=taskdataEncoded,taskdataUUID,@Spell " " Special Embedded Characters (e.g., ",") -syn match taskEncoded "&\a\+;" contained +syn match taskdataEncoded "&\a\+;" contained " UUIDs -syn match taskUUID "\x\{8}-\(\x\{4}-\)\{3}\x\{12}" contained +syn match taskdataUUID "\x\{8}-\(\x\{4}-\)\{3}\x\{12}" contained -if version >= 508 || !exists("did_taskdata_syntax_inits") - if version <= 508 - let did_taskdata_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later. - HiLink taskEncoded Function - HiLink taskKey Statement - HiLink taskOperator Operator - HiLink taskString String - HiLink taskUUID Special - - delcommand HiLink -endif +" The default methods for highlighting. Can be overridden later. +hi def link taskdataEncoded Function +hi def link taskdataKey Statement +hi def link taskdataString String +hi def link taskdataUUID Special let b:current_syntax = "taskdata" diff --git a/scripts/vim/syntax/taskedit.vim b/scripts/vim/syntax/taskedit.vim index 43f758140..aa709e93a 100644 --- a/scripts/vim/syntax/taskedit.vim +++ b/scripts/vim/syntax/taskedit.vim @@ -1,33 +1,6 @@ " Vim syntax file " Language: support for 'task 42 edit' " Maintainer: John Florian -" -" -" Copyright 2009 John Florian -" All rights reserved. -" -" This file is part of the task project. -" -" This program is free software; you can redistribute it and/or modify it under -" the terms of the GNU General Public License as published by the Free Software -" Foundation; either version 2 of the License, or (at your option) any later -" version. -" -" This program is distributed in the hope that it will be useful, but WITHOUT -" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -" FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -" details. -" -" You should have received a copy of the GNU General Public License along with -" this program; if not, write to the -" -" Free Software Foundation, Inc., -" 51 Franklin Street, Fifth Floor, -" Boston, MA -" 02110-1301 -" USA -" -" " For version 5.x: Clear all syntax items. @@ -38,33 +11,23 @@ elseif exists("b:current_syntax") finish endif -syn match taskHeading "^\s*#\s*Name\s\+Editable details\s*$" contained -syn match taskHeading "^\s*#\s*-\+\s\+-\+\s*$" contained -syn match taskReadOnly "^\s*#\s*\(UU\)\?ID:.*$" contained -syn match taskReadOnly "^\s*#\s*Status:.*$" contained -syn match taskReadOnly "^\s*#\s*i\?Mask:.*$" contained -syn match taskKey "^ *.\{-}:" nextgroup=taskString -syn match taskComment "^\s*#.*$" contains=taskReadOnly,taskHeading -syn match taskString ".*$" contained contains=@Spell +syn match taskeditHeading "^\s*#\s*Name\s\+Editable details\s*$" contained +syn match taskeditHeading "^\s*#\s*-\+\s\+-\+\s*$" contained +syn match taskeditReadOnly "^\s*#\s*\(UU\)\?ID:.*$" contained +syn match taskeditReadOnly "^\s*#\s*Status:.*$" contained +syn match taskeditReadOnly "^\s*#\s*i\?Mask:.*$" contained +syn match taskeditKey "^ *.\{-}:" nextgroup=taskeditString +syn match taskeditComment "^\s*#.*$" + \ contains=taskeditReadOnly,taskeditHeading +syn match taskeditString ".*$" contained contains=@Spell -if version >= 508 || !exists("did_taskedit_syntax_inits") - if version <= 508 - let did_taskedit_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later. - HiLink taskComment Comment - HiLink taskHeading Function - HiLink taskKey Statement - HiLink taskReadOnly Special - HiLink taskString String - - delcommand HiLink -endif +" The default methods for highlighting. Can be overridden later. +hi def link taskeditComment Comment +hi def link taskeditHeading Function +hi def link taskeditKey Statement +hi def link taskeditReadOnly Special +hi def link taskeditString String let b:current_syntax = "taskedit"