diff options
| author |  Nathan Collins <nathan.collins@gmail.com> | 2012-06-12 00:39:21 -0700 |
|---|---|---|
| committer | Nathan Collins <nathan.collins@gmail.com> | 2012-06-12 00:43:42 -0700 |
| commit | 9fe433390d3860bdb740c54b015889805578c992 (patch) | |
| tree | c0ae109edded83b0c3f425033032b20c65330593 | |
| parent | 236ae1fbc4fa114cfcef5a7d71c40cb1c2ef9d8f (diff) | |
Remove .dir-locals.el and add doc/contributing.mdwn.
Add link CONTRIBUTING -> doc/contributing.mdwn, so that it's easy to
find (many files in doc/).
Add .dir-locals.el to .gitignore, now that it's no longer versioned.
The CONTRIBUTING file gives a reference to a page on the Emacs wiki
that shows how to set up a .dir-locals.el that sets up tabs for
indentation. I updated the wiki page to include the
`(highlight-regexp "^ *")` part, which had been the hardest to
discover.
| -rw-r--r-- | .dir-locals.el | 22 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| l--------- | CONTRIBUTING | 1 | ||||
| -rw-r--r-- | doc/contributing.mdwn | 7 |
4 files changed, 11 insertions, 22 deletions
diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index e523528e2..000000000 --- a/.dir-locals.el +++ /dev/null @@ -1,22 +0,0 @@ -;; Configure emacs' treatment of tabs. -;; -;; See -;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Directory-Variables.html -;; for a description of this file. -;; -;; The 'nil' below applies to all modes. -((nil . ((indent-tabs-mode . t) - (tab-width . 2))) - (haskell-mode . ( - ;; Highlight leading space characters, to avoid indenting with - ;; spaces. - ;; - ;; Emacs will prompt you about this, saying it's unsafe, but - ;; you can permanently store an exception by pressing "!", - ;; which inserts - ;; - ;; (safe-local-variable-values . (quote ((eval highlight-regexp "^ *")))) - ;; - ;; in your ~/.emacs ... except the exception doesn't work, and - ;; emacs still asks you on each file you open :P - (eval . (highlight-regexp "^ *"))))) diff --git a/.gitignore b/.gitignore index 74c0e672a..e176e59c2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,7 @@ html Utility/Touch.hs Utility/libdiskfree.o dist +# Sandboxed builds cabal-dev +# Project-local emacs configuration +.dir-locals.el diff --git a/CONTRIBUTING b/CONTRIBUTING new file mode 120000 index 000000000..8ad193e22 --- /dev/null +++ b/CONTRIBUTING @@ -0,0 +1 @@ +doc/contributing.mdwn
\ No newline at end of file diff --git a/doc/contributing.mdwn b/doc/contributing.mdwn new file mode 100644 index 000000000..11c6c1987 --- /dev/null +++ b/doc/contributing.mdwn @@ -0,0 +1,7 @@ +## Style + +This project uses tabs for indentation and the code looks fine with +any tab width. If you are using Emacs, and have it configured to use +spaces for indentation, then you can add a ./.dir-locals.el to use +tabs for files in this project. See +http://www.emacswiki.org/emacs/DirectoryVariables. |