]> code.delx.au - gnu-emacs-elpa/commitdiff
Don't use do-softly for now.
authorArtur Malabarba <bruce.connor.am@gmail.com>
Sat, 25 Oct 2014 23:16:43 +0000 (00:16 +0100)
committerArtur Malabarba <bruce.connor.am@gmail.com>
Sat, 25 Oct 2014 23:16:43 +0000 (00:16 +0100)
aggressive-indent.el

index b1924864e09ae05928421540806e3717660ea474..32dfa8e1657856dcc75f7a9181f32ad3fff0c95f 100644 (file)
@@ -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.")