branch: master commit 215ddf7a862a6fe072bd76532be6a02265b2561e Author: Artur Malabarba <bruce.connor...@gmail.com> Commit: Artur Malabarba <bruce.connor...@gmail.com>
Don't use do-softly for now. --- aggressive-indent.el | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/aggressive-indent.el b/aggressive-indent.el index b192486..32dfa8e 100644 --- a/aggressive-indent.el +++ b/aggressive-indent.el @@ -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.")