From bb65226e54d5e476581118e7c2c5e42275a6b290 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Fri, 4 Apr 2008 11:51:23 +1100
Subject: Additional fix to emacs for ticket #1160

---
 bin/puppetrun            |  2 +-
 ext/emacs/puppet-mode.el | 10 +++++-----
 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."
-- 
cgit 


From c13486e3a5a604152faef6f467ab6eb4f6e30acd Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Fri, 4 Apr 2008 11:52:08 +1100
Subject: Revert "Additional fix to emacs for ticket #1160"

This reverts commit bb65226e54d5e476581118e7c2c5e42275a6b290.
---
 bin/puppetrun            |  2 +-
 ext/emacs/puppet-mode.el | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/puppetrun b/bin/puppetrun
index 14bc510ed..d0823b9c5 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 0a7ee1a5f..4a91defff 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."
-- 
cgit 


From 911c7fb4735e99cb5dc33ec7c2cb1deb166478b2 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Fri, 4 Apr 2008 11:53:18 +1100
Subject: Additional fix for emacs syntax for ticket #1160

---
 ext/emacs/puppet-mode.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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."
-- 
cgit