r373 - in trunk/vim/debian: . patches

James Vega jamessan-guest at costa.debian.org
Fri Oct 21 13:56:51 UTC 2005


Author: jamessan-guest
Date: 2005-10-21 13:56:50 +0000 (Fri, 21 Oct 2005)
New Revision: 373

Added:
   trunk/vim/debian/patches/147_perl.vim.diff
Removed:
   trunk/vim/debian/patches/120_perl.vim.diff
Modified:
   trunk/vim/debian/changelog
Log:
Include an updated upstream syntax/perl.vim.


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-10-21 10:00:35 UTC (rev 372)
+++ trunk/vim/debian/changelog	2005-10-21 13:56:50 UTC (rev 373)
@@ -15,8 +15,12 @@
   * Changed debian/runtime/vimrc so that /etc/papersize is read without
     using system(), fixes issues with exotic shells. (closes: #271338)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Mon, 17 Oct 2005 11:23:04 +0200
+  [ James Vega ]
+  * Added patch 147_perl.vim.diff, new upstream syntax file which supercedes
+    120_perl.vim.diff.
 
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Fri, 21 Oct 2005 09:53:34 -0400
+
 vim (1:6.4-000+1) unstable; urgency=low
 
   [ Debian VIM Maintainers ]

Deleted: trunk/vim/debian/patches/120_perl.vim.diff
===================================================================
--- trunk/vim/debian/patches/120_perl.vim.diff	2005-10-21 10:00:35 UTC (rev 372)
+++ trunk/vim/debian/patches/120_perl.vim.diff	2005-10-21 13:56:50 UTC (rev 373)
@@ -1,50 +0,0 @@
-diff -ur vim63.orig/runtime/syntax/perl.vim vim63/runtime/syntax/perl.vim
---- vim63.orig/runtime/syntax/perl.vim	2004-05-16 09:28:03.000000000 -0400
-+++ vim63/runtime/syntax/perl.vim	2005-04-18 00:08:52.044429896 -0400
-@@ -17,8 +17,8 @@
- " perl syntax highlighting, with defaults given:
- "
- " unlet perl_include_pod
--" unlet perl_want_scope_in_variables
--" unlet perl_extended_vars
-+" unlet perl_no_scope_in_variables
-+" unlet perl_no_extended_vars
- " unlet perl_string_as_statement
- " unlet perl_no_sync_on_sub
- " unlet perl_no_sync_on_global_var
-@@ -146,16 +146,11 @@
- " And plain identifiers
- syn match  perlPackageRef	 "\(\h\w*\)\=\(::\|'\)\I"me=e-1 contained
- 
--" To highlight packages in variables as a scope reference - i.e. in $pack::var,
--" pack:: is a scope, just set "perl_want_scope_in_variables"
--" If you *want* complex things like @{${"foo"}} to be processed,
--" just set the variable "perl_extended_vars"...
--
- " FIXME value between {} should be marked as string. is treated as such by Perl.
- " At the moment it is marked as something greyish instead of read. Probably todo
- " with transparency. Or maybe we should handle the bare word in that case. or make it into
- 
--if exists("perl_want_scope_in_variables")
-+if !exists("perl_no_scope_in_variables")
-   syn match  perlVarPlain	"\\\=\([@%$]\|\$#\)\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember,perlMethod
-   syn match  perlFunctionName	"\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember
- else
-@@ -163,7 +158,7 @@
-   syn match  perlFunctionName	"\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" nextgroup=perlVarMember,perlVarSimpleMember
- endif
- 
--if exists("perl_extended_vars")
-+if !exists("perl_no_extended_vars")
-   syn cluster perlExpr		contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
-   syn region perlVarBlock	matchgroup=perlVarPlain start="\($#\|[@%$]\)\$*{" skip="\\}" end="}" contains=@perlExpr nextgroup=perlVarMember,perlVarSimpleMember
-   syn region perlVarBlock	matchgroup=perlVarPlain start="&\$*{" skip="\\}" end="}" contains=@perlExpr
-@@ -358,7 +353,7 @@
- syn keyword perlStatementSub	sub contained
- 
- syn match  perlFunctionPrototype	"([^)]*)" contained
--if exists("perl_want_scope_in_variables")
-+if !exists("perl_no_scope_in_variables")
-    syn match  perlFunctionPRef	"\h\w*::" contained
-    syn match  perlFunctionName	"\h\w*[^:]" contained
- else

Added: trunk/vim/debian/patches/147_perl.vim.diff
===================================================================
--- trunk/vim/debian/patches/147_perl.vim.diff	2005-10-21 10:00:35 UTC (rev 372)
+++ trunk/vim/debian/patches/147_perl.vim.diff	2005-10-21 13:56:50 UTC (rev 373)
@@ -0,0 +1,282 @@
+diff -urN vim64/runtime/syntax/perl.vim vim64.new/runtime/syntax/perl.vim
+--- vim64/runtime/syntax/perl.vim	2005-10-06 15:45:31.000000000 -0400
++++ vim64.new/runtime/syntax/perl.vim	2005-10-19 15:52:46.000000000 -0400
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:	Perl
+ " Maintainer:	Nick Hibma <n_hibma at van-laarhoven.org>
+-" Last Change:	2005 Oct 06
++" Last Change:	2005 October 18
+ " Location:	http://www.van-laarhoven.org/vim/syntax/perl.vim
+ "
+ " Please download most recent version first before mailing
+@@ -17,8 +17,8 @@
+ " perl syntax highlighting, with defaults given:
+ "
+ " unlet perl_include_pod
+-" unlet perl_want_scope_in_variables
+-" unlet perl_extended_vars
++" unlet perl_no_scope_in_variables
++" unlet perl_no_extended_vars
+ " unlet perl_string_as_statement
+ " unlet perl_no_sync_on_sub
+ " unlet perl_no_sync_on_global_var
+@@ -47,18 +47,18 @@
+   syn include @Pod syntax/pod.vim
+   unlet b:current_syntax
+   if exists("perl_fold")
+-    syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,perlTodo keepend fold
++    syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod, at Spell,perlTodo keepend fold
+     syn region perlPOD start="^=cut" end="^=cut" contains=perlTodo keepend fold
+   else
+-    syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,perlTodo keepend
++    syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod, at Spell,perlTodo keepend
+     syn region perlPOD start="^=cut" end="^=cut" contains=perlTodo keepend
+   endif
+ else
+   " Use only the bare minimum of rules
+   if exists("perl_fold")
+-    syn region perlPOD start="^=[a-z]" end="^=cut" fold
++    syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Spell fold
+   else
+-    syn region perlPOD start="^=[a-z]" end="^=cut"
++    syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Spell
+   endif
+ endif
+ 
+@@ -87,8 +87,8 @@
+ endif
+ syn keyword perlOperator		defined undef and or not bless ref
+ if exists("perl_fold")
+-  " if BEGIN/END would be a keyword the perlBEGINENDFold does not work
+-  syn match perlControl			"\<BEGIN\|CHECK\|INIT\|END\>" contained
++  " if BEGIN/END is a keyword the perlBEGINENDFold does not work
++  syn match perlControl			"\<BEGIN\|END\|CHECK\|INIT\>" contained
+ else
+   syn keyword perlControl		BEGIN END CHECK INIT
+ endif
+@@ -108,8 +108,8 @@
+ syn match   perlStatementFiles		"-[rwxoRWXOezsfdlpSbctugkTBMAC]\>"
+ syn keyword perlStatementFlow		caller die dump eval exit wantarray
+ syn keyword perlStatementInclude	require
+-syn match   perlStatementInclude	"\(use\|no\)\s\+\(integer\>\|strict\>\|lib\>\|sigtrap\>\|subs\>\|vars\>\|warnings\>\|utf8\>\|byte\>\)\="
+-syn keyword perlStatementScope		import
++syn match   perlStatementInclude	"\<\(use\|no\)\s\+(\(attributes\|autouse\|base\|big\(int\|num\|rat\)\|blib\|bytes\|charnames\|constant\|diagnostics\|encoding\|fields\|filetest\|if\|integer\|less\|lib\|locale\|open\|ops\|overload\|re\|sigtrap\|sort\|strict\|subs\|threads\(::shared\)\=\|utf8\|vars\|vmsish\|warnings\(::register\)\=\)\>\)\="
++
+ syn keyword perlStatementProc		alarm exec fork getpgrp getppid getpriority kill pipe setpgrp setpriority sleep system times wait waitpid
+ syn keyword perlStatementSocket		accept bind connect getpeername getsockname getsockopt listen recv send setsockopt shutdown socket socketpair
+ syn keyword perlStatementIPC		msgctl msgget msgrcv msgsnd semctl semget semop shmctl shmget shmread shmwrite
+@@ -118,8 +118,11 @@
+ syn keyword perlStatementTime		gmtime localtime time times
+ 
+ syn keyword perlStatementMisc		warn formline reset scalar delete prototype lock
+-syn keyword perlStatementNew		new
+-
++if !exists("perl_no_semi_keywords")
++  syn keyword perlStatementScope	import
++  syn keyword perlStatementNew		new
++  syn keyword perlStatementCarp		carp confess croak 		
++endif
+ syn keyword perlTodo			TODO TBD FIXME XXX contained
+ 
+ " Perl Identifiers.
+@@ -134,28 +137,25 @@
+ 
+ " Special variables first ($^A, ...) and ($|, $', ...)
+ syn match  perlVarPlain		 "$^[ADEFHILMOPSTWX]\="
+-syn match  perlVarPlain		 "$[\\\"\[\]'&`+*.,;=%~!?@$<>(-]"
+-syn match  perlVarPlain		 "$\(0\|[1-9][0-9]*\)"
++syn match  perlVarPlain		 "$[\\\"\[\]'&`+*.,;=%~?@$<>(-]"
++syn match  perlVarPlain		 "$\(0\|[1-9]\d*\)"
+ " Same as above, but avoids confusion in $::foo (equivalent to $main::foo)
+ syn match  perlVarPlain		 "$:[^:]"
+ " These variables are not recognized within matches.
+ syn match  perlVarNotInMatches	 "$[|)]"
+-" This variable is not recognized within matches delimited by m//.
++" This variable is not recognized within matches delimited by '/'.
+ syn match  perlVarSlash		 "$/"
++" This variable is not recognized within matches delimited by '!'.
++syn match  perlVarBang		 "$!"
+ 
+ " And plain identifiers
+ syn match  perlPackageRef	 "\(\h\w*\)\=\(::\|'\)\I"me=e-1 contained
+ 
+-" To highlight packages in variables as a scope reference - i.e. in $pack::var,
+-" pack:: is a scope, just set "perl_want_scope_in_variables"
+-" If you *want* complex things like @{${"foo"}} to be processed,
+-" just set the variable "perl_extended_vars"...
+-
+ " FIXME value between {} should be marked as string. is treated as such by Perl.
+ " At the moment it is marked as something greyish instead of read. Probably todo
+ " with transparency. Or maybe we should handle the bare word in that case. or make it into
+ 
+-if exists("perl_want_scope_in_variables")
++if !exists("perl_no_scope_in_variables")
+   syn match  perlVarPlain	"\\\=\([@%$]\|\$#\)\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember,perlMethod
+   syn match  perlFunctionName	"\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember
+ else
+@@ -163,8 +163,8 @@
+   syn match  perlFunctionName	"\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" nextgroup=perlVarMember,perlVarSimpleMember
+ endif
+ 
+-if exists("perl_extended_vars")
+-  syn cluster perlExpr		contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
++if !exists("perl_no_extended_vars")
++  syn cluster perlExpr		contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBang,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
+   syn region perlVarBlock	matchgroup=perlVarPlain start="\($#\|[@%$]\)\$*{" skip="\\}" end="}" contains=@perlExpr nextgroup=perlVarMember,perlVarSimpleMember
+   syn region perlVarBlock	matchgroup=perlVarPlain start="&\$*{" skip="\\}" end="}" contains=@perlExpr
+   syn match  perlVarPlain	"\\\=\(\$#\|[@%&$]\)\$*{\I\i*}" nextgroup=perlVarMember,perlVarSimpleMember
+@@ -179,17 +179,18 @@
+ syn match  perlFiledescRead	"[<]\h\w\+[>]"
+ 
+ syn match  perlFiledescStatementComma	"(\=\s*\u\w*\s*,"me=e-1 transparent contained contains=perlFiledescStatement
+-syn match  perlFiledescStatementNocomma "(\=\s*\u\w*\s*[^, \t]"me=e-1 transparent contained contains=perlFiledescStatement
++syn match  perlFiledescStatementNocomma "(\=\s*\u\w*\s*[^,[:space:]]"me=e-1 transparent contained contains=perlFiledescStatement
+ 
+ syn match  perlFiledescStatement	"\u\w*" contained
+ 
+ " Special characters in strings and matches
+ syn match  perlSpecialString	"\\\(\d\+\|[xX]\x\+\|c\u\|.\)" contained
+ syn match  perlSpecialStringU	"\\['\\]" contained
+-syn match  perlSpecialMatch	"{\d\+\(,\(\d\+\)\=\)\=}" contained
++syn match  perlSpecialMatch	"{\d\+\(,\d*\)\=}" contained
+ syn match  perlSpecialMatch	"\[\(\]\|-\)\=[^\[\]]*\(\[\|\-\)\=\]" contained
+ syn match  perlSpecialMatch	"[+*()?.]" contained
+ syn match  perlSpecialMatch	"(?[#:=!]" contained
++syn match  perlSpecialMatch	"(?<[=!]" contained
+ syn match  perlSpecialMatch	"(?[imsx]\+)" contained
+ " FIXME the line below does not work. It should mark end of line and
+ " begin of line as perlSpecial.
+@@ -206,13 +207,13 @@
+ " Variable interpolation
+ "
+ " These items are interpolated inside "" strings and similar constructs.
+-syn cluster perlInterpDQ	contains=perlSpecialString,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock
++syn cluster perlInterpDQ	contains=perlSpecialString,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBang,perlVarBlock
+ " These items are interpolated inside '' strings and similar constructs.
+ syn cluster perlInterpSQ	contains=perlSpecialStringU
+ " These items are interpolated inside m// matches and s/// substitutions.
+ syn cluster perlInterpSlash	contains=perlSpecialString,perlSpecialMatch,perlVarPlain,perlVarBlock,perlSpecialBEOM
+ " These items are interpolated inside m## matches and s### substitutions.
+-syn cluster perlInterpMatch	contains=@perlInterpSlash,perlVarSlash
++syn cluster perlInterpMatch	contains=@perlInterpSlash,perlVarSlash,perlVarBang
+ 
+ " Shell commands
+ syn region  perlShellCommand	matchgroup=perlMatchStartEnd start="`" end="`" contains=@perlInterpDQ
+@@ -238,8 +239,7 @@
+ 
+ " Below some hacks to recognise the // variant. This is virtually impossible to catch in all
+ " cases as the / is used in so many other ways, but these should be the most obvious ones.
+-"syn region perlMatch	matchgroup=perlMatchStartEnd start=+^split /+lc=5 start=+[^$@%]\<split /+lc=6 start=+^if /+lc=2 start=+[^$@%]if /+lc=3 start=+[!=]\~\s*/+lc=2 start=+[(~]/+lc=1 start=+\.\./+lc=2 start=+\s/[^= \t0-9$@%]+lc=1,me=e-1,rs=e-1 start=+^/+ skip=+\\/+ end=+/[cgimosx]*+ contains=@perlInterpSlash
+-syn region perlMatch	matchgroup=perlMatchStartEnd start=+^split /+lc=5 start=+[^$@%]\<split /+lc=6 start=+^while /+lc=5 start=+[^$@%]while /+lc=6 start=+^if /+lc=2 start=+[^$@%]if /+lc=3 start=+[!=]\~\s*/+lc=2 start=+[(~]/+lc=1 start=+\.\./+lc=2 start=+\s/[^= \t0-9$@%]+lc=1,me=e-1,rs=e-1 start=+^/+ skip=+\\/+ end=+/[cgimosx]*+ contains=@perlInterpSlash
++syn region perlMatch	matchgroup=perlMatchStartEnd start=+^split /+lc=5 start=+[^$@%&]\<split /+lc=6 start=+^while /+lc=5 start=+[^$@%&]while /+lc=6 start=+^if /+lc=2 start=+[^$@%&]if /+lc=3 start=+[!=]\~\s*/+lc=2 start=+[(~]/+lc=1 start=+\.\./+lc=2 start=+\s/[^=[:space:][:digit:]$@%&]+lc=1,me=e-1,rs=e-1 start=+^/+ skip=+\\/+ end=+/[cgimosx]*+ contains=@perlInterpSlash
+ 
+ 
+ " Substitutions
+@@ -258,7 +258,7 @@
+ syn region perlSubstitutionBracket	matchgroup=perlMatchStartEnd start=+\[+ end=+\][ecgimosx]*+ contained contains=@perlInterpDQ
+ syn region perlSubstitutionCurly	matchgroup=perlMatchStartEnd start=+{+  end=+}[ecgimosx]*+ contained contains=@perlInterpDQ
+ 
+-" A special case for m!!x which allows for comments and extra whitespace in the pattern
++" A special case for s!!!x which allows for comments and extra whitespace in the pattern
+ syn region perlMatch	matchgroup=perlMatchStartEnd start=+\<s!+ end=+!+me=e-1 contains=@perlInterpSlash,perlComment nextgroup=perlSubstitutionPling
+ syn region perlSubstitutionPling	matchgroup=perlMatchStartEnd start=+!+ end=+![ecgimosx]*+ contained contains=@perlInterpDQ
+ 
+@@ -285,24 +285,24 @@
+ 
+ " Strings and q, qq, qw and qr expressions
+ 
+-" Brackets in qq()
+-syn region perlBrackets	start=+(+ end=+)+ contained transparent contains=perlBrackets, at perlStringSQ
++" Parentheses in qq()
++syn region perlParens	start=+(+ end=+)+ contained transparent contains=perlParens, at perlStringSQ
+ 
+-syn region perlStringUnexpanded	matchgroup=perlStringStartEnd start="'" end="'" contains=@perlInterpSQ
+-syn region perlString		matchgroup=perlStringStartEnd start=+"+  end=+"+ contains=@perlInterpDQ
++syn region perlStringUnexpanded	matchgroup=perlStringStartEnd start="'" end="'" contains=@Spell, at perlInterpSQ
++syn region perlString		matchgroup=perlStringStartEnd start=+"+  end=+"+ contains=@Spell, at perlInterpDQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q#+ end=+#+ contains=@perlInterpSQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q|+ end=+|+ contains=@perlInterpSQ
+-syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q(+ end=+)+ contains=@perlInterpSQ,perlBrackets
++syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q(+ end=+)+ contains=@perlInterpSQ,perlParens
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q{+ end=+}+ contains=@perlInterpSQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q/+ end=+/+ contains=@perlInterpSQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q[qx]#+ end=+#+ contains=@perlInterpDQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q[qx]|+ end=+|+ contains=@perlInterpDQ
+-syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q[qx](+ end=+)+ contains=@perlInterpDQ,perlBrackets
++syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q[qx](+ end=+)+ contains=@perlInterpDQ,perlParens
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q[qx]{+ end=+}+ contains=@perlInterpDQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<q[qx]/+ end=+/+ contains=@perlInterpDQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qw#+  end=+#+ contains=@perlInterpSQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qw|+  end=+|+ contains=@perlInterpSQ
+-syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qw(+  end=+)+ contains=@perlInterpSQ,perlBrackets
++syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qw(+  end=+)+ contains=@perlInterpSQ,perlParens
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qw{+  end=+}+ contains=@perlInterpSQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qw/+  end=+/+ contains=@perlInterpSQ
+ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<qr#+  end=+#[imosx]*+ contains=@perlInterpMatch
+@@ -358,7 +358,7 @@
+ syn keyword perlStatementSub	sub contained
+ 
+ syn match  perlFunctionPrototype	"([^)]*)" contained
+-if exists("perl_want_scope_in_variables")
++if !exists("perl_no_scope_in_variables")
+    syn match  perlFunctionPRef	"\h\w*::" contained
+    syn match  perlFunctionName	"\h\w*[^:]" contained
+ else
+@@ -367,7 +367,7 @@
+ 
+ 
+ " All other # are comments, except ^#!
+-syn match  perlComment		"#.*" contains=perlTodo
++syn match  perlComment		"#.*" contains=@Spell,perlTodo
+ syn match  perlSharpBang	"^#!.*"
+ 
+ " Formats
+@@ -396,7 +396,7 @@
+   syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\|CHECK\|INIT\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
+ 
+   if exists("perl_fold_blocks")
+-    syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\(\s*{\)\=\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\(\s*{\)\=\s*$" end="^\z1}\s*;\=$" transparent fold keepend
++    syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\(\s*{\)\=\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\(\s*{\)\=\s*$" start="\z(\s*\)else\s*{\s*$" end="^\z1}\s*;\=$" transparent fold keepend
+     syn region perlIfFold start="^\z(\s*\)do\(\s*{\)\=\s*$" end="^\z1}\s*while" end="^\z1}\s*;\=$" transparent fold keepend
+   endif
+ 
+@@ -450,6 +450,7 @@
+   HiLink perlVarSimpleMemberName perlString
+   HiLink perlVarNotInMatches	perlIdentifier
+   HiLink perlVarSlash		perlIdentifier
++  HiLink perlVarBang		perlIdentifier
+   HiLink perlQQ			perlString
+   if version >= 600
+     HiLink perlHereDoc		perlString
+@@ -459,7 +460,7 @@
+     HiLink perlUntilEOFSQ	perlString
+     HiLink perlUntilEmptyDQ	perlString
+     HiLink perlUntilEmptySQ	perlString
+-    HiLink perlUntilEOF		perlString
++    HiLink perlUntilEOF		perlString		
+   endif
+   HiLink perlStringUnexpanded	perlString
+   HiLink perlSubstitutionSQ	perlString
+@@ -495,7 +496,7 @@
+   HiLink perlStatementFiles	perlStatement
+   HiLink perlStatementFlow	perlStatement
+   HiLink perlStatementScope	perlStatement
+-  HiLink perlStatementInclude	perlStatement
++  HiLink perlStatementInclude	perlInclude
+   HiLink perlStatementProc	perlStatement
+   HiLink perlStatementSocket	perlStatement
+   HiLink perlStatementIPC	perlStatement
+@@ -516,9 +517,9 @@
+   HiLink perlSpecialMatch	perlSpecial
+   HiLink perlSpecialBEOM	perlSpecial
+   HiLink perlDATA		perlComment
+-
+-  HiLink perlBrackets		Error
+-
++  
++  HiLink perlParens		Error
++  
+   " Possible errors
+   HiLink perlNotEmptyLine	Error
+   HiLink perlElseIfError	Error




More information about the pkg-vim-maintainers mailing list