Merge commit 'ef509502cdd228c8ce0a562bbf411e5f98beaaf1'

diff --combined packages/aggressive-indent/aggressive-indent.el
index 67c3af8571009ef5c2955222627db959cf6c2306,764a33224c3ba581e389b2228a588c7e4673c7f8..a7443240a623dbe15cc1d531905b0309a4b225b7
--- 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
+ ;; Version: 1.5.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,
@@@ -190,14 -190,13 +190,13 @@@ change.
      (null (buffer-modified-p))
      (and (boundp 'smerge-mode) smerge-mode)
      (let ((line (thing-at-point 'line)))
-       (when (stringp line)
-         (or (string-match "\\`[[:blank:]]*\n?\\'" line)
-             ;; If the user is starting to type a comment.
-             (and (stringp comment-start)
-                  (string-match (concat "\\`[[:blank:]]*"
-                                        (substring comment-start 0 1)
-                                        "[[:blank:]]*$")
-                                line)))))
+       (and (stringp line)
+            ;; If the user is starting to type a comment.
+            (stringp comment-start)
+            (string-match (concat "\\`[[:blank:]]*"
+                                  (substring comment-start 0 1)
+                                  "[[:blank:]]*$")
+                          line)))
      (let ((sp (syntax-ppss)))
        ;; Comments.
        (or (and (not aggressive-indent-comments-too) (elt sp 4))