[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 46f2010 071/108: Don't indent smerge-mode
From: |
Artur Malabarba |
Subject: |
[elpa] master 46f2010 071/108: Don't indent smerge-mode |
Date: |
Wed, 25 Mar 2015 18:39:12 +0000 |
branch: master
commit 46f20106c71029491a4f4a449e8e92b710274b20
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Don't indent smerge-mode
Fixes #33
---
aggressive-indent.el | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/aggressive-indent.el b/aggressive-indent.el
index 0d1297c..b8142e5 100644
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -174,6 +174,7 @@ commands will NOT be followed by a re-indent."
(region-active-p)
buffer-read-only
(null (buffer-modified-p))
+ (and (boundp 'smerge-mode) smerge-mode)
(string-match "\\`[[:blank:]]*\n?\\'" (or (thing-at-point 'line) ""))
(and (not aggressive-indent-comments-too)
(aggressive-indent--in-comment-p))
- [elpa] master f70f0ff 059/108: Don't indent in strings (fixes #27), (continued)
- [elpa] master f70f0ff 059/108: Don't indent in strings (fixes #27), Artur Malabarba, 2015/03/25
- [elpa] master eefeecc 062/108: Add diff-mode and makefile-mode to excluded-modes., Artur Malabarba, 2015/03/25
- [elpa] master e4a4026 061/108: Prevent that to replace the 'message' func to 'ignore' func., Artur Malabarba, 2015/03/25
- [elpa] master 105e746 057/108: Another quickfix, Artur Malabarba, 2015/03/25
- [elpa] master e9fea53 066/108: Fix corner-case with thing-at-point, Artur Malabarba, 2015/03/25
- [elpa] master ae996bb 064/108: Merge pull request #30 from vmfhrmfoaj/master, Artur Malabarba, 2015/03/25
- [elpa] master 6e345d2 063/108: Merge pull request #29 from tsdh/master, Artur Malabarba, 2015/03/25
- [elpa] master 095f778 069/108: Add Custom-mode to excluded modes, Artur Malabarba, 2015/03/25
- [elpa] master b3881a6 065/108: Readme, Artur Malabarba, 2015/03/25
- [elpa] master 9e81033 067/108: Indentation, Artur Malabarba, 2015/03/25
- [elpa] master 46f2010 071/108: Don't indent smerge-mode,
Artur Malabarba <=
- [elpa] master 2e39474 070/108: Add shells to excluded modes, Artur Malabarba, 2015/03/25
- [elpa] master b4c2aec 073/108: Add more excluded modes, Artur Malabarba, 2015/03/25
- [elpa] master cd2b454 075/108: Exclude sass-mode and slim-mode, Artur Malabarba, 2015/03/25
- [elpa] master 35977d8 072/108: Version bump, Artur Malabarba, 2015/03/25
- [elpa] master 57b0cf7 074/108: Merge pull request #34 from davidshepherd7/patch-1, Artur Malabarba, 2015/03/25
- [elpa] master f78f191 068/108: Version Bump, Artur Malabarba, 2015/03/25
- [elpa] master 1aa6d72 079/108: Button on readme, Artur Malabarba, 2015/03/25
- [elpa] master 76c10da 078/108: Don't turn on if electric-indent-inhibit is set, Artur Malabarba, 2015/03/25
- [elpa] master 3761b64 077/108: Add conf-mode to excluded modes., Artur Malabarba, 2015/03/25
- [elpa] master fadd08f 080/108: Readme, Artur Malabarba, 2015/03/25