[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.4-89-gcbbd363

[James Turnbull]

The following commit has been merged in the upstream branch:
commit b7b7a1c3ca9a2208b7d26964e1fa3ceb4e95f693
Author: Todd Zullinger <tmz at pobox.com>
Date:   Fri Jan 8 23:42:26 2010 -0500

    vim: Improve function matching when functions contain ')'
    
    This fixes #3017 (VIM syntax highlight for regsubst fails) by converting
    puppetFunction from a simple keyword to a region.
    
    Signed-off-by: Todd Zullinger <tmz at pobox.com>

diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim
index e86138a..80cd91c 100644
--- a/ext/vim/syntax/puppet.vim
+++ b/ext/vim/syntax/puppet.vim
@@ -51,8 +51,10 @@ syn match   puppetParamDigits   "[0-9]\+"
 
 " match 'template' in 'content => template("...")'
 syn match   puppetParam         "\w\+\s*[=+]>\s*\w\+\s*(" contains=puppetFunction,puppetParamName
-syn keyword puppetFunction      debug info notice warning err alert emerg crit
-syn keyword puppetFunction      sprintf template fail tagged include generate search file tag versioncmp fqdn_rand realize split defined regsubst sha1 inline_template contained
+" statements
+syn region  puppetFunction      start="^\s*\(alert\|crit\|debug\|emerg\|err\|fail\|include\|info\|notice\|realize\|require\|search\|tag\|warning\)\s*(" end=")" contained contains=puppetString
+" 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\+}"

-- 
Puppet packaging for Debian