Merge commit '8438ff5e71ca040e7a1e325d608a3f5ea050503f'

diff --combined packages/aggressive-indent/aggressive-indent.el
index 9c1f7d7b253e72d56bcee21b0bc13ecfde478c7c,e6dba725c4cce5bc1a2198930d88be3e8ed9c121..3828bf2a3c19c6ee603095d0238f6c8e9a4f2ab5
--- 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, 2016 Free Software Foundation, Inc
  
  ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
  ;; URL: https://github.com/Malabarba/aggressive-indent-mode
- ;; Version: 1.7
+ ;; Version: 1.8.1
  ;; 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,
@@@ -129,6 -129,7 +129,7 @@@ Please include this in your report!
      haskell-mode
      haskell-interactive-mode
      image-mode
+     inf-ruby-mode
      makefile-mode
      makefile-gmake-mode
      minibuffer-inactive-mode
@@@ -300,7 -301,8 +301,7 @@@ messages.  L and R passed to `aggressiv
  Call `indent-region' between L and R, and then keep indenting
  until nothing more happens."
    (interactive "r")
 -  (let ((p (point-marker))
 -        was-begining-of-line)
 +  (let ((p (point-marker)))
      (set-marker-insertion-type p t)
      (unwind-protect
          (progn
@@@ -406,7 -408,6 +407,6 @@@ or messages.
                  (cl-member-if #'derived-mode-p aggressive-indent-dont-electric-modes))
              (aggressive-indent--local-electric nil)
            (aggressive-indent--local-electric t))
-         (aggressive-indent--check-parens)
          (add-hook 'after-change-functions #'aggressive-indent--keep-track-of-changes nil 'local)
          (add-hook 'before-save-hook #'aggressive-indent--proccess-changed-list-and-indent nil 'local)
          (add-hook 'post-command-hook #'aggressive-indent--indent-if-changed nil 'local))