Merge branch 'maint'

* maint:
  emacs: delimiter first in icr works
  emacs: Indent delimiter first in term elements correctly
  emacs: Indent tuple (and maps) elements as list elements
  Add emacs indention testcase

1 files changed, 31 insertions, 0 deletions

diff --git a/lib/tools/test/emacs_SUITE_data/macros b/lib/tools/test/emacs_SUITE_data/macros
new file mode 100644
index 0000000000..6c874e9187
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/macros
@@ -0,0 +1,31 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Macros should be indented as code
+
+-define(M0, ok).
+
+-define(M1,
+        case X of
+            undefined -> error;
+            _ -> ok
+        end).
+
+-define(M2(M2A1,
+           M2A2),
+        func(M2A1,
+             M2A2)
+       ).
+
+-define(
+   M3,
+   undefined
+  ).
+
+-ifdef(DEBUG).
+-define(LOG,
+        logger:log(?MODULE,?LINE)
+       ).
+-else().
+-define(LOG, ok).
+-endif().