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

[Micah Anderson]

The following commit has been merged in the master branch:
commit 55108fe2f1b5808c21013d4d330eb0f8ce1c0dd3
Author: James Turnbull <james at lovedthanlost.net>
Date:   Fri Apr 4 11:52:08 2008 +1100

    Revert "Additional fix to emacs for ticket #1160"
    
    This reverts commit bb65226e54d5e476581118e7c2c5e42275a6b290.

diff --git a/bin/puppetrun b/bin/puppetrun
index 14bc510..d0823b9 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -177,7 +177,7 @@ end
 
 def setupldap
     begin
-        @ldap = Puppet::Parser::Interpreter.new
+        @ldap = Puppet::Parser::Interpreter.ldap()
     rescue => detail
         $stderr.puts "Could not connect to LDAP: %s" % detail
         exit(34)
diff --git a/ext/emacs/puppet-mode.el b/ext/emacs/puppet-mode.el
index 0a7ee1a..4a91def 100644
--- a/ext/emacs/puppet-mode.el
+++ b/ext/emacs/puppet-mode.el
@@ -21,13 +21,14 @@
   :type 'integer :group 'puppet)
 
 (defvar puppet-mode-map
+  "Key map used in puppet-mode buffers."
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-j" 'newline-and-indent)
     (define-key map "\C-m" 'newline-and-indent)
-    map)
-  "Key map used in puppet-mode buffers.")
+    map))
 
-(defvar puppet-mode-syntax-table
+(defvar puppet-mode-syntax-table nil
+  "Syntax table in use in puppet-mode buffers."
   (let ((table (make-syntax-table)))
     (modify-syntax-entry ?\' "\"" table)
     (modify-syntax-entry ?\" "\"" table)
@@ -45,8 +46,7 @@
     (modify-syntax-entry ?\} "){" table)
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
-    table)
-  "Syntax table in use in puppet-mode buffers.")
+    table))
 
 (defcustom puppet-indent-tabs-mode nil
   "*Indentation can insert tabs in puppet mode if this is non-nil."

-- 
Puppet packaging for Debian