[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 9ed382d397c79995e850a91ac92e22106d670bed
Author: James Turnbull <james at lovedthanlost.net>
Date:   Mon Nov 24 21:31:22 2008 +1100

    Fixed #1767 - Minor fix to emacs mode

diff --git a/CHANGELOG b/CHANGELOG
index 4cf39b4..b3c4e17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixed #1767 - Minor fix to emacs mode
+
     Fixed #1711 - fileserver test fails due to incorrect mocking
 
     Fixed #1751 - Mac OS X DirectoryService nameservice provider support for 
diff --git a/ext/emacs/puppet-mode.el b/ext/emacs/puppet-mode.el
index 11fcfea..0029b9c 100644
--- a/ext/emacs/puppet-mode.el
+++ b/ext/emacs/puppet-mode.el
@@ -226,7 +226,7 @@ of the initial include plus puppet-include-indent."
              ;; Semicolon ends a block for a resource when multiple resources
              ;; are defined in the same block, but try not to get the case of
              ;; a complete resource on a single line wrong.
-             ((looking-at "^\\([^'\":\n]\\|\"[^\n\"]*\"\\|'[^\n']'\\)**;\\s-*$")
+             ((looking-at "^\\([^'\":\n]\\|\"[^\n\"]*\"\\|'[^\n']*'\\)*;\\s-*$")
               (setq cur-indent (- (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 

-- 
Puppet packaging for Debian