branch: externals/aggressive-indent
commit d5417f449af0dc13c402e6d9949ba002aa8b83af
Author: Artur Malabarba <[email protected]>
Commit: Artur Malabarba <[email protected]>
Don't indent in ediff-merge buffers
---
aggressive-indent.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/aggressive-indent.el b/aggressive-indent.el
index d65f27e..49e9e7c 100644
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -169,6 +169,7 @@ change."
undo-in-progress
(null (buffer-modified-p))
(and (boundp 'smerge-mode) smerge-mode)
+ (equal (buffer-name) "*ediff-merge*")
(let ((line (thing-at-point 'line)))
(and (stringp line)
;; If the user is starting to type a comment.
