Don't indent if the user is starting to type a comment. Fix #51

[gnu-emacs-elpa] / aggressive-indent.el

diff --git a/aggressive-indent.el b/aggressive-indent.el
index b6181fb04ad4646496564282efd3c41696dfbfee..dfa431a93bbcc1e4188a8eebe4ee530a46de16b4 100644 (file)
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -173,7 +173,15 @@ commands will NOT be followed by a re-indent."
     buffer-read-only
     (null (buffer-modified-p))
     (and (boundp 'smerge-mode) smerge-mode)
-    (string-match "\\`[[:blank:]]*\n?\\'" (or (thing-at-point 'line) ""))
+    (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)))))
     (let ((sp (syntax-ppss)))
       ;; Comments.
       (or (and (not aggressive-indent-comments-too) (elt sp 4))