Add more excluded modes

[gnu-emacs-elpa] / aggressive-indent.el

diff --git a/aggressive-indent.el b/aggressive-indent.el
index 0d1297c67592ba92e76023ec3957dc95505a85d1..5469724c3644c7daeae92e33c443fc2bba6ff33e 100644 (file)
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -4,7 +4,7 @@
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 ;; URL: http://github.com/Bruce-Connor/aggressive-indent-mode
-;; Version: 0.3.2
+;; Version: 0.3.3
 ;; Package-Requires: ((emacs "24.1") (names "0.5") (cl-lib "0.5"))
 ;; Keywords: indent lisp maint tools
 ;; Prefix: aggressive-indent
@@ -138,11 +138,13 @@ Please include this in your report!"
     erc-mode
     jabber-chat-mode
     haml-mode
+    haskell-mode
     makefile-mode
     minibuffer-inactive-mode
     python-mode
     special-mode
     shell-mode
+    snippet-mode
     eshell-mode
     tabulated-list-mode
     term-mode
@@ -174,6 +176,7 @@ commands will NOT be followed by a re-indent."
     (region-active-p)
     buffer-read-only
     (null (buffer-modified-p))
+    (and (boundp 'smerge-mode) smerge-mode)
     (string-match "\\`[[:blank:]]*\n?\\'" (or (thing-at-point 'line) ""))
     (and (not aggressive-indent-comments-too)
          (aggressive-indent--in-comment-p))