[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 9b36af07eec36e6cf5029070dc23676544a7944f

[Micah Anderson]

The following commit has been merged in the master branch:
commit ab70250ea8e4fa1df6a035708b469a6c21684e0c
Author: Russ Allbery <rra at debian.org>
Date:   Sat May 3 19:22:11 2008 -0700

    Further improvements to Emacs mode indentation
    
    [^...] will match a newline unless it's explicitly excluded.  Since
    our indentation rules all assume we're only looking at the current
    line, be sure that's all we look at.

diff --git a/ext/emacs/puppet-mode.el b/ext/emacs/puppet-mode.el
index a6d47ee..f767c6c 100644
--- a/ext/emacs/puppet-mode.el
+++ b/ext/emacs/puppet-mode.el
@@ -200,14 +200,14 @@ of the initial include plus puppet-include-indent."
              ;; Brace or paren not on a line by itself will be indented one
              ;; level too much, but don't catch cases where the block is
              ;; started and closed on the same line.
-             ((looking-at "^[^\({]*[\)}]\\s-*$")
+             ((looking-at "^[^\n\({]*[\)}]\\s-*$")
               (setq cur-indent (- (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 
              ;; Indent by one level more than the start of our block.  We lose
              ;; if there is more than one block opened and closed on the same
              ;; line but it's still unbalanced; hopefully people don't do that.
-             ((looking-at "^.*{[^}]*$")
+             ((looking-at "^.*{[^\n}]*$")
               (setq cur-indent (+ (current-indentation) puppet-indent-level)) 
               (setq not-indented nil))
 
@@ -219,7 +219,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]\\|\"[^\"]*\"\\|'[^']'\\)**;\\s-*$")
+             ((looking-at "^\\([^'\":\n]\\|\"[^\n\"]*\"\\|'[^\n']'\\)**;\\s-*$")
               (setq cur-indent (- (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 

-- 
Puppet packaging for Debian