[elpa] master ca2ff2a 6/6: Merge commit '7ae5f6528df5073eb2b42ec45a21af73bc7047c0'

[Artur Malabarba]

branch: master
commit ca2ff2a87ea85590b6e8583ef651293adc1e9b72
Merge: 24be4e5 7ae5f65
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit '7ae5f6528df5073eb2b42ec45a21af73bc7047c0'
---
 packages/aggressive-indent/README.md            |    7 +++++--
 packages/aggressive-indent/aggressive-indent.el |   12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/aggressive-indent/README.md 
b/packages/aggressive-indent/README.md
index 8abb380..b5006f5 100644
--- a/packages/aggressive-indent/README.md
+++ b/packages/aggressive-indent/README.md
@@ -1,6 +1,5 @@
-aggressive-indent-mode
+aggressive-indent-mode 
[![Melpa](http://melpa.org/packages/aggressive-indent-badge.svg)](http://melpa.org/#/aggressive-indent)
 
[![Melpa-Stable](http://stable.melpa.org/packages/aggressive-indent-badge.svg)](http://stable.melpa.org/#/aggressive-indent)
 ======================
-(_[Wanna say thank you?](https://gratipay.com/Malabarba/)_)
 
 `electric-indent-mode` is enough to keep your code nicely aligned when
 all you do is type. However, once you start shifting blocks around,
@@ -62,3 +61,7 @@ following clause:
      '(and (derived-mode-p 'c++-mode)
            (null (string-match "\\([;{}]\\|\\b\\(if\\|for\\|while\\)\\b\\)"
                                (thing-at-point 'line)))))
+
+## Contribute ##
+
+[![Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/Malabarba)
 
diff --git a/packages/aggressive-indent/aggressive-indent.el 
b/packages/aggressive-indent/aggressive-indent.el
index d1f70d4..45f3323 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: http://github.com/Malabarba/aggressive-indent-mode
-;; Version: 1.0
+;; Version: 1.0.1
 ;; Package-Requires: ((emacs "24.1") (names "20150125.9") (cl-lib "0.5"))
 ;; Keywords: indent lisp maint tools
 ;; Prefix: aggressive-indent
@@ -88,22 +88,21 @@
 ;;; Code:
 
 (require 'cl-lib)
+(eval-when-compile (require 'names))
 
 ;;;###autoload
 (define-namespace aggressive-indent-
 :group indent
 
-(defconst version (eval-when-compile
-                    (require 'lisp-mnt)
-                    (lm-version))
-  "Version of the aggressive-indent.el package.")
 (defun bug-report ()
   "Opens github issues page in a web browser.  Please send any bugs you find.
 Please include your Emacs and `aggressive-indent' versions."
   (interactive)
+  (require 'lisp-mnt)
   (message "Your `aggressive-indent-version' is: %s, and your emacs version 
is: %s.
 Please include this in your report!"
-    version emacs-version)
+    (lm-version (find-library-name "aggressive-indent"))
+    emacs-version)
   (browse-url 
"https://github.com/Bruce-Connor/aggressive-indent-mode/issues/new";))
 
 
@@ -120,6 +119,7 @@ Please include this in your report!"
     bibtex-mode
     cider-repl-mode
     coffee-mode
+    comint-mode
     conf-mode
     Custom-mode
     diff-mode