summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2014-11-08 15:56:36 -0400
committerJoey Hess2014-11-08 15:56:36 -0400
commitf38cd7c6a571ed7ee08a379a4aef9827f54d471f (patch)
tree2e3ef71aa606c07fe1d5ec6fa4168fe4f45f57a4 /doc
parent3313e6ab76eab90e44630a354f4b09e0e4aaec82 (diff)
parent9755b761bb46bc40d19a2723165424a1f8a27cbb (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc')
-rw-r--r--doc/coding_style.mdwn22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/coding_style.mdwn b/doc/coding_style.mdwn
index d2dbaf2f..64d1fb69 100644
--- a/doc/coding_style.mdwn
+++ b/doc/coding_style.mdwn
@@ -30,17 +30,6 @@ each indented with a tab.
foo = ...
bar = ...
-Note for emacs users: You can put the following snippet into a file called
-`.dir-locals.el` at root of propellor's source tree to ensure these indentation
-rules are enforced:
-
- ((nil . ((indent-tabs-mode . t)
- (tab-width . 4)
- (fill-column . 80)))
- ;; Warn about spaces used for indentation:
- (haskell-mode . ((eval . (highlight-regexp "^ *")))))
-
-
Where clauses for instance definitions and modules tend to appear at the end
of a line, rather than on a separate line.
@@ -107,3 +96,14 @@ If you feel that this coding style leads to excessive amounts of horizontal
or vertical whitespace around your code, making it hard to fit enough of it
on the screen, consider finding a better abstraction, so the code that
does fit on the screen is easily understandable. ;)
+
+----
+
+Note for emacs users: You can put the following snippet into a file called
+`.dir-locals.el` at root of propellor's source tree to use tabs for indentation:
+
+ ((nil . ((indent-tabs-mode . t)
+ (tab-width . 4)
+ (fill-column . 80)))
+ ;; Warn about spaces used for indentation:
+ (haskell-mode . ((eval . (highlight-regexp "^ *")))))