[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a7801e1 4/4: Merge commit '97eaa5778ce0cd596a0807ef2e676d2
From: |
Artur Malabarba |
Subject: |
[elpa] master a7801e1 4/4: Merge commit '97eaa5778ce0cd596a0807ef2e676d2681aabf84' |
Date: |
Sat, 16 Apr 2016 16:33:00 +0000 |
branch: master
commit a7801e14187f4116ce3cd0c78247cd30270a32bf
Merge: 3e02274 97eaa57
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Merge commit '97eaa5778ce0cd596a0807ef2e676d2681aabf84'
---
packages/aggressive-indent/aggressive-indent.el | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/packages/aggressive-indent/aggressive-indent.el
b/packages/aggressive-indent/aggressive-indent.el
index 006114b..22647d1 100644
--- a/packages/aggressive-indent/aggressive-indent.el
+++ b/packages/aggressive-indent/aggressive-indent.el
@@ -4,7 +4,7 @@
;; Author: Artur Malabarba <address@hidden>
;; URL: https://github.com/Malabarba/aggressive-indent-mode
-;; Version: 1.5.3
+;; Version: 1.6
;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
;; Keywords: indent lisp maint tools
;; Prefix: aggressive-indent
@@ -349,9 +349,12 @@ or messages."
"List of (left right) limit of regions changed in the last command loop.")
(make-variable-buffer-local 'aggressive-indent--changed-list)
+(defvar-local aggressive-indent--balanced-parens t
+ "Non-nil if the current-buffer has balanced parens.")
+
(defun aggressive-indent--indent-if-changed ()
"Indent any region that changed in the last command loop."
- (when aggressive-indent--changed-list
+ (when (and aggressive-indent--changed-list
aggressive-indent--balanced-parens)
(save-excursion
(save-selected-window
(unless (or (run-hook-wrapped
'aggressive-indent--internal-dont-indent-if #'eval)
@@ -368,19 +371,14 @@ or messages."
(setq aggressive-indent--changed-list
(cdr aggressive-indent--changed-list))))))))))
-(defvar-local aggressive-indent--balanced-parens t
- "Non-nil if the current-buffer has balanced parens.")
-
(defun aggressive-indent--check-parens ()
"Check if parens are balanced in the current buffer.
Store result in `aggressive-indent--balanced-parens'."
(setq aggressive-indent--balanced-parens
(save-excursion
(ignore-errors
- (save-restriction
- (narrow-to-defun)
- (check-parens)
- t)))))
+ (check-parens)
+ t))))
(defun aggressive-indent--keep-track-of-changes (l r &rest _)
"Store the limits (L and R) of each change in the buffer."