branch: master
commit b0039dd1f382edcd722f6c1c7194867538831d32
Merge: 9a371f4 6238e74
Author: Artur Malabarba <bruce.connor...@gmail.com>
Commit: Artur Malabarba <bruce.connor...@gmail.com>
Merge commit '6238e7402adabd0003f6ffcf5c57d9f18f1e7684'
---
packages/aggressive-indent/aggressive-indent.el | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/packages/aggressive-indent/aggressive-indent.el
b/packages/aggressive-indent/aggressive-indent.el
index d6d201d..f9a0df3 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.2
+;; Version: 1.1.3
;; Package-Requires: ((emacs "24.1") (names "20150125.9") (cl-lib "0.5"))
;; Keywords: indent lisp maint tools
;; Prefix: aggressive-indent
@@ -325,10 +325,15 @@ until nothing more happens."
(point-limit (if (and eod (< (point) eod))
eod (point-max-marker))))
(while (and (null (eobp))
- (< (point) point-limit)
- (/= (point)
- (progn (indent-according-to-mode)
- (point))))
+ (let ((op (point))
+ (np (progn (indent-according-to-mode)
+ (point))))
+ ;; As long as we're indenting things to the
+ ;; left, keep indenting.
+ (or (< np op)
+ ;; If we're indenting to the right, or
+ ;; not at all, stop at the limit.
+ (< (point) point-limit))))
(forward-line 1)
(skip-chars-forward "[:blank:]\n"))))
(goto-char p))))
