[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 b3c363c547dd7bf8cb54c103c20f688b9944b7da
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Dec 7 20:47:58 2009 -0500

    vim: puppetDefArguments is contained by puppetDefine
    
    The argument list for a definition must be contained, otherwise it
    matches too much text.  For example:
    
        define test($arg) {
            $foo = regsubst("$name", '(.*)', '\1')
            # The parentheses within the above regsubst are matched as part
            # of puppetDefArguments and the highlighting after is incorrect.
        }
    
    Marking puppetDefArguments as contained by puppetDefine fixes this.
    
    Signed-off-by: Todd Zullinger <tmz at pobox.com>

diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim
index eb62b64..e86138a 100644
--- a/ext/vim/syntax/puppet.vim
+++ b/ext/vim/syntax/puppet.vim
@@ -19,7 +19,7 @@ endif
 " match class/definition/node declarations
 syn region  puppetDefine        start="^\s*\(class\|define\|node\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments,puppetNodeRe
 syn keyword puppetDefType       class define node inherits contained
-syn region  puppetDefArguments  start="(" end=")" contains=puppetArgument
+syn region  puppetDefArguments  start="(" end=")" contained contains=puppetArgument
 syn match   puppetArgument      "\w\+" contained
 syn match   puppetArgument      "\$\w\+" contained
 syn match   puppetArgument      "'[^']+'" contained

-- 
Puppet packaging for Debian