r424 - in trunk/vim/debian: . patches

[Matthijs Mohlmann]

Author: active2-guest
Date: 2005-12-02 21:42:44 +0000 (Fri, 02 Dec 2005)
New Revision: 424

Added:
   trunk/vim/debian/patches/150_asterisk.vim.diff
Modified:
   trunk/vim/debian/changelog
Log:
 * Updated syntax highlighting for asterisk


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-12-02 09:03:40 UTC (rev 423)
+++ trunk/vim/debian/changelog	2005-12-02 21:42:44 UTC (rev 424)
@@ -41,8 +41,9 @@
 
   [ Matthijs Mohlmann ]
   * Updated syntax for sshd_config and ssh_config.
+  * Updated syntax highlighting for asterisk.vim (Closes: #338256)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Thu,  1 Dec 2005 10:49:56 -0500
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Fri,  2 Dec 2005 22:41:17 +0100
 
 vim (1:6.4-001+2) unstable; urgency=low
 

Added: trunk/vim/debian/patches/150_asterisk.vim.diff
===================================================================
--- trunk/vim/debian/patches/150_asterisk.vim.diff	2005-12-02 09:03:40 UTC (rev 423)
+++ trunk/vim/debian/patches/150_asterisk.vim.diff	2005-12-02 21:42:44 UTC (rev 424)
@@ -0,0 +1,80 @@
+diff -ruN vim64.orig/runtime/syntax/asterisk.vim vim64/runtime/syntax/asterisk.vim
+--- vim64.orig/runtime/syntax/asterisk.vim	2005-11-26 12:26:47.199463000 +0100
++++ vim64/runtime/syntax/asterisk.vim	2005-12-02 22:38:48.200918500 +0100
+@@ -1,8 +1,8 @@
+ " Vim syntax file
+ " Language:	Asterisk config file
+ " Maintainer:	brc007
+-" Last Change:	2005 Mar 7
+-" version 0.2
++" Last Change:	2005 Dec 1
++" version 0.3
+ "
+ " Additional changes made 2005 Mar 7 by Corydon76
+ " * CVS priority, including n and s, and new label definitions
+@@ -10,6 +10,11 @@
+ " * Class patterns in extensions now match only the class pattern (instead of to a following expression)
+ " * anthm's functions are matched
+ " * Variables now appear in their own colors inside expressions
++"
++" Additional changes made 2005 Dec 1 by Matthew A. Nicholson
++" * Made highlighting less specific to extensions.conf
++" * Made highlighting more robust and flexible
++" 
+ 
+ " For version 5.x: Clear all syntax items
+ " For version 6.x: Quit when a syntax file was already loaded
+@@ -24,21 +29,19 @@
+ syn sync fromstart
+ 
+ 
+-syn keyword	asteriskTodo	TODO contained
+-syn match	asteriskComment		";.*" contains=asteriskTodo
+-syn match       asteriskContext         "\[.\{-}\]"
+-syn match	asteriskExten		"^\s*exten\s*=>"
+-syn match       asteriskApp             "\s*,\s*\zs[a-zA-Z]*\ze"
+-" Digits plus oldlabel (newlabel)
+-syn match       asteriskPriority        ",[[:digit:]]\+\(+[[:alpha:]][[:alnum:]_]*\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?,"
+-" s or n plus digits (newlabel)
+-syn match       asteriskPriority        ",[sn]\(+[[:digit:]]\+\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?,"
+-syn match       asteriskIncludeBad "^\s*#\s*[[:alnum:]]*"
+-syn match       asteriskInclude		"^\s#\sinclude\s.*"
+-syn match       asteriskVar             "\${_\{0,2}[[:alpha:]][[:alnum:]_]*\(:[[:digit:]]\+\)\{0,2}}"
+-syn match       asteriskVarLen          "\${_\{0,2}[[:alpha:]][[:alnum:]_]*(.\{-})}" contains=asteriskVar,asteriskVarLen,asteriskExp
+-syn match       asteriskExp             "\$\[.\{-}\]" contains=asteriskVar,asteriskVarLen,asteriskExp
+-syn match       asteriskFunc            "\$([[:alpha:]][[:alnum:]_]*.*)" contains=asteriskVar,asteriskVarLen,asteriskExp
++syn keyword	asteriskTodo		TODO contained
++syn match	asteriskComment		/;.*/ contains=asteriskTodo
++syn match       asteriskContext         /\[.\{-}\]/
++syn match	asteriskStatement	/^\s*\w\+\s*=>\?\s*.*/ contains=asteriskOperator,asteriskKeyword,asteriskData,asteriskComment,asteriskVar,asteriskVarLen,asteriskExp,asteriskFunc
++syn match	asteriskKeyword		/\w\+\s*=>\?/ contained contains=asteriskOperator
++syn match	asteriskData		/=>\?.*/ contained contains=asteriskOperator
++syn match	asteriskOperator	/=>\?\|,\||\|(\|)/ contained
++syn match       asteriskIncludeBad	/^\s*#\s*[[:alnum:]]*/
++syn match       asteriskInclude		/^\s#\sinclude\s.*/
++syn match       asteriskVar             /\${_\{0,2}[[:alnum:]_-]\+\(:[[:digit:]]*\)\{0,2}}/ contains=asteriskVar
++syn match       asteriskVarLen          /\${_\{0,2}[[:alnum:]_-]*(.\{-})}/
++syn match       asteriskExp             /\$\[.\{-}\]/ contains=asteriskVar,asteriskExp,asteriskFunc,asteriskVarLen
++syn match       asteriskFunc            /\$([[:alnum:]_]*.*)/
+ 
+ " Define the default highlighting.
+ " For version 5.7 and earlier: only when not done already
+@@ -52,14 +55,12 @@
+   endif
+ 
+ 
+-  HiLink	asteriskComment	Comment
+-" not sure what type this should be, using String for testing.
+-  HiLink	asteriskExten	String
+-" same here
++  HiLink	asteriskComment		Comment
++  HiLink	asteriskKeyword		Type
++  HiLink	asteriskOperator	Operator 
+   HiLink	asteriskContext		Identifier 
+-  HiLink        asteriskApplication     Statement
+   HiLink        asteriskInclude		Preproc 
+-  HiLink        asteriskIncludeBad  Error
++  HiLink        asteriskIncludeBad	Error
+   HiLink	asteriskPriority	Preproc	
+   HiLink        asteriskVar             String
+   HiLink        asteriskVarLen          Function