aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/cfengine.el
diff options
context:
space:
mode:
authorPaul Eggert2011-06-15 11:07:38 -0700
committerPaul Eggert2011-06-15 11:07:38 -0700
commitff672d2c8785de6faba84a400fb8153e9fa07cd2 (patch)
tree4c5dc68b7a92e54c86e47f3bd9a804c14be57091 /lisp/progmodes/cfengine.el
parente69dafade3ccd5c2997a3f6fd6c7bea29e75ad8e (diff)
parentb96e6cde3e311cd79f8ad134291d41c8c64cc6ad (diff)
downloademacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.tar.gz
emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.zip
Merge from trunk.
Diffstat (limited to 'lisp/progmodes/cfengine.el')
-rw-r--r--lisp/progmodes/cfengine.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index a475bbd5932..22ece17cb28 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -198,7 +198,7 @@ Intended as the value of `indent-line-function'."
198 t)) 198 t))
199 199
200;;;###autoload 200;;;###autoload
201(define-derived-mode cfengine-mode fundamental-mode "Cfengine" 201(define-derived-mode cfengine-mode prog-mode "Cfengine"
202 "Major mode for editing cfengine input. 202 "Major mode for editing cfengine input.
203There are no special keybindings by default. 203There are no special keybindings by default.
204 204