summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2014-10-01 16:28:46 -0500
committerAustin Seipp <austin@well-typed.com>2014-10-01 16:29:34 -0500
commitf3b5e162232a75f61919f6cb7fc9ddbdeea9bede (patch)
tree70649040178046aeecbee68a6c3395f8a8bb808c
parent15f661cc7b40f1e956ba31b844b6713b31e5e9e8 (diff)
downloadhaskell-f3b5e162232a75f61919f6cb7fc9ddbdeea9bede.tar.gz
rts/includes: Fix up .dir-locals.el
After 23bb90460, these were slightly busted for `c-mode`. Signed-off-by: Austin Seipp <austin@well-typed.com>
-rw-r--r--includes/.dir-locals.el19
-rw-r--r--rts/.dir-locals.el19
2 files changed, 20 insertions, 18 deletions
diff --git a/includes/.dir-locals.el b/includes/.dir-locals.el
index c97af77a80..9e13ffa6ba 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 c97af77a80..9e13ffa6ba 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)))