[elpa] master 46f2010 071/108: Don't indent smerge-mode

[Artur Malabarba]

branch: master
commit 46f20106c71029491a4f4a449e8e92b710274b20
Author: Artur Malabarba <bruce.connor...@gmail.com>
Commit: Artur Malabarba <bruce.connor...@gmail.com>

    Don't indent smerge-mode
    
    Fixes #33
---
 aggressive-indent.el |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/aggressive-indent.el b/aggressive-indent.el
index 0d1297c..b8142e5 100644
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -174,6 +174,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))