Reply to message «[PATCH] Remove escaping of `[' inside collections», 
sent 20:35:03 18 November 2010, Thursday
by ZyX:

Looks like it has LF in invalid places. Resending patch as attachment.
# HG changeset patch
# User ZyX <[email protected]>
# Date 1290101513 -10800
# Node ID d32426d271eda00633ab4e51118ed32e1b97d690
# Parent  fcb916bed51a5ae096a9f5f5f697a909b2062040
Removed escaping of `[' in collections

diff -r fcb916bed51a -r d32426d271ed runtime/autoload/rubycomplete.vim
--- a/runtime/autoload/rubycomplete.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/autoload/rubycomplete.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -149,7 +149,7 @@
     endif
     let ctors = ctors.'\)'
 
-    let fstr = '=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%[xwQqr][(\...@]\|[A-Za-z0-9@:\-()\.]\+...\?\|lambda\|&\)'
+    let fstr = '=\s*\([^ \t]\+.' . ctors .'\>\|[[{"''/]\|%[xwQqr][([...@]\|[A-Za-z0-9@:\-()\.]\+...\?\|lambda\|&\)'
     let sstr = ''.a:v.'\>\s*[+\-*/]*'.fstr
     let [lnum,lcol] = searchpos(sstr,'nb',stopline)
     if lnum != 0 && lcol != 0
@@ -591,7 +591,7 @@
     input += base
     input.sub!(/.*[ \t\n\"\\'`><=;|&{(]/, '') # Readline.basic_word_break_characters
     input.sub!(/self\./, '')
-    input.sub!(/.*((\.\.[\[(]?)|([\[(]))/, '')
+    input.sub!(/.*((\.\.[[(]?)|([\[(]))/, '')
 
     dprint 'input %s' % input
     message = nil
diff -r fcb916bed51a -r d32426d271ed runtime/autoload/sqlcomplete.vim
--- a/runtime/autoload/sqlcomplete.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/autoload/sqlcomplete.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -613,7 +613,7 @@
 
 function! s:SQLCGetColumns(table_name, list_type)
     " Check if the table name was provided as part of the column name
-    let table_name   = matchstr(a:table_name, '^["\[\]a-zA-Z0-9_ ]\+\ze\.\?')
+    let table_name   = matchstr(a:table_name, '^["[\]a-zA-Z0-9_ ]\+\ze\.\?')
     let table_cols   = []
     let table_alias  = ''
     let move_to_top  = 1
@@ -628,7 +628,7 @@
         exec 'DBSetOption use_tbl_alias=n'
     endif
 
-    let table_name_stripped = substitute(table_name, '["\[\]]*', '', 'g')
+    let table_name_stripped = substitute(table_name, '["[\]]*', '', 'g')
 
     " Check if we have already cached the column list for this table
     " by its name
diff -r fcb916bed51a -r d32426d271ed runtime/indent/mma.vim
--- a/runtime/indent/mma.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/indent/mma.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -48,7 +48,7 @@
 
     " also, indent only if this line if this line isn't starting a new
     " block... TODO - fix this with indentkeys?
-    if getline(v:lnum-1) =~ '\\\@<!\%(\[[^\]]*\|([^)]*\|{[^}]*\)$' && getline(v:lnum) !~ '\s\+[\[({]'
+    if getline(v:lnum-1) =~ '\\\@<!\%(\[[^\]]*\|([^)]*\|{[^}]*\)$' && getline(v:lnum) !~ '\s\+[[({]'
         let ind = ind+&sw
     endif
 
diff -r fcb916bed51a -r d32426d271ed runtime/indent/perl.vim
--- a/runtime/indent/perl.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/indent/perl.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -124,7 +124,7 @@
     " Indent blocks enclosed by {}, (), or []
     if b:indent_use_syntax
         " Find a real opening brace
-        let bracepos = match(line, '[(){}\[\]]', matchend(line, '^\s*[)}\]]'))
+        let bracepos = match(line, '[(){}[\]]', matchend(line, '^\s*[)}\]]'))
         while bracepos != -1
             let synid = synIDattr(synID(lnum, bracepos + 1, 0), "name")
             " If the brace is highlighted in one of those groups, indent it.
@@ -141,7 +141,7 @@
                     let ind = ind - &sw
                 endif
             endif
-            let bracepos = match(line, '[(){}\[\]]', bracepos + 1)
+            let bracepos = match(line, '[(){}[\]]', bracepos + 1)
         endwhile
         let bracepos = matchend(cline, '^\s*[)}\]]')
         if bracepos != -1
@@ -153,7 +153,7 @@
             endif
         endif
     else
-        if line =~ '[{\[(]\s*\(#[^)}\]]*\)\=$'
+        if line =~ '[{[(]\s*\(#[^)}\]]*\)\=$'
             let ind = ind + &sw
         endif
         if cline =~ '^\s*[)}\]]'
diff -r fcb916bed51a -r d32426d271ed runtime/indent/perl6.vim
--- a/runtime/indent/perl6.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/indent/perl6.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -110,7 +110,7 @@
         endwhile
     endif
 
-        if line =~ '[<آ�\[{(]\s*\(#[^)}\]آ؛>]*\)\=$'
+        if line =~ '[<آ�[{(]\s*\(#[^)}\]آ؛>]*\)\=$'
             let ind = ind + &sw
         endif
         if cline =~ '^\s*[)}\]آ؛>]'
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/abel.vim
--- a/runtime/syntax/abel.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/abel.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -72,7 +72,7 @@
 
 " special characters
 " (define these after abelOperator so ?= overrides ?)
-syn match abelSpecialChar "[\[\](){},;:?]"
+syn match abelSpecialChar "[[\](){},;:?]"
 
 " operators
 syn match abelLogicalOperator "[!#&$]"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/ahdl.vim
--- a/runtime/syntax/ahdl.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/ahdl.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -61,7 +61,7 @@
 syn region ahdlComment start="%" end="%" contains=ahdlNumber,ahdlTodo
 
 " other special characters
-syn match   ahdlSpecialChar "[\[\]().,;]"
+syn match   ahdlSpecialChar "[[\]().,;]"
 
 syn sync minlines=1
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/antlr.vim
--- a/runtime/syntax/antlr.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/antlr.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -40,8 +40,8 @@
 " in case it was not defined in java.vim)
 "syn match javaFuncDef "--"
 "syn clear javaFuncDef
-"syn match javaFuncDef "[a-zA-Z][a-zA-Z0-9_. \[\]]*([^-+*/()]*)[ \t]*:" contains=javaType
-" syn region javaFuncDef start=+t[a-zA-Z][a-zA-Z0-9_. \[\]]*([^-+*/()]*,[ 	]*+ end=+)[ \t]*:+
+"syn match javaFuncDef "[a-zA-Z][a-zA-Z0-9_. [\]]*([^-+*/()]*)[ \t]*:" contains=javaType
+" syn region javaFuncDef start=+t[a-zA-Z][a-zA-Z0-9_. [\]]*([^-+*/()]*,[ 	]*+ end=+)[ \t]*:+
 
 syn keyword antlrPackages options language buildAST
 syn match antlrPackages "PARSER_END([^)]*)"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/asn.vim
--- a/runtime/syntax/asn.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/asn.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -41,7 +41,7 @@
 syn match   asnLineComment	"--.*"
 syn match   asnLineComment	"--.*--"
 
-syn match asnDefinition "^\s*[a-zA-Z][-a-zA-Z0-9_.\[\] \t{}]* *::="me=e-3 contains=asnType
+syn match asnDefinition "^\s*[a-zA-Z][-a-zA-Z0-9_.[\] \t{}]* *::="me=e-3 contains=asnType
 syn match asnBraces     "[{}]"
 
 syn sync ccomment asnComment
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/blank.vim
--- a/runtime/syntax/blank.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/blank.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -14,7 +14,7 @@
 syn case ignore
 
 " Blank instructions
-syn match blankInstruction "{[:;,\.+\-*$#@/\\`'"!\|><{}\[\]()?xspo\^&\~=_%]}"
+syn match blankInstruction "{[:;,\.+\-*$#@/\\`'"!\|><{}[\]()?xspo\^&\~=_%]}"
 
 " Common strings
 syn match blankString "\~[^}]"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/clipper.vim
--- a/runtime/syntax/clipper.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/clipper.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -83,7 +83,7 @@
 syn region clipperString	start=+'+ end=+'+
 
 " Delimiters
-syn match  ClipperDelimiters	"[()]\|[\[\]]\|[{}]\|[||]"
+syn match  ClipperDelimiters	"[()]\|[[\]]\|[{}]\|[||]"
 
 " Special
 syn match clipperLineContinuation	";"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/config.vim
--- a/runtime/syntax/config.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/config.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -18,7 +18,7 @@
 endif
 
 " define the config syntax
-syn match   configdelimiter "[()\[\];,]"
+syn match   configdelimiter "[()[\];,]"
 syn match   configoperator  "[=|&\*\+\<\>]"
 syn match   configcomment   "\(dnl.*\)\|\(#.*\)"
 syn match   configfunction  "\<[A-Z_][A-Z0-9_]*\>"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/cupl.vim
--- a/runtime/syntax/cupl.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/cupl.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -74,7 +74,7 @@
 syn match cuplBitVector "\<\a\+\d\+\.\.\d\+\>" contains=cuplRangeOperator
 
 " other special characters
-syn match cuplSpecialChar "[\[\](){},;]"
+syn match cuplSpecialChar "[[\](){},;]"
 
 " directives
 " (define these after cuplOperator so $xxx overrides $)
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/elf.vim
--- a/runtime/syntax/elf.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/elf.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -57,7 +57,7 @@
 syn sync ccomment elfComment
 
 " Parenthesis
-syn match elfParens "[\[\]()]"
+syn match elfParens "[[\]()]"
 
 " Punctuation
 syn match elfPunct "[,;]"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/fasm.vim
--- a/runtime/syntax/fasm.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/fasm.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -112,7 +112,7 @@
 syn region	fasmComment		start=";" end="$"
 syn region	fasmString		start="\"" end="\"\|$"
 syn region	fasmString		start="'" end="'\|$"
-syn match	fasmSymbol		"[()|\[\]:]"
+syn match	fasmSymbol		"[()|[\]:]"
 syn match	fasmSpecial		"[#?%$,]"
 syn match	fasmLabel		"^\s*[^; \t]\+:"
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/gdmo.vim
--- a/runtime/syntax/gdmo.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/gdmo.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -58,7 +58,7 @@
 syn match   gdmoLineComment       "--.*"
 syn match   gdmoLineComment       "--.*--"
 
-syn match gdmoDefinition "^\s*[a-zA-Z][-a-zA-Z0-9_.\[\] \t{}]* *::="me=e-3
+syn match gdmoDefinition "^\s*[a-zA-Z][-a-zA-Z0-9_.[\] \t{}]* *::="me=e-3
 syn match gdmoBraces     "[{}]"
 
 syn sync ccomment gdmoComment
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/groovy.vim
--- a/runtime/syntax/groovy.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/groovy.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -276,10 +276,10 @@
 
 if exists("groovy_highlight_functions")
   if groovy_highlight_functions == "indent"
-    syn match  groovyFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
-    syn region groovyFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
-    syn match  groovyFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
-    syn region groovyFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn match  groovyFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. [\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn match  groovyFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
   else
     " This line catches method declarations at any indentation>0, but it assumes
     " two things:
@@ -361,7 +361,7 @@
 
 " Hightlight brackets
 " syn match  groovyBraces		"[{}]"
-" syn match  groovyBraces		"[\[\]]"
+" syn match  groovyBraces		"[[\]]"
 " syn match  groovyBraces		"[\|]"
 
 if exists("groovy_mark_braces_in_parens_as_errors")
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/haskell.vim
--- a/runtime/syntax/haskell.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/haskell.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -55,7 +55,7 @@
 syn match hsDelimiter  "(\|)\|\[\|\]\|,\|;\|_\|{\|}"
 
 " Strings and constants
-syn match   hsSpecialChar	contained "\\\([0-9]\+\|o[0-7]\+\|x[0-9a-fA-F]\+\|[\"\\'&\\abfnrtv]\|^[A-Z^_\[\\\]]\)"
+syn match   hsSpecialChar	contained "\\\([0-9]\+\|o[0-7]\+\|x[0-9a-fA-F]\+\|[\"\\'&\\abfnrtv]\|^[A-Z^_[\\\]]\)"
 syn match   hsSpecialChar	contained "\\\(NUL\|SOH\|STX\|ETX\|EOT\|ENQ\|ACK\|BEL\|BS\|HT\|LF\|VT\|FF\|CR\|SO\|SI\|DLE\|DC1\|DC2\|DC3\|DC4\|NAK\|SYN\|ETB\|CAN\|EM\|SUB\|ESC\|FS\|GS\|RS\|US\|SP\|DEL\)"
 syn match   hsSpecialCharError	contained "\\&\|'''\+"
 syn region  hsString		start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=hsSpecialChar
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/ia64.vim
--- a/runtime/syntax/ia64.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/ia64.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -79,7 +79,7 @@
 syn match ia64delimiter ";;"
 
 "operators
-syn match ia64operators "[\[\]()#,]"
+syn match ia64operators "[[\]()#,]"
 syn match ia64operators "\(+\|-\|=\)"
 
 "TODO
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/java.vim
--- a/runtime/syntax/java.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/java.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -198,10 +198,10 @@
 
 if exists("java_highlight_functions")
   if java_highlight_functions == "indent"
-    syn match  javaFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
-    syn region javaFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
-    syn match  javaFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
-    syn region javaFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
+    syn match  javaFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. [\]]*([^-+*/()]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
+    syn region javaFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
+    syn match  javaFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
+    syn region javaFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses
   else
     " This line catches method declarations at any indentation>0, but it assumes
     " two things:
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/javacc.vim
--- a/runtime/syntax/javacc.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/javacc.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -38,7 +38,7 @@
 " in case it was not defined in java.vim)
 "syn match javaFuncDef "--"
 syn clear javaFuncDef
-syn match javaFuncDef "[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)[ \t]*:" contains=javaType
+syn match javaFuncDef "[$_a-zA-Z][$_a-zA-Z0-9_. [\]]*([^-+*/()]*)[ \t]*:" contains=javaType
 
 syn keyword javaccPackages options DEBUG_PARSER DEBUG_LOOKAHEAD DEBUG_TOKEN_MANAGER
 syn keyword javaccPackages COMMON_TOKEN_ACTION IGNORE_CASE CHOICE_AMBIGUITY_CHECK
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/javascript.vim
--- a/runtime/syntax/javascript.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/javascript.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -69,7 +69,7 @@
     setlocal foldtext=getline(v:foldstart)
 else
     syn keyword javaScriptFunction	function
-    syn match	javaScriptBraces	   "[{}\[\]]"
+    syn match	javaScriptBraces	   "[{}[\]]"
     syn match	javaScriptParens	   "[()]"
 endif
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/maxima.vim
--- a/runtime/syntax/maxima.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/maxima.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -24,7 +24,7 @@
 syn match  maximaBraceError	"[)}]"	contained
 syn match  maximaCurlyError	"[)\]]"	contained
 syn match  maximaParenError	"[\]}]"	contained
-syn match  maximaComma	"[\[\](),;]"
+syn match  maximaComma	"[[\](),;]"
 syn match  maximaComma	"\.\.\.$"
 
 " A bunch of useful maxima keywords
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/nasm.vim
--- a/runtime/syntax/nasm.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/nasm.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -249,10 +249,10 @@
 syn match   nasmRegisterError	"\<ST\((\d)\|[8-9]\>\)"
 syn match   nasmRegisterError	"\<E\([A-D][HL]\|[C-GS]S\)\>"
 "  Memory reference operand (address):
-syn match   nasmMemRefError	"[\[\]]"
+syn match   nasmMemRefError	"[[\]]"
 syn cluster nasmGrpCntnMemRef	contains=ALLBUT,@nasmGrpComments,@nasmGrpPreProcs,@nasmGrpInStrucs,nasmMemReference,nasmMemRefError
-syn match   nasmInMacMemRef	contained "\[[^;\[\]]\{-}\]" contai...@nasmgrpcntnmemref,nasmPreProcError,nasmInMacLabel,nasmInMacLblWarn,nasmInMacParam
-syn match   nasmMemReference	"\[[^;\[\]]\{-}\]" contai...@nasmgrpcntnmemref,nasmPreProcError,nasmCtxLocLabel
+syn match   nasmInMacMemRef	contained "\[[^;[\]]\{-}\]" contai...@nasmgrpcntnmemref,nasmPreProcError,nasmInMacLabel,nasmInMacLblWarn,nasmInMacParam
+syn match   nasmMemReference	"\[[^;[\]]\{-}\]" contai...@nasmgrpcntnmemref,nasmPreProcError,nasmCtxLocLabel
 
 
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/nroff.vim
--- a/runtime/syntax/nroff.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/nroff.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -125,9 +125,9 @@
 "
 " GNU troff allows long request names
 "
-	syn match nroffReqName /[^\t \\\[?]\+/ contained nextgroup=nroffReqArg
+	syn match nroffReqName /[^\t \\[?]\+/ contained nextgroup=nroffReqArg
 else
-	syn match nroffReqName /[^\t \\\[?]\{1,2}/ contained nextgroup=nroffReqArg
+	syn match nroffReqName /[^\t \\[?]\{1,2}/ contained nextgroup=nroffReqArg
 endif
 
 syn region nroffReqArg start=/\S/ skip=/\\$/ end=/$/ contained contains=nroffEscape,@nroffSpecial,nroffString,nroffError,nroffSpaceError,nroffNumBlock,nroffComment
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/perl.vim
--- a/runtime/syntax/perl.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/perl.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -111,7 +111,7 @@
 
 " Special variables first ($^A, ...) and ($|, $', ...)
 syn match  perlVarPlain		 "$^[ACDEFHILMNOPRSTVWX]\="
-syn match  perlVarPlain		 "$[\\\"\[\]'&`+*.,;=%...@#$<>(-]"
+syn match  perlVarPlain		 "$[\\\"[\]'&`+*.,;=%...@#$<>(-]"
 syn match  perlVarPlain		 "%+"
 syn match  perlVarPlain		 "$\%(0\|[1-9]\d*\)"
 " Same as above, but avoids confusion in $::foo (equivalent to $main::foo)
@@ -174,7 +174,7 @@
 syn match  perlSpecialMatch	"\\g\%(\d\+\|{\%(-\=\d\+\|\h\w*\)}\)" contained
 syn match  perlSpecialMatch	"\\k\%(<\h\w*>\|'\h\w*'\)" 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	"(?[impsx]*\%(-[imsx]\+\)\=)" contained
@@ -242,7 +242,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\|\<while\|\<if\|\<unless\|\.\.\|[-+*!~(\[{=]\)\s*\)\@<=/\%(/=\)\...@!" start=+^/\%(/=\)\...@!+ start=+\s\@<=/\%(/=\)\...@![^[:space:][:digit:]...@%=]\@=\%(/\_s*\%([([...@%&*[:digit:]"'`]\|\_s\w\|[[:upper:]_abd-fhjklnqrt-wyz]\)\)\...@!+ skip=+\\/+ end=+/[cgimopsx]*+ contai...@perlinterpslash
+syn region perlMatch	matchgroup=perlMatchStartEnd start="\%([...@%&*]\@<!\%(\<split\|\<while\|\<if\|\<unless\|\.\.\|[-+*!~([{=]\)\s*\)\@<=/\%(/=\)\...@!" start=+^/\%(/=\)\...@!+ start=+\s\@<=/\%(/=\)\...@![^[:space:][:digit:]...@%=]\@=\%(/\_s*\%([([...@%&*[:digit:]"'`]\|\_s\w\|[[:upper:]_abd-fhjklnqrt-wyz]\)\)\...@!+ skip=+\\/+ end=+/[cgimopsx]*+ contai...@perlinterpslash
 
 
 " Substitutions
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/perl6.vim
--- a/runtime/syntax/perl6.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/perl6.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -1021,7 +1021,7 @@
 " TODO: mostly stolen from perl.vim, might need more work
 syn region p6Match
     \ matchgroup=p6Quote
-    \ start="\%([...@%&*]\@<!\%(\<\%(split\|while\|until\|if\|unless\)\|\.\.\|[-+*!~(\[{=]\)\s*\)\@<=//\...@!"
+    \ start="\%([...@%&*]\@<!\%(\<\%(split\|while\|until\|if\|unless\)\|\.\.\|[-+*!~([{=]\)\s*\)\@<=//\...@!"
     \ start="^//\...@!"
     \ start=+\s\@<=/[^[:space:][:digit:]...@%=]\@=\%(/\_s*\%([([...@%&*[:digit:]"'`]\|\_s\w\|[[:upper:]_abd-fhjklnqrt-wyz]\)\)\...@!/\...@!+
     \ skip="\\/"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/po.vim
--- a/runtime/syntax/po.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/po.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -30,8 +30,8 @@
 
 " Translation blocks
 syn region     poMsgCTxt	matchgroup=poStatementMsgCTxt start=+^msgctxt "+rs=e-1 matchgroup=poStringCTxt end=+^msgid "+me=s-1 contains=poStringCTxt
-syn region     poMsgID	matchgroup=poStatementMsgid start=+^msgid "+rs=e-1 matchgroup=poStringID end=+^msgstr\(\|\[[\]0\[]\]\) "+me=s-1 contains=poStringID,poStatementMsgidplural,poStatementMsgid
-syn region     poMsgSTR	matchgroup=poStatementMsgstr start=+^msgstr\(\|\[[\]0\[]\]\) "+rs=e-1 matchgroup=poStringSTR end=+\n\n+me=s-1 contains=poStringSTR,poStatementMsgstr
+syn region     poMsgID	matchgroup=poStatementMsgid start=+^msgid "+rs=e-1 matchgroup=poStringID end=+^msgstr\(\|\[[\]0[]\]\) "+me=s-1 contains=poStringID,poStatementMsgidplural,poStatementMsgid
+syn region     poMsgSTR	matchgroup=poStatementMsgstr start=+^msgstr\(\|\[[\]0[]\]\) "+rs=e-1 matchgroup=poStringSTR end=+\n\n+me=s-1 contains=poStringSTR,poStatementMsgstr
 syn region poStringCTxt	start=+"+ skip=+\\\\\|\\"+ end=+"+
 syn region poStringID	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained 
                             \ contains=poSpecial,poFormat,poCommentKDE,poPluralKDE,poKDEdesktopFile,poHtml,poAcceleratorId,poHtmlNot,poVariable
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/postscr.vim
--- a/runtime/syntax/postscr.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/postscr.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -103,7 +103,7 @@
 syn keyword postscrMathOperator sin exp ln log rand srand rrand
 
 " Array operators
-syn match postscrOperator       "[\[\]{}]"
+syn match postscrOperator       "[[\]{}]"
 syn keyword postscrOperator     array length get put getinterval putinterval astore aload copy
 syn keyword postscrRepeat       forall
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/rexx.vim
--- a/runtime/syntax/rexx.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/rexx.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -28,7 +28,7 @@
 setlocal iskeyword+=?
 
 " ---rgf, position important: must be before comments etc. !
-syn match rexxOperator "[=|\/\\\+\*\[\],;:<>&\~%\-]"
+syn match rexxOperator "[=|\/\\\+\*[\],;:<>&\~%\-]"
 
 " rgf syn match rexxIdentifier        "\<[a-zA-Z\!\?_]\([a-zA-Z0-9._?!]\)*\>"
 syn match rexxIdentifier        "\<\K\k*\>"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/scheme.vim
--- a/runtime/syntax/scheme.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/scheme.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -26,12 +26,12 @@
 
 " Fascist highlighting: everything that doesn't fit the rules is an error...
 
-syn match	schemeError	![^ \t()\[\]";]*!
+syn match	schemeError	![^ \t()[\]";]*!
 syn match	schemeError	")"
 
 " Quoted and backquoted stuff
 
-syn region schemeQuoted matchgroup=Delimiter start="['`]" end=![ \t()\[\]";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
+syn region schemeQuoted matchgroup=Delimiter start="['`]" end=![ \t()[\]";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
 
 syn region schemeQuoted matchgroup=Delimiter start="['`](" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
 syn region schemeQuoted matchgroup=Delimiter start="['`]#(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
@@ -44,8 +44,8 @@
 syn region schemeStrucRestricted matchgroup=Delimiter start="\[" matchgroup=Delimiter end="\]" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
 syn region schemeStrucRestricted matchgroup=Delimiter start="#\[" matchgroup=Delimiter end="\]" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
 
-syn region schemeUnquote matchgroup=Delimiter start="," end=![ \t\[\]()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
-syn region schemeUnquote matchgroup=Delimiter start=",@" end=![ \t\[\]()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
+syn region schemeUnquote matchgroup=Delimiter start="," end=![ \t[\]()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
+syn region schemeUnquote matchgroup=Delimiter start=",@" end=![ \t[\]()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
 
 syn region schemeUnquote matchgroup=Delimiter start=",(" end=")" contains=ALL
 syn region schemeUnquote matchgroup=Delimiter start=",@(" end=")" contains=ALL
@@ -124,26 +124,26 @@
 " ... so that a single + or -, inside a quoted context, would not be
 " interpreted as a number (outside such contexts, it's a schemeFunc)
 
-syn match	schemeDelimiter	!\.[ \t\[\]()";]!me=e-1
+syn match	schemeDelimiter	!\.[ \t[\]()";]!me=e-1
 syn match	schemeDelimiter	!\.$!
 " ... and a single dot is not a number but a delimiter
 
 " This keeps all other stuff unhighlighted, except *stuff* and <stuff>:
 
 syn match	schemeOther	,[a-z!$%&*/:<=>?^...@#%-][-a-z!$%&*/:<=>?^_~0-...@#%]*,
-syn match	schemeError	,[a-z!$%&*/:<=>?^...@#%-][-a-z!$%&*/:<=>?^_~0-...@#%]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
+syn match	schemeError	,[a-z!$%&*/:<=>?^...@#%-][-a-z!$%&*/:<=>?^_~0-...@#%]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t[\]()";]\+[^ \t\[\]()";]*,
 
 syn match	schemeOther	"\.\.\."
-syn match	schemeError	!\.\.\.[^ \t\[\]()";]\+!
+syn match	schemeError	!\.\.\.[^ \t[\]()";]\+!
 " ... a special identifier
 
-syn match	schemeConstant	,\*[-a-z!$%&*/:<=>?^_~0-...@]\+\*[ \t\[\]()";],me=e-1
+syn match	schemeConstant	,\*[-a-z!$%&*/:<=>?^_~0-...@]\+\*[ \t[\]()";],me=e-1
 syn match	schemeConstant	,\*[-a-z!$%&*/:<=>?^_~0-...@]\+\*$,
-syn match	schemeError	,\*[-a-z!$%&*/:<=>?^_~0-...@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
+syn match	schemeError	,\*[-a-z!$%&*/:<=>?^_~0-...@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t[\]()";]\+[^ \t\[\]()";]*,
 
-syn match	schemeConstant	,<[-a-z!$%&*/:<=>?^_~0-...@]*>[ \t\[\]()";],me=e-1
+syn match	schemeConstant	,<[-a-z!$%&*/:<=>?^_~0-...@]*>[ \t[\]()";],me=e-1
 syn match	schemeConstant	,<[-a-z!$%&*/:<=>?^_~0-...@]*>$,
-syn match	schemeError	,<[-a-z!$%&*/:<=>?^_~0-...@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*,
+syn match	schemeError	,<[-a-z!$%&*/:<=>?^_~0-...@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t[\]()";]\+[^ \t\[\]()";]*,
 
 " Non-quoted lists, and strings:
 
@@ -164,23 +164,23 @@
 " Writing out the complete description of Scheme numerals without
 " using variables is a day's work for a trained secretary...
 
-syn match	schemeOther	![+-][ \t\[\]()";]!me=e-1
+syn match	schemeOther	![+-][ \t[\]()";]!me=e-1
 syn match	schemeOther	![+-]$!
 "
 " This is a useful lax approximation:
 syn match	schemeNumber	"[-#+.]\=[0-9][-#+/[email protected]]*"
-syn match	schemeError	![-#+0-9.][-#+/[email protected]]*[^-#+/[email protected] \t\[\]()";][^ \t\[\]()";]*!
+syn match	schemeError	![-#+0-9.][-#+/[email protected]]*[^-#+/[email protected] \t[\]()";][^ \t\[\]()";]*!
 
 syn match	schemeBoolean	"#[tf]"
-syn match	schemeError	!#[tf][^ \t\[\]()";]\+!
+syn match	schemeError	!#[tf][^ \t[\]()";]\+!
 
 syn match	schemeCharacter	"#\\"
 syn match	schemeCharacter	"#\\."
-syn match       schemeError	!#\\.[^ \t\[\]()";]\+!
+syn match       schemeError	!#\\.[^ \t[\]()";]\+!
 syn match	schemeCharacter	"#\\space"
-syn match	schemeError	!#\\space[^ \t\[\]()";]\+!
+syn match	schemeError	!#\\space[^ \t[\]()";]\+!
 syn match	schemeCharacter	"#\\newline"
-syn match	schemeError	!#\\newline[^ \t\[\]()";]\+!
+syn match	schemeError	!#\\newline[^ \t[\]()";]\+!
 
 " R6RS
 syn match schemeCharacter "#\\x[0-9a-fA-F]\+"
@@ -234,13 +234,13 @@
     syn keyword schemeExtFunc command-line current-command-line-arguments once-any help-labels multi once-each 
 
     " syntax quoting, unquoting and quasiquotation
-    syn region schemeUnquote matchgroup=Delimiter start="#," end=![ \t\[\]()";]!me=e-1 contains=ALL
-    syn region schemeUnquote matchgroup=Delimiter start="#,@" end=![ \t\[\]()";]!me=e-1 contains=ALL
+    syn region schemeUnquote matchgroup=Delimiter start="#," end=![ \t[\]()";]!me=e-1 contains=ALL
+    syn region schemeUnquote matchgroup=Delimiter start="#,@" end=![ \t[\]()";]!me=e-1 contains=ALL
     syn region schemeUnquote matchgroup=Delimiter start="#,(" end=")" contains=ALL
     syn region schemeUnquote matchgroup=Delimiter start="#,@(" end=")" contains=ALL
     syn region schemeUnquote matchgroup=Delimiter start="#,\[" end="\]" contains=ALL
     syn region schemeUnquote matchgroup=Delimiter start="#,@\[" end="\]" contains=ALL
-    syn region schemeQuoted matchgroup=Delimiter start="#['`]" end=![ \t()\[\]";]!me=e-1 contains=ALL
+    syn region schemeQuoted matchgroup=Delimiter start="#['`]" end=![ \t()[\]";]!me=e-1 contains=ALL
     syn region schemeQuoted matchgroup=Delimiter start="#['`](" matchgroup=Delimiter end=")" contains=ALL
 endif
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/sisu.vim
--- a/runtime/syntax/sisu.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/sisu.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -134,7 +134,7 @@
 syn match sisu_error contains=sisu_error "\~\^\s\+\.\s*"
 syn match sisu_error contains=sisu_error "{\~^\S\+"
 syn match sisu_error contains=sisu_error "[_/\*!^]{[ .,:;?><]*}[_/\*!^]"
-syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
+syn match sisu_error contains=sisu_error "[^ (\"'[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
 syn match sisu_error contains=sisu_error "<dir>"
 "errors for filetype sisu, though not error in 'metaverse':
 syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/smarty.vim
--- a/runtime/syntax/smarty.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/smarty.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -21,7 +21,7 @@
 runtime! syntax/html.vim
 "syn cluster htmlPreproc add=smartyUnZone
 
-syn match smartyBlock contained "[\[\]]"
+syn match smartyBlock contained "[[\]]"
 
 syn keyword smartyTagName capture config_load include include_php
 syn keyword smartyTagName insert if elseif else ldelim rdelim literal
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/smith.vim
--- a/runtime/syntax/smith.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/smith.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -18,7 +18,7 @@
 
 syn match smithNumber		"\<[+-]*[0-9]\d*\>"
 
-syn match smithRegister		"R[\[]*[0-9]*[\]]*"
+syn match smithRegister		"R\[*[0-9]*\]*"
 
 syn match smithKeyword	"COR\|MOV\|MUL\|NOT\|STOP\|SUB\|NOP\|BLA\|REP"
 
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/specman.vim
--- a/runtime/syntax/specman.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/specman.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -78,7 +78,7 @@
 syn keyword specmanFSM	       initial idle others posedge clock cycles
 
 
-syn match   specmanOperator    "[&|~><!)(*...@+/=?:;}{,.\^\-\[\]]"
+syn match   specmanOperator    "[&|~><!)(*...@+/=?:;}{,.\^\-[\]]"
 syn match   specmanOperator    "+="
 syn match   specmanOperator    "-="
 syn match   specmanOperator    "*="
@@ -87,7 +87,7 @@
 syn match   specmanComment     "--.*"
 syn region  specmanComment     start="^'>"hs=s+2 end="^<'"he=e-2
 
-syn match   specmanHDL	       "'[`.a-za-z0...@\[\]]\+\>'"
+syn match   specmanHDL	       "'[`.a-za-z0...@[\]]\+\>'"
 
 
 syn match   specmanCompare    "=="
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/vera.vim
--- a/runtime/syntax/vera.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/vera.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -232,7 +232,7 @@
 syn match   veraUserConstant "\<[A-Z][A-Z0-9_]\+\>"
 
 syn match veraClass "\zs\w\+\ze::"
-syn match veraClass "\zs\w\+\ze\s\+\w\+\s*[=;,)\[]" contains=veraConstant,veraUserConstant
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*[=;,)[]" contains=veraConstant,veraUserConstant
 syn match veraClass "\zs\w\+\ze\s\+\w\+\s*$" contains=veraConstant,veraUserConstant
 syn match veraUserMethod "\zs\w\+\ze\s*(" contains=veraConstant,veraUserConstant
 syn match veraObject "\zs\w\+\ze\.\w"
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/verilog.vim
--- a/runtime/syntax/verilog.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/verilog.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -50,7 +50,7 @@
 
 syn keyword verilogTodo contained TODO
 
-syn match   verilogOperator "[&|~><!)(*...@+/=?:;}{,.\^\-\[\]]"
+syn match   verilogOperator "[&|~><!)(*...@+/=?:;}{,.\^\-[\]]"
 
 syn region  verilogComment start="/\*" end="\*/" contains=verilogTodo,@Spell
 syn match   verilogComment "//.*" contains=verilogTodo,@Spell
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/verilogams.vim
--- a/runtime/syntax/verilogams.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/verilogams.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -69,7 +69,7 @@
 " Annex B.3 Connect Rules
 syn keyword verilogamsStatement connect merged resolveto split
 
-syn match   verilogamsOperator  "[&|~><!)(*...@+/=?:;}{,.\^\-\[\]]"
+syn match   verilogamsOperator  "[&|~><!)(*...@+/=?:;}{,.\^\-[\]]"
 syn match   verilogamsOperator  "<+"
 syn match   verilogamsStatement "[vV]("me=e-1
 syn match   verilogamsStatement "[iI]("me=e-1
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/vhdl.vim
--- a/runtime/syntax/vhdl.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/vhdl.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -148,7 +148,7 @@
 syn match vhdlTime "\<\d\+\.\d\+\s\+\(\([fpnum]s\)\|\(sec\)\|\(min\)\|\(hr\)\)\>"
 
 syn match vhdlComment "--.*$"
-" syn match vhdlGlobal "[\'$#...@?\^\[\]{}\\]"
+" syn match vhdlGlobal "[\'$#...@?\^[\]{}\\]"
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
diff -r fcb916bed51a -r d32426d271ed runtime/syntax/yaml.vim
--- a/runtime/syntax/yaml.vim	Wed Nov 10 20:41:57 2010 +0100
+++ b/runtime/syntax/yaml.vim	Thu Nov 18 20:31:53 2010 +0300
@@ -13,11 +13,11 @@
 
 let s:ns_char = '\%(\%([\n\r\uFEFF \t]\)\...@!\p\)'
 let s:ns_word_char = '\%(\w\|-\)'
-let s:ns_uri_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$,.!~*''()\[\]]\)'
+let s:ns_uri_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$,.!~*''()[\]]\)'
 let s:ns_tag_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$.~*''()]\)'
-let s:c_ns_anchor_char = '\%(\%([\n\r\uFEFF \t,\[\]{}]\)\...@!\p\)'
-let s:c_indicator      = '[\-?:,\[\]{}#&*!|>''"%...@`]'
-let s:c_flow_indicator = '[,\[\]{}]'
+let s:c_ns_anchor_char = '\%(\%([\n\r\uFEFF \t,[\]{}]\)\...@!\p\)'
+let s:c_indicator      = '[\-?:,[\]{}#&*!|>''"%...@`]'
+let s:c_flow_indicator = '[,[\]{}]'
 
 let s:c_verbatim_tag = '!<'.s:ns_uri_char.'\+>'
 let s:c_named_tag_handle     = '!'.s:ns_word_char.'\+!'
@@ -122,10 +122,10 @@
 syn keyword yamlConstant null Null NULL
 syn match   yamlConstant '\<\~\>'
 
-syn match   yamlTimestamp /\%([\[\]{}, \...@!\p\)\@<!\%(\d\{4}-\d\d\=-\d\d\=\%(\%([Tt]\|\s\+\)\%(\d\d\=\):\%(\d\d\):\%(\d\d\)\%(\.\%(\d*\)\)\=\%(\s*\%(Z\|[+-]\d\d\=\%(:\d\d\)\=\)\)\=\)\=\)\%([\[\]{}, \...@!\p\)\...@!/
+syn match   yamlTimestamp /\%([[\]{}, \...@!\p\)\@<!\%(\d\{4}-\d\d\=-\d\d\=\%(\%([Tt]\|\s\+\)\%(\d\d\=\):\%(\d\d\):\%(\d\d\)\%(\.\%(\d*\)\)\=\%(\s*\%(Z\|[+-]\d\d\=\%(:\d\d\)\=\)\)\=\)\=\)\%([[\]{}, \...@!\p\)\...@!/
 
-syn match   yamlInteger /\%([\[\]{}, \...@!\p\)\@<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\|[1-9][0-9_]*\)\%([\[\]{}, \...@!\p\)\...@!/
-syn match   yamlFloat   /\%([\[\]{}, \...@!\p\)\@<!\%([+-]\=\%(\%(\d[0-9_]*\)\.[0-9_]*\%([eE][+-]\d\+\)\=\|\.[0-9_]\+\%([eE][-+][0-9]\+\)\=\|\d[0-9_]*\%(:[0-5]\=\d\)\+\.[0-9_]*\|\.\%(inf\|Inf\|INF\)\)\|\%(\.\%(nan\|NaN\|NAN\)\)\)\%([\[\]{}, \...@!\p\)\...@!/
+syn match   yamlInteger /\%([[\]{}, \...@!\p\)\@<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\|[1-9][0-9_]*\)\%([[\]{}, \...@!\p\)\...@!/
+syn match   yamlFloat   /\%([[\]{}, \...@!\p\)\@<!\%([+-]\=\%(\%(\d[0-9_]*\)\.[0-9_]*\%([eE][+-]\d\+\)\=\|\.[0-9_]\+\%([eE][-+][0-9]\+\)\=\|\d[0-9_]*\%(:[0-5]\=\d\)\+\.[0-9_]*\|\.\%(inf\|Inf\|INF\)\)\|\%(\.\%(nan\|NaN\|NAN\)\)\)\%([[\]{}, \...@!\p\)\...@!/
 
 execute 'syn match yamlNodeTag '.string(s:c_ns_tag_property)
 execute 'syn match yamlAnchor  '.string(s:c_ns_anchor_property)

Attachment: signature.asc
Description: This is a digitally signed message part.

Raspunde prin e-mail lui