summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-08 10:29:54 -0500
committerLuke Kanies <luke@madstop.com>2008-04-08 10:29:54 -0500
commit87f801bc17af22659b37fece2a0c4efdcdcc1e57 (patch)
tree6975ae37a4ad4526c6068351349aa701c6e23f9d
parent92765ea4970172c7b96a2911f2ef435e4fbdc459 (diff)
parent911c7fb4735e99cb5dc33ec7c2cb1deb166478b2 (diff)
downloadpuppet-87f801bc17af22659b37fece2a0c4efdcdcc1e57.tar.gz
puppet-87f801bc17af22659b37fece2a0c4efdcdcc1e57.tar.xz
puppet-87f801bc17af22659b37fece2a0c4efdcdcc1e57.zip
Merge commit 'turnbull/0.24.x' into 0.24.x
-rw-r--r--ext/emacs/puppet-mode.el10
1 files 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."