diff options
| author | Lukas Larsson <lukas@erlang.org> | 2021-11-01 08:58:22 +0100 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2021-11-01 08:58:22 +0100 |
| commit | dc1e498fe8ada82ac7f5d1d236523e34f172bd35 (patch) | |
| tree | 0a65aee66895a3b5203f04de1518c7bd994887a9 /.dir-locals.el | |
| parent | 03532e828ef78a1a4502a470a82f5ae408536a23 (diff) | |
| parent | 7006d6f3c0214dd0b199fb6b1639a28a6941796c (diff) | |
| download | erlang-dc1e498fe8ada82ac7f5d1d236523e34f172bd35.tar.gz | |
Merge branch 'maint'
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 860f2248a8..b6586cba03 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -6,11 +6,9 @@ (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 - ;; erts/ overrides C++ to 4 spaces (c++-mode (indent-tabs-mode . nil) - (c-basic-offset . 2)) + (c-basic-offset . 4)) (c-mode (indent-tabs-mode . nil) (c-basic-offset . 4))) |