diff options
| author | Artur Malabarba <artur@biva.com.br> | 2017-03-14 18:28:36 -0300 |
|---|---|---|
| committer | Artur Malabarba <artur@biva.com.br> | 2017-03-14 18:28:36 -0300 |
| commit | d5417f449af0dc13c402e6d9949ba002aa8b83af (patch) | |
| tree | 9dbefa7b56a6852136f64945565ff08f6e6b4554 | |
| parent | 0492172a766971405fb6dea19371a3c97db8dc3c (diff) | |
Don't indent in ediff-merge buffers
| -rw-r--r-- | aggressive-indent.el | 1 |
1 files changed, 1 insertions, 0 deletions
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. |