Merge commit '67fa7e1a60966e49eccf21b02110af12afa995e0'

diff --combined packages/aggressive-indent/aggressive-indent.el
index a0c8c70ebc9f2bfa8d9ebb633b3dbdbfa23da14f,31cee7253e4d622aa76d3aacbd6e7f4eac9515b7..006114b6594e783deeb8dca8a9def28913c82813
--- 1/packages/aggressive-indent/aggressive-indent.el
--- 2/aggressive-indent.el
+++ b/packages/aggressive-indent/aggressive-indent.el
@@@ -1,10 -1,10 +1,10 @@@
 -;;; aggressive-indent.el --- Minor mode to aggressively keep your code always indented
 +;;; aggressive-indent.el --- Minor mode to aggressively keep your code always indented  -*- lexical-binding:t -*-
  
 -;; Copyright (C) 2014 Free Software Foundation, Inc.
 +;; Copyright (C) 2014, 2015 Free Software Foundation, Inc
  
  ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
  ;; URL: https://github.com/Malabarba/aggressive-indent-mode
- ;; Version: 1.5.2
+ ;; Version: 1.5.3
  ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
  ;; Keywords: indent lisp maint tools
  ;; Prefix: aggressive-indent
@@@ -70,7 -70,7 +70,7 @@@
  ;;
  ;; This program is free software; you can redistribute it and/or
  ;; modify it under the terms of the GNU General Public License
 -;; as published by the Free Software Foundation; either version 2
 +;; as published by the Free Software Foundation; either version 3
  ;; of the License, or (at your option) any later version.
  ;;
  ;; This program is distributed in the hope that it will be useful,
@@@ -375,11 -375,12 +375,12 @@@ or messages.
    "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)
-             (check-parens)
-             t))))
+         (save-excursion
+           (ignore-errors
+             (save-restriction
+               (narrow-to-defun)
+               (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."