[elpa] master 74b34f2 3/3: Merge commit '6811a4d2788cf6753a19be728b78e13dd44e4ca8'

[Artur Malabarba]

branch: master
commit 74b34f2bbb929a1caf5cf753e59c54c3ccb74f50
Merge: 8a083d5 6811a4d
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit '6811a4d2788cf6753a19be728b78e13dd44e4ca8'
---
 packages/aggressive-indent/aggressive-indent.el |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/packages/aggressive-indent/aggressive-indent.el 
b/packages/aggressive-indent/aggressive-indent.el
index 7321fd5..5d91396 100644
--- a/packages/aggressive-indent/aggressive-indent.el
+++ b/packages/aggressive-indent/aggressive-indent.el
@@ -4,7 +4,7 @@
 
 ;; Author: Artur Malabarba <address@hidden>
 ;; URL: http://github.com/Malabarba/aggressive-indent-mode
-;; Version: 1.0.1
+;; Version: 1.0.2
 ;; Package-Requires: ((emacs "24.1") (names "20150125.9") (cl-lib "0.5"))
 ;; Keywords: indent lisp maint tools
 ;; Prefix: aggressive-indent
@@ -213,6 +213,10 @@ change."
   '(when (boundp 'ac-completing)
      (add-to-list 'aggressive-indent--internal-dont-indent-if
                   'ac-completing)))
+(eval-after-load 'iedit
+  '(when (boundp 'iedit-mode)
+     (add-to-list 'aggressive-indent--internal-dont-indent-if
+                  'iedit-mode)))
 
 (defcustom dont-indent-if '()
   "List of variables and functions to prevent aggressive indenting.