branch: master commit 7114ebabc93dda7773b26e2a5258f3a66aeedd2d Merge: 752310e 0c3d5d9 Author: Artur Malabarba <bruce.connor...@gmail.com> Commit: Artur Malabarba <bruce.connor...@gmail.com>
Merge commit '0c3d5d96b732e31b8556d2f61cf9c7a2556ade26' --- packages/aggressive-indent/aggressive-indent.el | 44 +++++++++++------------ 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/packages/aggressive-indent/aggressive-indent.el b/packages/aggressive-indent/aggressive-indent.el index f9a0df3..54eeacb 100644 --- a/packages/aggressive-indent/aggressive-indent.el +++ b/packages/aggressive-indent/aggressive-indent.el @@ -4,7 +4,7 @@ ;; Author: Artur Malabarba <em...@endlessparentheses.com> ;; URL: http://github.com/Malabarba/aggressive-indent-mode -;; Version: 1.1.3 +;; Version: 1.2 ;; Package-Requires: ((emacs "24.1") (names "20150125.9") (cl-lib "0.5")) ;; Keywords: indent lisp maint tools ;; Prefix: aggressive-indent @@ -222,6 +222,10 @@ change." '(when (boundp 'ac-completing) (add-to-list 'aggressive-indent--internal-dont-indent-if 'ac-completing))) +(eval-after-load 'multiple-cursors-core + '(when (boundp 'multiple-cursors-mode) + (add-to-list 'aggressive-indent--internal-dont-indent-if + 'multiple-cursors-mode))) (eval-after-load 'iedit '(when (boundp 'iedit-mode) (add-to-list 'aggressive-indent--internal-dont-indent-if @@ -285,12 +289,8 @@ If L and R are provided, use them for finding the start and end of defun." "Indent current defun unobstrusively. Like `aggressive-indent-indent-defun', but without errors or messages. L and R passed to `aggressive-indent-indent-defun'." - (unless (or (run-hook-wrapped - 'aggressive-indent--internal-dont-indent-if - #'eval) - (aggressive-indent--run-user-hooks)) - (cl-letf (((symbol-function 'message) #'ignore)) - (ignore-errors (indent-defun l r))))) + (cl-letf (((symbol-function 'message) #'ignore)) + (ignore-errors (indent-defun l r)))) :autoload (defun indent-region-and-on (l r) @@ -342,12 +342,8 @@ until nothing more happens." "Indent region between L and R, and a bit more. Like `aggressive-indent-indent-region-and-on', but without errors or messages." - (unless (or (run-hook-wrapped - 'aggressive-indent--internal-dont-indent-if - #'eval) - (aggressive-indent--run-user-hooks)) - (cl-letf (((symbol-function 'message) #'ignore)) - (ignore-errors (indent-region-and-on l r))))) + (cl-letf (((symbol-function 'message) #'ignore)) + (ignore-errors (indent-region-and-on l r)))) (defvar -changed-list nil "List of (left right) limit of regions changed in the last command loop.") @@ -355,16 +351,18 @@ or messages." (defun -indent-if-changed () "Indent any region that changed in the last command loop." (when -changed-list - (while-no-input - (let ((inhibit-modification-hooks t) - (inhibit-point-motion-hooks t) - (indent-function - (if (cl-member-if #'derived-mode-p modes-to-prefer-defun) - #'-softly-indent-defun - #'-softly-indent-region-and-on))) - (while -changed-list - (apply indent-function (car -changed-list)) - (setq -changed-list (cdr -changed-list))))))) + (unless (or (run-hook-wrapped 'aggressive-indent--internal-dont-indent-if #'eval) + (aggressive-indent--run-user-hooks)) + (while-no-input + (let ((inhibit-modification-hooks t) + (inhibit-point-motion-hooks t) + (indent-function + (if (cl-member-if #'derived-mode-p modes-to-prefer-defun) + #'-softly-indent-defun + #'-softly-indent-region-and-on))) + (while -changed-list + (apply indent-function (car -changed-list)) + (setq -changed-list (cdr -changed-list)))))))) (defun -keep-track-of-changes (l r &rest _) "Store the limits (L and R) of each change in the buffer."