Additional fix to emacs for ticket #1160

2 files changed, 6 insertions, 6 deletions

diff --git a/bin/puppetrun b/bin/puppetrun
index d0823b9c5..14bc510ed 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -177,7 +177,7 @@ end
 
 def setupldap
     begin
-        @ldap = Puppet::Parser::Interpreter.ldap()
+        @ldap = Puppet::Parser::Interpreter.new
     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 4a91defff..0a7ee1a5f 100644
--- a/ext/emacs/puppet-mode.el
+++ b/ext/emacs/puppet-mode.el
@@ -21,14 +21,13 @@
   :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))
+    map)
+  "Key map used in puppet-mode buffers.")
 
-(defvar puppet-mode-syntax-table nil
-  "Syntax table in use in puppet-mode buffers."
+(defvar puppet-mode-syntax-table
   (let ((table (make-syntax-table)))
     (modify-syntax-entry ?\' "\"" table)
     (modify-syntax-entry ?\" "\"" table)
@@ -46,7 +45,8 @@
     (modify-syntax-entry ?\} "){" table)
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
-    table))
+    table)
+  "Syntax table in use in puppet-mode buffers.")
 
 (defcustom puppet-indent-tabs-mode nil
   "*Indentation can insert tabs in puppet mode if this is non-nil."