r548 - in trunk: vim/debian vim/debian/updates vim7/debian vim7/debian/updates

Matthijs Mohlmann active2-guest at costa.debian.org
Tue Mar 28 17:10:45 UTC 2006


Author: active2-guest
Date: 2006-03-28 17:10:43 +0000 (Tue, 28 Mar 2006)
New Revision: 548

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/updates/debsources.vim
   trunk/vim7/debian/changelog
   trunk/vim7/debian/updates/debsources.vim
Log:
 * Updated debsources.vim
   - Use debsources instead of sources.
   - Make a regexpression of deb, deb-src, main, contrib and non-free.
   - Remove setlocal iskeyword.
   - Remove compatibility with vim 5.x.


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-03-28 15:50:00 UTC (rev 547)
+++ trunk/vim/debian/changelog	2006-03-28 17:10:43 UTC (rev 548)
@@ -23,8 +23,15 @@
   [ Pierre Habouzit ]
   * debcontrol.vim: add kfreebsd-amd64 to the ports list.
 
- -- Pierre Habouzit <madcoder at debian.org>  Sun, 26 Mar 2006 01:11:08 +0100
+  [ Matthijs Mohlmann ]
+  * Updated debsources.vim
+    + Use debsources instead of sources.
+    + Make a regexpression of deb, deb-src, main, contrib and non-free.
+    + Remove setlocal iskeyword.
+    + Remove compatibility with vim 5.x.
 
+ -- Pierre Habouzit <madcoder at debian.org>  Tue, 28 Mar 2006 19:08:53 +0200
+
 vim (1:6.4-007+1) unstable; urgency=low
 
   [ Debian VIM Maintainers ]

Modified: trunk/vim/debian/updates/debsources.vim
===================================================================
--- trunk/vim/debian/updates/debsources.vim	2006-03-28 15:50:00 UTC (rev 547)
+++ trunk/vim/debian/updates/debsources.vim	2006-03-28 17:10:43 UTC (rev 548)
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Debian sources.list
 " Maintainer:	Matthijs Mohlmann <matthijs at cacholong.nl>
-" Last Change:	$Date: 2005/08/13 11:51:26 $
+" Last Change:	$Date: 2006/03/28 18:58:26 $
 " URL: http://www.cacholong.nl/~matthijs/vim/syntax/debsources.vim
 " $Revision: 1.4 $
 
@@ -18,38 +18,23 @@
 " case sensitive
 syn case match
 
-" deb-src is a keyword
-setlocal iskeyword+=-
-
 " A bunch of useful keywords
-syn keyword sourcesKeyword      deb deb-src
-syn keyword sourcesKeyword      main contrib non-free
+syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\)/
 
 " Match comments
-syn match sourcesComment        /#.*/
+syn match debsourcesComment        /#.*/
 
 " Match uri's
-syn match sourcesUri            +\(http://\|ftp://\|file:///\)[^' 	<>"]\++
-syn match sourcesDistrKeyword   +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
+syn match debsourcesUri            +\(http://\|ftp://\|file:///\)[^' 	<>"]\++
+syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
 
 " Associate our matches and regions with pretty colours
-if version >= 508 || !exists("did_debsources_syn_inits")
-  if version < 508
-    let did_debchangelog_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+hi def link debsourcesLine            Error
+hi def link debsourcesKeyword         Statement
+hi def link debsourcesDistrKeyword    Type
+hi def link debsourcesComment         Comment
+hi def link debsourcesUri             Constant
 
-  HiLink sourcesLine            Error
-  HiLink sourcesKeyword         Statement
-  HiLink sourcesDistrKeyword    Type
-  HiLink sourcesComment         Comment
-  HiLink sourcesUri             Constant
-
-  delcommand HiLink
-endif
-
 let b:current_syntax = "debsources"
 
 " vim: ts=8

Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-03-28 15:50:00 UTC (rev 547)
+++ trunk/vim7/debian/changelog	2006-03-28 17:10:43 UTC (rev 548)
@@ -25,8 +25,15 @@
       142_filetype.vim.diff, 153_filetype.vim.diff, 154_svn.vim.diff,
       156_scripts.vim.diff, 301_xxd.c.diff, 303_option.c.diff, 305_term.c.diff
 
- -- James Vega <jamessan at debian.org>  Mon, 27 Mar 2006 16:14:40 -0500
+  [ Matthijs Mohlmann ]
+  * Updated debsources syntax file.
+    + Use debsources instead of sources.
+    + Make a regexpression of deb, deb-src, main, contrib and non-free.
+    + Remove setlocal iskeyword.
+    + Remove compatibility with vim 5.x.
 
+ -- James Vega <jamessan at debian.org>  Tue, 28 Mar 2006 19:07:19 +0200
+
 vim (1:6.4-007+1) unstable; urgency=low
 
   [ Debian VIM Maintainers ]

Modified: trunk/vim7/debian/updates/debsources.vim
===================================================================
--- trunk/vim7/debian/updates/debsources.vim	2006-03-28 15:50:00 UTC (rev 547)
+++ trunk/vim7/debian/updates/debsources.vim	2006-03-28 17:10:43 UTC (rev 548)
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Debian sources.list
 " Maintainer:	Matthijs Mohlmann <matthijs at cacholong.nl>
-" Last Change:	$Date: 2005/08/13 11:51:26 $
+" Last Change:	$Date: 2006/03/28 18:58:26 $
 " URL: http://www.cacholong.nl/~matthijs/vim/syntax/debsources.vim
 " $Revision: 1.4 $
 
@@ -18,38 +18,23 @@
 " case sensitive
 syn case match
 
-" deb-src is a keyword
-setlocal iskeyword+=-
-
 " A bunch of useful keywords
-syn keyword sourcesKeyword      deb deb-src
-syn keyword sourcesKeyword      main contrib non-free
+syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\)/
 
 " Match comments
-syn match sourcesComment        /#.*/
+syn match debsourcesComment        /#.*/
 
 " Match uri's
-syn match sourcesUri            +\(http://\|ftp://\|file:///\)[^' 	<>"]\++
-syn match sourcesDistrKeyword   +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
+syn match debsourcesUri            +\(http://\|ftp://\|file:///\)[^' 	<>"]\++
+syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
 
 " Associate our matches and regions with pretty colours
-if version >= 508 || !exists("did_debsources_syn_inits")
-  if version < 508
-    let did_debchangelog_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+hi def link debsourcesLine            Error
+hi def link debsourcesKeyword         Statement
+hi def link debsourcesDistrKeyword    Type
+hi def link debsourcesComment         Comment
+hi def link debsourcesUri             Constant
 
-  HiLink sourcesLine            Error
-  HiLink sourcesKeyword         Statement
-  HiLink sourcesDistrKeyword    Type
-  HiLink sourcesComment         Comment
-  HiLink sourcesUri             Constant
-
-  delcommand HiLink
-endif
-
 let b:current_syntax = "debsources"
 
 " vim: ts=8




More information about the pkg-vim-maintainers mailing list