[commit: ghc] master: rts/includes: Fix up .dir-locals.el (f3b5e16)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f3b5e162232a75f61919f6cb7fc9ddbdeea9bede/ghc

>---------------------------------------------------------------

commit f3b5e162232a75f61919f6cb7fc9ddbdeea9bede
Author: Austin Seipp <austin at well-typed.com>
Date:   Wed Oct 1 16:28:46 2014 -0500

    rts/includes: Fix up .dir-locals.el
    
    After 23bb90460, these were slightly busted for `c-mode`.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

f3b5e162232a75f61919f6cb7fc9ddbdeea9bede
 includes/.dir-locals.el | 19 ++++++++++---------
 rts/.dir-locals.el      | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/includes/.dir-locals.el b/includes/.dir-locals.el
index c97af77..9e13ffa 100644
--- a/includes/.dir-locals.el
+++ b/includes/.dir-locals.el
@@ -1,12 +1,13 @@
 ;;; Directory Local Variables
 ;;; See Info node `(emacs) Directory Variables' for more information.
 
-((c-mode
-  (fill-column . 80))
- (emacs-lisp-mode
-  (buffer-file-coding-system . utf-8-unix)
-  (c-basic-offset . 4)
-  (indent-tabs-mode)))
-
-
-
+;; Default mode settings: no tabs, 80 column, UTF8
+((nil
+  (indent-tabs-mode . nil)
+  (fill-column . 80)
+  (buffer-file-coding-system . utf-8-unix))
+
+ ;; c-mode settings: 'Allman' BSD style, 4 space indents
+ (c-mode
+  (c-file-style . "BSD")
+  (c-basic-offset . 4)))
diff --git a/rts/.dir-locals.el b/rts/.dir-locals.el
index c97af77..9e13ffa 100644
--- a/rts/.dir-locals.el
+++ b/rts/.dir-locals.el
@@ -1,12 +1,13 @@
 ;;; Directory Local Variables
 ;;; See Info node `(emacs) Directory Variables' for more information.
 
-((c-mode
-  (fill-column . 80))
- (emacs-lisp-mode
-  (buffer-file-coding-system . utf-8-unix)
-  (c-basic-offset . 4)
-  (indent-tabs-mode)))
-
-
-
+;; Default mode settings: no tabs, 80 column, UTF8
+((nil
+  (indent-tabs-mode . nil)
+  (fill-column . 80)
+  (buffer-file-coding-system . utf-8-unix))
+
+ ;; c-mode settings: 'Allman' BSD style, 4 space indents
+ (c-mode
+  (c-file-style . "BSD")
+  (c-basic-offset . 4)))