[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master b957752 07/13: Don't indent if the user is starting to typ
From: |
Artur Malabarba |
Subject: |
[elpa] master b957752 07/13: Don't indent if the user is starting to type a comment. Fix #51 |
Date: |
Wed, 05 Aug 2015 21:54:10 +0000 |
branch: master
commit b957752b12ac10ef0093756735b24754b131bfd0
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Don't indent if the user is starting to type a comment. Fix #51
---
aggressive-indent.el | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/aggressive-indent.el b/aggressive-indent.el
index b6181fb..dfa431a 100644
--- 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))
- [elpa] master updated (e18833b -> 0bb0ee6), Artur Malabarba, 2015/08/05
- [elpa] master 785d35c 01/13: After expanding, eat up space ahead if convenient, Artur Malabarba, 2015/08/05
- [elpa] master 960ea2f 02/13: Avoid errors on false positives, Artur Malabarba, 2015/08/05
- [elpa] master f7b4937 04/13: Refactor whitespace detection, Artur Malabarba, 2015/08/05
- [elpa] master c1deb05 03/13: Don't use looking-back, Artur Malabarba, 2015/08/05
- [elpa] master 7f38383 05/13: Don't expand in strings or comments, Artur Malabarba, 2015/08/05
- [elpa] master b957752 07/13: Don't indent if the user is starting to type a comment. Fix #51,
Artur Malabarba <=
- [elpa] master 1e6676a 06/13: Version bump, Artur Malabarba, 2015/08/05
- [elpa] master f2c0fe9 08/13: Don't indent if undo-in-progress, Artur Malabarba, 2015/08/05
- [elpa] master 6ccb05d 10/13: More abbrevs, Artur Malabarba, 2015/08/05
- [elpa] master 3557254 09/13: Version bump, Artur Malabarba, 2015/08/05
- [elpa] master 98fe00f 11/13: Version bump, Artur Malabarba, 2015/08/05
- [elpa] master 0bb0ee6 13/13: Merge commit '3557254c6873aeb0b5070248aa0faf2ff0d29d04', Artur Malabarba, 2015/08/05
- [elpa] master 5b702fc 12/13: Merge commit '98fe00fbd6a71ba1e79cf616f22c026c9d84adc7', Artur Malabarba, 2015/08/05