diff options
| -rwxr-xr-x | bin/puppetrun | 2 | ||||
| -rw-r--r-- | 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." |