[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc3-129-g74f8285

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 690465ef34344acda39469f71f6fb4a9e022ff7b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Aug 25 22:11:16 2010 +0200

    Fix #4615 - vim highlighting fails on slashes and colons.
    
    When a regexp is used in a selector, vim shouldn't choke if more than one slash
    is found on the same line.
    
    This patch also adds support for colons in attribute names.

diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim
index 0025e2d..9605210 100644
--- a/ext/vim/syntax/puppet.vim
+++ b/ext/vim/syntax/puppet.vim
@@ -57,14 +57,14 @@ syn region  puppetFunction      start="^\s*\(alert\|crit\|debug\|emerg\|err\|fai
 " rvalues
 syn region  puppetFunction      start="^\s*\(defined\|file\|fqdn_rand\|generate\|inline_template\|regsubst\|sha1\|shellquote\|split\|sprintf\|tagged\|template\|versioncmp\)\s*(" end=")" contained contains=puppetString
 
-syn match   puppetVariable      "$\w\+"
-syn match   puppetVariable      "${\w\+}"
+syn match   puppetVariable      "$[a-zA-Z0-9_:]\+"
+syn match   puppetVariable      "${[a-zA-Z0-9_:]\+}"
 
 " match anything between simple/double quotes.
 " don't match variables if preceded by a backslash.
 syn region  puppetString        start=+'+ skip=+\\\\\|\\'+ end=+'+
 syn region  puppetString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable,puppetNotVariable
-syn match   puppetString        "/.*/"
+syn match   puppetString        "/[^/]*/"
 syn match   puppetNotVariable   "\\$\w\+" contained
 syn match   puppetNotVariable   "\\${\w\+}" contained
 

-- 
Puppet packaging for Debian