diff options
| author | Dan Gudmundsson <[email protected]> | 2017-01-11 12:19:55 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-01-11 12:19:55 +0100 |
| commit | a20bf8fbeb58a20bc7482bb05276eed4604afe3e (patch) | |
| tree | 009696eaf406d6767c4e79134e5f8d153d865d9a | |
| parent | b2b0fbdf447e04f794d4682baac96a4143a005da (diff) | |
| parent | 4478d8afe8c728f44b47d3582a270423cd7fc07d (diff) | |
| download | otp-a20bf8fbeb58a20bc7482bb05276eed4604afe3e.tar.gz otp-a20bf8fbeb58a20bc7482bb05276eed4604afe3e.tar.bz2 otp-a20bf8fbeb58a20bc7482bb05276eed4604afe3e.zip | |
Merge branch 'dgud/emacs-config'
* dgud/emacs-config:
Do not force space/tab indent-tabs-mode for all file types
| -rw-r--r-- | .dir-locals.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 17bf4b636c..2b8f690c8d 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,9 +1,14 @@ ;; Project-wide Emacs settings ( - ;; `nil' settings apply to all language modes - (nil - ;; Use only spaces for indentation - (indent-tabs-mode . nil)) + (erlang-mode (indent-tabs-mode . nil)) + (autoconf-mode (indent-tabs-mode . nil)) + (java-mode (indent-tabs-mode . nil)) + (perl-mode (indent-tabs-mode . nil)) + (xml-mode (indent-tabs-mode . nil)) + ;; In C code indentation is 4 spaces and in C++ 2 spaces + (c++-mode + (indent-tabs-mode . nil) + (c-basic-offset . 2)) (c-mode - ;; In C code, indentation is four spaces + (indent-tabs-mode . nil) (c-basic-offset . 4))) |