Author: glen Date: Sun Oct 9 01:49:39 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add various syntax improvements from gentoo
---- Files affected:
SOURCES:
010_all_vim-6.3-vixie.patch (NONE -> 1.1) (NEW),
013_all_vim-7.0-cron-vars-79981.patch (NONE -> 1.1) (NEW),
014_all_vim-6.3-dns-syntax.patch (NONE -> 1.1) (NEW),
015_all_vim-6.3-screen.linux-is-dark-83416.patch (NONE -> 1.1) (NEW),
020_all_vim-7.0-fstab-tmpfs-size.patch (NONE -> 1.1) (NEW),
021_all_vim-7.0-fstab-bogus-errors.patch (NONE -> 1.1) (NEW),
024_all_vim-6.3-bash-83565.patch (NONE -> 1.1) (NEW),
027_all_vim-7.0-automake-substitutions-93378.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/010_all_vim-6.3-vixie.patch
diff -u /dev/null SOURCES/010_all_vim-6.3-vixie.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/010_all_vim-6.3-vixie.patch Sun Oct 9 03:49:34 2005
@@ -0,0 +1,51 @@
+# Support for vixie-cron style @SPECS in crontab syntax highlighting.
+
+--- vim70aa/runtime/syntax/crontab.vim 2004-08-03 08:15:48.000000000 +0100
++++ vim70aa/runtime/syntax/crontab.vim 2004-08-27 04:08:40.677471216 +0100
+@@ -16,19 +16,23 @@
+ finish
+ endif
+
+-syntax match crontabMin "\_^[0-9\-\/\,\.]\{}\>\|\*" nextgroup=crontabHr
skipwhite
+-syntax match crontabHr "\<[0-9\-\/\,\.]\{}\>\|\*"
nextgroup=crontabDay skipwhite contained
+-syntax match crontabDay "\<[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 "\<[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 "\<[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 region crontabCmd start="\<[a-z0-9\/\(]" end="$"
nextgroup=crontabCmnt skipwhite contained contains=crontabCmnt keepend
+
+-syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite
contained contains=crontabCmnt keepend
++syntax match crontabCmdSpecial contained /\\.\|%/
++
++syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite
contained contains=crontabCmnt,crontabCmdSpecial keepend
+ syntax match crontabCmnt /#.*/
+
+ " Define the default highlighting.
+@@ -51,6 +55,8 @@
+ HiLink crontabMnthS Number
+ HiLink crontabMnthN Number
+
++ HiLink crontabSpecial PreProc
++
+ HiLink crontabDow PreProc
+ HiLink crontabDow7 PreProc
+ HiLink crontabDowS PreProc
+@@ -58,6 +64,7 @@
+
+ " comment out next line for to suppress unix commands coloring.
+ HiLink crontabCmd Type
++ HiLink crontabCmdSpecial Special
+
+ HiLink crontabCmnt Comment
+
================================================================
Index: SOURCES/013_all_vim-7.0-cron-vars-79981.patch
diff -u /dev/null SOURCES/013_all_vim-7.0-cron-vars-79981.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/013_all_vim-7.0-cron-vars-79981.patch Sun Oct 9 03:49:34 2005
@@ -0,0 +1,28 @@
+# foo=bar highlighting in crontab files. Gentoo bug 79981.
+
+--- vim70aa/runtime/syntax/crontab.vim.orig 2005-01-29 19:47:38.639175808
+0000
++++ vim70aa/runtime/syntax/crontab.vim 2005-01-29 19:51:58.631650944 +0000
+@@ -35,6 +35,11 @@
+ syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite
contained contains=crontabCmnt,crontabCmdSpecial keepend
+ syntax match crontabCmnt /#.*/
+
++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
+@@ -66,6 +71,11 @@
+ HiLink crontabCmd Type
+ HiLink crontabCmdSpecial Special
+
++ HiLink crontabVar Identifier
++ HiLink crontabVarEq Special
++ HiLink crontabVarVal Constant
++ HiLink crontabVarValQ String
++
+ HiLink crontabCmnt Comment
+
+ delcommand HiLink
================================================================
Index: SOURCES/014_all_vim-6.3-dns-syntax.patch
diff -u /dev/null SOURCES/014_all_vim-6.3-dns-syntax.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/014_all_vim-6.3-dns-syntax.patch Sun Oct 9 03:49:34 2005
@@ -0,0 +1,28 @@
+# Better DNS syntax highlighting.
+
+--- vim63/runtime/syntax/dns.vim-old 2004-09-26 22:46:26.000000000 -0700
++++ vim63/runtime/syntax/dns.vim 2004-09-26 23:17:20.000000000 -0700
+@@ -13,13 +13,14 @@
+ endif
+
+ " Last match is taken!
+-syn match dnsKeyword
"\<\(IN\|A\|SOA\|NS\|CNAME\|MX\|PTR\|SOA\|MB\|MG\|MR\|NULL\|WKS\|HINFO\|TXT\|CS\|CH\|CPU\|OS\)\>"
++syn match dnsKeyword
"\<\(IN\|A\|AAAA\|SOA\|NS\|CNAME\|MX\|PTR\|SOA\|MB\|MG\|MR\|NULL\|WKS\|HINFO\|TXT\|CS\|CH\|CPU\|OS\|SRV\)\>"
+ syn match dnsRecordName "^[^ ]*"
+ syn match dnsPreProc "^\$[^ ]*"
+ syn match dnsComment ";.*$"
+ syn match dnsDataFQDN "\<[^ ]*\.[ ]*$"
+ syn match dnsConstant
"\<\([0-9][0-9.]*\|[0-9.]*[0-9]\)\>"
+ syn match dnsIPaddr
"\<\(\([0-2]\)\{0,1}\([0-9]\)\{1,2}\.\)\{3}\([0-2]\)\{0,1}\([0-9]\)\{1,2}\>[
]*$"
++syn match dnsIP6addr
"\<\([[:xdigit:]]\{0,4}:\)\{2,7}\(\|[[:xdigit:]]\{0,4}\)\>[ ]*$"
+
+ " Define the default highlighting.
+ " For version 5.7 and earlier: only when not done already
+@@ -38,6 +39,7 @@
+ HiLink dnsKeyword Keyword
+ HiLink dnsRecordName Type
+ HiLink dnsIPaddr Type
++ HiLink dnsIP6addr Type
+ HiLink dnsIPerr Error
+ HiLink dnsConstant Constant
+
================================================================
Index: SOURCES/015_all_vim-6.3-screen.linux-is-dark-83416.patch
diff -u /dev/null SOURCES/015_all_vim-6.3-screen.linux-is-dark-83416.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/015_all_vim-6.3-screen.linux-is-dark-83416.patch Sun Oct 9
03:49:34 2005
@@ -0,0 +1,24 @@
+# TERM=screen.linux background detection, Gentoo bug 83416.
+Index: src/option.c
+===================================================================
+--- src/option.c (revision 2)
++++ src/option.c (revision 3)
+@@ -3109,11 +3109,15 @@
+ /*
+ * If 'background' wasn't set by the user, try guessing the value,
+ * depending on the terminal name. Only need to check for terminals
+- * with a dark background, that can handle color. Only "linux"
+- * console at the moment.
++ * with a dark background, that can handle color. We recognise:
++ * * 'linux' -- linux console
++ * * 'screen.linux' -- linux console, with screen
+ */
+ idx4 = findoption((char_u *)"bg");
+- if (!(options[idx4].flags & P_WAS_SET) && STRCMP(T_NAME, "linux") == 0)
++ if (!(options[idx4].flags & P_WAS_SET) && (
++ (STRCMP(T_NAME, "linux") == 0) ||
++ (STRCMP(T_NAME, "screen.linux") == 0)
++ ))
+ {
+ set_string_option_direct(NULL, idx4, (char_u *)"dark", OPT_FREE);
+ /* don't mark it as set, when starting the GUI it may be changed
================================================================
Index: SOURCES/020_all_vim-7.0-fstab-tmpfs-size.patch
diff -u /dev/null SOURCES/020_all_vim-7.0-fstab-tmpfs-size.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/020_all_vim-7.0-fstab-tmpfs-size.patch Sun Oct 9 03:49:34 2005
@@ -0,0 +1,13 @@
+# Handle size= in fstab highlighting properly.
+--- vim7/runtime/syntax/fstab.vim.orig 2005-03-19 16:14:59.057091856 +0000
++++ vim7/runtime/syntax/fstab.vim 2005-03-19 16:17:17.036115856 +0000
+@@ -120,6 +120,9 @@
+ syn keyword fsOptionsReiserHash contained rupasov tea r5 detect
+ syn keyword fsOptionsKeywords contained hashed_relocation noborder nolog
notail no_unhashed_relocation replayonly
+
++" Options: tmpfs
++syn match fsOptionsKeywords contained /size=/ nextgroup=fsOptionsString
++
+ " Options: udf
+ syn match fsOptionsKeywords contained
/\%(anchor\|partition\|lastblock\|fileset\|rootdir\)=/ nextgroup=fsOptionsString
+ syn keyword fsOptionsKeywords contained unhide undelete strict novrs
================================================================
Index: SOURCES/021_all_vim-7.0-fstab-bogus-errors.patch
diff -u /dev/null SOURCES/021_all_vim-7.0-fstab-bogus-errors.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/021_all_vim-7.0-fstab-bogus-errors.patch Sun Oct 9 03:49:34 2005
@@ -0,0 +1,20 @@
+# Remove some bogus 'error' indications in fstab highlighting.
+--- vim7/runtime/syntax/fstab.vim.orig 2005-03-19 16:17:17.036115856 +0000
++++ vim7/runtime/syntax/fstab.vim 2005-03-19 16:27:35.364115712 +0000
+@@ -19,14 +19,14 @@
+
+ " Device
+ syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
+-syn match fsDeviceError /\%([^a-zA-Z0-9_\/[EMAIL PROTECTED]|^\w\{-}\ze\W\)/
contained
++syn match fsDeviceError /\%([^a-zA-Z0-9_\/[EMAIL PROTECTED]:]\)/ contained
+ syn keyword fsDeviceKeyword contained none proc linproc tmpfs
+ syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
+ syn match fsDeviceLabel contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+
+ " Mount Point
+ syn cluster fsMountPointCluster contains=fsMountPointKeyword,fsMountPointError
+-syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/[EMAIL
PROTECTED]|\s\+\zs\w\{-}\ze\s\)/ contained
++syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/[EMAIL PROTECTED])/ contained
+ syn keyword fsMountPointKeyword contained none swap
+
+ " Type
================================================================
Index: SOURCES/024_all_vim-6.3-bash-83565.patch
diff -u /dev/null SOURCES/024_all_vim-6.3-bash-83565.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/024_all_vim-6.3-bash-83565.patch Sun Oct 9 03:49:34 2005
@@ -0,0 +1,10 @@
+--- runtime/filetype.vim 2005-03-25 01:47:52.000000000 +0000
++++ runtime/filetype.vim 2005-03-25 01:48:53.000000000 +0000
+@@ -1302,6 +1302,7 @@
+ " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
+ " Gentoo ebuilds are actually bash scripts
+ au BufNewFile,BufRead
.bashrc*,bashrc,bash.bashrc,.bash_profile*,.bash_logout*,*.bash,*.ebuild call
SetFileTypeSH("bash")
++au BufNewFile,BufRead /*/bash*completion*/* call SetFileTypeSH("bash")
+ au BufNewFile,BufRead .kshrc*,*.ksh call SetFileTypeSH("ksh")
+ au BufNewFile,BufRead /etc/profile,.profile*,*.sh,*.env call
SetFileTypeSH(getline(1))
+
================================================================
Index: SOURCES/027_all_vim-7.0-automake-substitutions-93378.patch
diff -u /dev/null SOURCES/027_all_vim-7.0-automake-substitutions-93378.patch:1.1
--- /dev/null Sun Oct 9 03:49:39 2005
+++ SOURCES/027_all_vim-7.0-automake-substitutions-93378.patch Sun Oct 9
03:49:34 2005
@@ -0,0 +1,33 @@
+Index: runtime/syntax/automake.vim
+===================================================================
+RCS file: /cvsroot/vim/vim/runtime/syntax/automake.vim,v
+retrieving revision 1.5
+diff -u -r1.5 automake.vim
+--- runtime/syntax/automake.vim 13 May 2001 20:01:37 -0000 1.5
++++ runtime/syntax/automake.vim 23 May 2005 09:57:19 -0000
+@@ -44,6 +44,8 @@
+ syn region automakeMakeSString start=+'+ skip=+\\'+ end=+'+
contains=makeIdent,automakeSubstitution
+ syn region automakeMakeBString start=+`+ skip=+\\`+ end=+`+
contains=makeIdent,makeSString,makeDString,makeNextLine,automakeSubstitution
+
++syn cluster makeCommandsContains
add=autoMakeSubst,automakeMakeError,automakeBadSubst
++
+ " 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
+Index: runtime/syntax/make.vim
+===================================================================
+RCS file: /cvsroot/vim/vim/runtime/syntax/make.vim,v
+retrieving revision 1.15
+diff -u -r1.15 make.vim
+--- runtime/syntax/make.vim 8 May 2004 00:02:43 -0000 1.15
++++ runtime/syntax/make.vim 23 May 2005 09:57:19 -0000
+@@ -58,7 +58,8 @@
+ syn match makeSpecTarget
"^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>::\=\s*$"
contains=makeIdent skipnl nextgroup=makeCommands,makeCommandError
+
+ syn match makeCommandError "^\s\+\S.*" contained
+-syn region makeCommands start=";"hs=s+1 start="^\t"
end="^[^\t#]"me=e-1,re=e-1 end="^$" contained
contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString
nextgroup=makeCommandError
++syn region makeCommands start=";"hs=s+1 start="^\t"
end="^[^\t#]"me=e-1,re=e-1 end="^$" contained [EMAIL PROTECTED]
nextgroup=makeCommandError
++syn cluster makeCommandsContains
add=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString
+ syn match makeCmdNextLine "\\\n."he=e-1 contained
+
+
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
