diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2016-04-17 07:47:28 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-04-17 07:47:28 -0700 |
commit | fd903e58b01340a78e8b019f8b847b21a2458416 (patch) | |
tree | 26d3cb3b671c81bf18fff7d107341adca9a64870 | |
parent | 18329e98070d2d2879488379edf190f86330dfdf (diff) | |
parent | 97eaa5778ce0cd596a0807ef2e676d2681aabf84 (diff) |
Merge tag '1.6'
-rw-r--r-- | aggressive-indent.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/aggressive-indent.el b/aggressive-indent.el index 9aa8226..685f2af 100644 --- a/aggressive-indent.el +++ b/aggressive-indent.el @@ -4,7 +4,7 @@ ;; Author: Artur Malabarba <emacs@endlessparentheses.com> ;; URL: https://github.com/Malabarba/aggressive-indent-mode -;; Version: 1.5.2 +;; 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,16 +371,12 @@ 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 - (ignore-errors - (save-restriction - (narrow-to-defun) + (save-excursion + (ignore-errors (check-parens) t)))) |