[elpa] master e774765 031/108: Merge branch 'region-indent'

[Artur Malabarba]

branch: master
commit e774765d7cade18eb91453d31c2292e7223488f0
Merge: 6e1d5a1 215ddf7
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge branch 'region-indent'
---
 aggressive-indent.el |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/aggressive-indent.el b/aggressive-indent.el
index 4f56c1a..32dfa8e 100644
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -132,7 +132,7 @@ commands will NOT be followed by a re-indent."
 This is for internal use only. For user customization, use
 `aggressive-indent-dont-indent-if' instead.")
 
-(defcustom modes-to-prefer-defun '(emacs-lisp-mode)
+(defcustom modes-to-prefer-defun '(emacs-lisp-mode lisp-mode scheme-mode)
   "List of major-modes in which indenting defun is preferred.
 Add here any major modes with very good definitions of
 `end-of-defun' and `beginning-of-defun', or modes which bug out
@@ -235,7 +235,13 @@ Throw an error if parentheses are unbalanced."
   "Indent current defun unobstrusively.
 Like `aggressive-indent-indent-defun', but wrapped in a
 `aggressive-indent--do-softly'."
-  (-do-softly (indent-defun)))
+  (unless (or (run-hook-wrapped
+               'aggressive-indent--internal-dont-indent-if
+               #'eval)
+              (aggressive-indent--run-user-hooks))
+    (ignore-errors
+      (cl-letf (((symbol-function 'message) #'ignore))
+        (indent-defun)))))
 
 :autoload
 (defun indent-region-and-on (l r)
@@ -267,7 +273,13 @@ until nothing more happens."
   "Indent current defun unobstrusively.
 Like `aggressive-indent-indent-region-and-on', but wrapped in a
 `aggressive-indent--do-softly'."
-  (-do-softly (indent-region-and-on l r)))
+  (unless (or (run-hook-wrapped
+               'aggressive-indent--internal-dont-indent-if
+               #'eval)
+              (aggressive-indent--run-user-hooks))
+    (ignore-errors
+      (cl-letf (((symbol-function 'message) #'ignore))
+        (indent-region-and-on l r)))))
 
 (defvar changed-list-right nil
   "List of right limit of regions changed in the last command loop.")