[elpa] master 6e345d2 063/108: Merge pull request #29 from tsdh/master

[Artur Malabarba]

branch: master
commit 6e345d256dc6de556ceb97c6f11cd4de5824f771
Merge: dae81af eefeecc
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge pull request #29 from tsdh/master
    
    Add diff-mode and makefile-mode to excluded-modes.
---
 aggressive-indent.el |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/aggressive-indent.el b/aggressive-indent.el
index 0b9f26e..fc3ad1f 100644
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -134,9 +134,11 @@ Please include this in your report!"
   '(
     bibtex-mode
     coffee-mode
+    diff-mode
     erc-mode
     jabber-chat-mode
     haml-mode
+    makefile-mode
     minibuffer-inactive-mode
     python-mode
     special-mode