Author: adamg Date: Tue Apr 25 10:22:22 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediffed w.r.t. vim 7.0f
---- Files affected:
SOURCES:
010_all_vim-6.3-vixie.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/010_all_vim-6.3-vixie.patch
diff -u SOURCES/010_all_vim-6.3-vixie.patch:1.2
SOURCES/010_all_vim-6.3-vixie.patch:1.3
--- SOURCES/010_all_vim-6.3-vixie.patch:1.2 Tue Oct 25 19:17:15 2005
+++ SOURCES/010_all_vim-6.3-vixie.patch Tue Apr 25 12:22:17 2006
@@ -1,45 +1,46 @@
---- runtime/syntax/crontab.vim 2005-08-09 02:20:29.000000000 +0100
-+++ runtime/syntax/crontab.vim 2005-07-22 15:32:17.000000000 +0100
-@@ -17,25 +17,33 @@
+diff -bur vim-7.0f.orig/runtime/syntax/crontab.vim
vim-7.0f/runtime/syntax/crontab.vim
+--- vim-7.0f.orig/runtime/syntax/crontab.vim 2006-04-20 14:30:15.000000000
+0200
++++ vim-7.0f/runtime/syntax/crontab.vim 2006-04-25 11:43:06.032452000
+0200
+@@ -19,17 +19,20 @@
finish
endif
--syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr
skipwhite
--syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay
skipwhite contained
--syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth
skipwhite contained
-+syntax match crontabMin "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabHr skipwhite
-+syntax match crontabHr "\<[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabDay skipwhite contained
-+syntax match crontabDay "\<[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabMnth skipwhite contained
-
--syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow
skipwhite contained
-+syntax match crontabMnth "\<[a-z0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabDow skipwhite contained
- syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep
oct nov dec
-
--syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd
skipwhite contained
-+syntax match crontabDow "\<[a-z0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabCmd skipwhite contained
- syntax keyword crontabDow7 contained sun mon tue wed thu fri sat
+-syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite
+-syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite
contained
+-syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite
contained
++syntax match crontabMin "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabHr skipwhite
++syntax match crontabHr "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabDay skipwhite contained
++syntax match crontabDay "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabMnth skipwhite contained
+
+-syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite
contained
++syntax match crontabMnth "\<[a-z0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabDow skipwhite contained
+ syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep
oct nov dec
+
+-syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite
contained
++syntax match crontabDow "\<[a-z0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?"
nextgroup=crontabCmd skipwhite contained
+ syntax keyword crontabDow7 contained sun mon tue wed thu fri sat
+syntax match crontabSpecial "@\w\+" nextgroup=crontabCmd skipwhite
+syntax match crontabCmdSpecial contained /\\.\|%/
- " syntax region crontabCmd start="\<[a-z0-9\/\(]" end="$"
nextgroup=crontabCmnt skipwhite contained contains=crontabCmnt keepend
-
- syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite
contained keepend
+ syntax region crontabCmd start="\S" end="$" skipwhite contained keepend
contains=crontabPercent
+syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite
contained contains=crontabCmnt,crontabCmdSpecial keepend
- syntax match crontabCmnt "^\s*#.*"
+ syntax match crontabCmnt "^\s*#.*"
+ syntax match crontabPercent "[^\\]%.*"lc=1 contained
- syntax match crontabNick "[EMAIL
PROTECTED](reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\)\>"
nextgroup=crontabCmd skipwhite
+@@ -37,6 +40,12 @@
- syntax match crontabVar "^\s*\k\w*\s*="me=e-1
+ syntax match crontabVar "^\s*\k\w*\s*="me=e-1
+syntax match crontabVar /^[A-Za-z][A-Za-z0-9\-\_]*/ nextgroup=crontabVarEq
skipwhite
+syntax match crontabVarEq contained /=/
nextgroup=CrontabVarValQ,CrontabVarVal skipwhite
+syntax match crontabVarValQ contained /\(["']\).*\1/ skipwhite
+syntax match crontabVarVal contained /["'[EMAIL PROTECTED]/ skipwhite
++
+
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
" For version 5.8 and later: only when an item doesn't have highlighting yet
-@@ -47,6 +55,7 @@
+@@ -48,6 +57,7 @@
command -nargs=+ HiLink hi def link <args>
endif
@@ -47,16 +48,18 @@
HiLink crontabMin Number
HiLink crontabHr PreProc
HiLink crontabDay Type
-@@ -66,6 +75,12 @@
-
+@@ -69,6 +79,13 @@
" comment out next line for to suppress unix commands coloring.
- HiLink crontabCmd Type
+ HiLink crontabCmd Statement
+
+ HiLink crontabCmdSpecial Special
+
-+ HiLink crontabVar Identifier
-+ HiLink crontabVarEq Special
-+ HiLink crontabVarVal Constant
-+ HiLink crontabVarValQ String
-
++ HiLink crontabVar Identifier
++ HiLink crontabVarEq Special
++ HiLink crontabVarVal Constant
++ HiLink crontabVarValQ String
++
HiLink crontabCmnt Comment
+ delcommand HiLink
+Only in vim-7.0f/runtime/syntax: crontab.vim.rej
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/010_all_vim-6.3-vixie.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
