[elpa] master a7801e1 4/4: Merge commit '97eaa5778ce0cd596a0807ef2e676d2681aabf84'
branch: master commit a7801e14187f4116ce3cd0c78247cd30270a32bf Merge: 3e02274 97eaa57 Author: Artur Malabarba Commit: Artur Malabarba 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 ;; 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."
[elpa] master 46d9ede 2/4: Don't narrow-to-defun when checking parens
branch: master commit 46d9edef157a6df7f26aa692b2ab9f7bf82317ec Author: Artur Malabarba Commit: Artur Malabarba Don't narrow-to-defun when checking parens --- aggressive-indent.el |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/aggressive-indent.el b/aggressive-indent.el index 36a7f42..7055f9c 100644 --- a/aggressive-indent.el +++ b/aggressive-indent.el @@ -378,7 +378,6 @@ Store result in `aggressive-indent--balanced-parens'." (save-excursion (ignore-errors (save-restriction - (narrow-to-defun) (check-parens) t)
[elpa] master updated (3e02274 -> a7801e1)
malabarba pushed a change to branch master. from 3e02274 packages/javaimp: cosmetic fixes new 3e96124 [#77] Actually use aggressive-indent--balanced-parens new 46d9ede Don't narrow-to-defun when checking parens new 97eaa57 Version 1.6 new a7801e1 Merge commit '97eaa5778ce0cd596a0807ef2e676d2681aabf84' Summary of changes: packages/aggressive-indent/aggressive-indent.el | 16 +++- 1 files changed, 7 insertions(+), 9 deletions(-)
[elpa] master 3e96124 1/4: [#77] Actually use aggressive-indent--balanced-parens
branch: master commit 3e9612418f87236fb5a1aec0525610ea88508bc6 Author: Artur Malabarba Commit: Artur Malabarba [#77] Actually use aggressive-indent--balanced-parens --- aggressive-indent.el |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aggressive-indent.el b/aggressive-indent.el index 31cee72..36a7f42 100644 --- a/aggressive-indent.el +++ b/aggressive-indent.el @@ -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,9 +371,6 @@ 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'."
[elpa] master 97eaa57 3/4: Version 1.6
branch: master commit 97eaa5778ce0cd596a0807ef2e676d2681aabf84 Author: Artur Malabarba Commit: Artur Malabarba Version 1.6 --- aggressive-indent.el |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aggressive-indent.el b/aggressive-indent.el index 7055f9c..685f2af 100644 --- a/aggressive-indent.el +++ b/aggressive-indent.el @@ -4,7 +4,7 @@ ;; Author: Artur Malabarba ;; 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 @@ -377,9 +377,8 @@ Store result in `aggressive-indent--balanced-parens'." (setq aggressive-indent--balanced-parens (save-excursion (ignore-errors -(save-restriction - (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."
