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

15 files changed, 1114 insertions, 1619 deletions

diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
index 35c93ba4ed..ea4d6cb723 100644
--- a/lib/tools/emacs/Makefile
+++ b/lib/tools/emacs/Makefile
@@ -54,8 +54,6 @@ EL_FILES = $(EMACS_FILES:%=%.el)
 
 ELC_FILES = $(EMACS_FILES:%=%.elc) 
 
-TEST_FILES = test.erl.indented test.erl.orig
-
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -75,7 +73,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/emacs"
-	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) $(TEST_FILES) \
+	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) \
 		"$(RELSYSDIR)/emacs"
 
 ifeq ($(DOCTYPE),pdf)
@@ -89,19 +87,3 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(MAN_FILES) "$(RELEASE_PATH)/man/man3"
 endif
 endif
-
-EMACS ?= emacs
-
-test_indentation:
-	@rm -f test.erl
-	@rm -f test_indent.el
-	@echo '(load "erlang-start")' >> test_indent.el
-	@echo '(find-file "test.erl.orig")' >> test_indent.el
-	@echo "(require 'cl)    ; required with Emacs < 23 for ignore-errors" >> test_indent.el
-	@echo '(erlang-mode)' >> test_indent.el
-	@echo '(toggle-debug-on-error)' >> test_indent.el
-	@echo '(erlang-indent-current-buffer)' >> test_indent.el
-	@echo '(write-file "test.erl")' >> test_indent.el
-	$(EMACS) --batch -Q -L . -l test_indent.el
-	diff -u test.erl.indented test.erl
-	@echo "No differences between expected and actual indentation"
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 6b93d63182..c9cdc78f48 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -4,7 +4,7 @@
 ;; Author:   Anders Lindgren
 ;; Keywords: erlang, languages, processes
 ;; Date:     2011-12-11
-;; Version:  2.8.0
+;; Version:  2.8.1
 ;; Package-Requires: ((emacs "24.1"))
 
 ;; %CopyrightBegin%
@@ -84,7 +84,7 @@
   "The Erlang programming language."
   :group 'languages)
 
-(defconst erlang-version "2.8.0"
+(defconst erlang-version "2.8.1"
   "The version number of Erlang mode.")
 
 (defcustom erlang-root-dir nil
@@ -2742,7 +2742,7 @@ Return nil if inside string, t if in a comment."
                   (1+ (nth 2 stack-top)))
                  ((= (char-syntax (following-char)) ?\))
                   (goto-char (nth 1 stack-top))
-                  (cond ((looking-at "[({]\\s *\\($\\|%\\)")
+                  (cond ((erlang-record-or-function-args-p)
                          ;; Line ends with parenthesis.
                          (let ((previous (erlang-indent-find-preceding-expr))
                                (stack-pos (nth 2 stack-top)))
@@ -2752,19 +2752,10 @@ Return nil if inside string, t if in a comment."
                          (nth 2 stack-top))))
                  ((= (following-char) ?,)
                   ;; a comma at the start of the line: line up with opening parenthesis.
-                  (nth 2 stack-top))
+                  (min (nth 2 stack-top)
+                       (erlang-indent-element stack-top indent-point token)))
                  (t
-                  (goto-char (nth 1 stack-top))
-                  (let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")
-                                     ;; Line ends with parenthesis.
-                                     (erlang-indent-parenthesis (nth 2 stack-top)))
-                                    (t
-                                     ;; Indent to the same column as the first
-                                     ;; argument.
-                                     (goto-char (1+ (nth 1 stack-top)))
-                                     (skip-chars-forward " \t")
-                                     (current-column)))))
-                    (erlang-indent-standard indent-point token base 't)))))
+                  (erlang-indent-element stack-top indent-point token))))
           ;;
           ((eq (car stack-top) '<<)
            ;; Element of binary (possible comprehension) expression,
@@ -2773,13 +2764,11 @@ Return nil if inside string, t if in a comment."
                   (+ 2 (nth 2 stack-top)))
                  ((looking-at "\\(>>\\)[^_a-zA-Z0-9]")
                   (nth 2 stack-top))
+                 ((= (following-char) ?,)
+                  (min (+ (nth 2 stack-top) 1)
+                       (- (erlang-indent-to-first-element stack-top 2) 1)))
                  (t
-                  (goto-char (nth 1 stack-top))
-                  ;; Indent to the same column as the first
-                  ;; argument.
-                  (goto-char (+ 2 (nth 1 stack-top)))
-                  (skip-chars-forward " \t")
-                  (current-column))))
+                  (erlang-indent-to-first-element stack-top 2))))
 
           ((memq (car stack-top) '(icr fun spec))
            ;; The default indentation is the column of the option
@@ -2835,12 +2824,13 @@ Return nil if inside string, t if in a comment."
                (let ((base (erlang-indent-find-base stack indent-point off skip)))
                  ;; Special cases
                  (goto-char indent-point)
-                 (cond ((looking-at "\\(end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
+                 (cond ((looking-at "\\(;\\|end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
                         (if (eq (car stack-top) '->)
                             (erlang-pop stack))
-                        (if stack
-                            (erlang-caddr (car stack))
-                          0))
+                        (cond ((and stack (looking-at ";"))
+                               (+ (erlang-caddr (car stack)) (- erlang-indent-level 2)))
+                              (stack (erlang-caddr (car stack)))
+                              (t off)))
                        ((looking-at "catch\\b\\($\\|[^_a-zA-Z0-9]\\)")
                         ;; Are we in a try
                         (let ((start (if (eq (car stack-top) '->)
@@ -2914,6 +2904,22 @@ Return nil if inside string, t if in a comment."
                                 (current-column))) start-alternativ))))))
           )))
 
+(defun erlang-indent-to-first-element (stack-top extra)
+  ;; Indent to the same column as the first
+  ;; argument.  extra should be 1 for lists tuples or 2 for binaries
+  (goto-char (+ (nth 1 stack-top) extra))
+  (skip-chars-forward " \t")
+  (current-column))
+
+(defun erlang-indent-element (stack-top indent-point token)
+  (goto-char (nth 1 stack-top))
+  (let ((base (cond ((erlang-record-or-function-args-p)
+                     ;; Line ends with parenthesis.
+                     (erlang-indent-parenthesis (nth 2 stack-top)))
+                    (t
+                     (erlang-indent-to-first-element stack-top 1)))))
+    (erlang-indent-standard indent-point token base 't)))
+
 (defun erlang-indent-standard (indent-point token base inside-parenthesis)
   "Standard indent when in blocks or tuple or arguments.
    Look at last thing to see in what state we are, move relative to the base."
@@ -2939,6 +2945,9 @@ Return nil if inside string, t if in a comment."
                ;; Avoid treating comments a continued line.
                ((= (following-char) ?%)
                 base)
+               ((and (= (following-char) ?,) inside-parenthesis)
+                ;; a comma at the start of the line line up with parenthesis
+                (- base 1))
                ;; Continued line (e.g. line beginning
                ;; with an operator.)
                (t
@@ -3028,11 +3037,21 @@ This assumes that the preceding expression is either simple
                (t col)))
        col))))
 
+(defun erlang-record-or-function-args-p ()
+  (and (looking-at "[({]\\s *\\($\\|%\\)")
+       (or (eq (following-char) ?\( )
+           (save-excursion
+             (ignore-errors (forward-sexp (- 1)))
+             (eq (preceding-char) ?#)))))
+
 (defun erlang-indent-parenthesis (stack-position)
   (let ((previous (erlang-indent-find-preceding-expr)))
-    (if (> previous stack-position)
-        (+ stack-position erlang-argument-indent)
-      (+ previous erlang-argument-indent))))
+    (cond ((eq previous stack-position) ;; tuple or map not a record
+           (1+ stack-position))
+          ((> previous stack-position)
+           (+ stack-position erlang-argument-indent))
+          (t
+           (+ previous erlang-argument-indent)))))
 
 (defun erlang-skip-blank (&optional lim)
   "Skip over whitespace and comments until limit reached."
diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented
deleted file mode 100644
index 14a4eca7c3..0000000000
--- a/lib/tools/emacs/test.erl.indented
+++ /dev/null
@@ -1,784 +0,0 @@
-%% -*- Mode: erlang; indent-tabs-mode: nil -*-
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-
-%%%-------------------------------------------------------------------
-%%% File    : test.erl
-%%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description :   Test emacs mode indention and font-locking
-%%%                 this file is intentionally not indented.
-%%%                 Copy the file and indent it and you should end up with test.erl.indented
-%%% Created :  6 Oct 2009 by Dan Gudmundsson <[email protected]>
-%%%-------------------------------------------------------------------
-
-%% Start off with syntax highlighting you have to verify this by looking here
-%% and see that the code looks alright
-
--module(test).
--compile(export_all).
-
-%% Used to cause an "Unbalanced parentheses" error.
-foo(M) ->
-    M#{a :=<<"a">>
-      ,b:=1}.
-foo() ->
-    #{a =><<"a">>
-     ,b=>1}.
-
-%% Module attributes should be highlighted
-
--export([t/1]).
--record(record1, {a,
-                  b,
-                  c
-                 }).
--record(record2, {
-          a,
-          b
-         }).
-
--record(record3, {a = 8#42423 bor
-                      8#4234,
-                  b = 8#5432
-                      bor 2#1010101
-                  c = 123 +
-                      234,
-		  d}).
-
--record(record4, {
-          a = 8#42423 bor
-              8#4234,
-          b = 8#5432
-              bor 2#1010101
-          c = 123 +
-              234,
-          d}).
-
--record(record5, { a = 1 :: integer()
-                 , b = foobar :: atom()
-                 }).
-
--define(MACRO_1, macro).
--define(MACRO_2(_), macro).
-
--spec t(integer()) -> any().
-
--type ann() :: Var :: integer().
--type ann2() :: Var ::
-            'return'
-          | 'return_white_spaces'
-          | 'return_comments'
-          | 'text' | ann().
--type paren() ::
-        (ann2()).
--type t1() :: atom().
--type t2() :: [t1()].
--type t3(Atom) :: integer(Atom).
--type t4() :: t3(foobar).
--type t5() :: {t1(), t3(foo)}.
--type t6() :: 1 | 2 | 3 |
-              'foo' | 'bar'.
--type t7() :: [].
--type t71() :: [_].
--type t8() :: {any(),none(),pid(),port(),
-	       reference(),float()}.
--type t9() :: [1|2|3|foo|bar] |
-              list(a | b | c) | t71().
--type t10() :: {1|2|3|foo|t9()} | {}.
--type t11() :: 1..2.
--type t13() :: maybe_improper_list(integer(), t11()).
--type t14() :: [erl_scan:foo() |
-                %% Should be highlighted
-                term() |
-                bool() |
-                byte() |
-                char() |
-                non_neg_integer() | nonempty_list() |
-                pos_integer() |
-                neg_integer() |
-                number() |
-                list() |
-                nonempty_improper_list() | nonempty_maybe_improper_list() |
-                maybe_improper_list() | string() | iolist() | byte() |
-                module() |
-                mfa() 	|
-                node() 	|
-                timeout() |
-                no_return() |
-                %% Should not be highlighted
-                nonempty_() | nonlist() |
-                erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
-
-
--type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
-		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
-                                        <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
-                                        <<_:34>>|<<_:34>>|<<_:34>>].
--type t16() :: fun().
--type t17() :: fun((...) -> paren()).
--type t18() :: fun(() -> t17() | t16()).
--type t19() :: fun((t18()) -> t16()) |
-               fun((nonempty_maybe_improper_list('integer', any())|
-                    1|2|3|a|b|<<_:3,_:_*14>>|integer()) ->
-                          nonempty_maybe_improper_list('integer', any())|
-                          1|2|3|a|b|<<_:3,_:_*14>>|integer()).
--type t20() :: [t19(), ...].
--type t21() :: tuple().
--type t21(A) :: A.
--type t22() :: t21(integer()).
--type t23() :: #rec1{}.
--type t24() :: #rec2{a :: t23(), b :: [atom()]}.
--type t25() :: #rec3{f123 :: [t24() |
-                              1|2|3|4|a|b|c|d|
-                              nonempty_maybe_improper_list(integer, any())]}.
--type t26() :: #rec4{ a :: integer()
-                    , b :: any()
-                    }.
--type t27() :: { integer()
-               , atom()
-               }.
--type t99() ::
-        {t2(),t4(),t5(),t6(),t7(),t8(),t10(),t14(),
-         t15(),t20(),t21(), t22(),t25()}.
--spec t1(FooBar :: t99()) -> t99();
-        (t2()) -> t2();
-	(t4()) -> t4() when is_subtype(t4(), t24);
-        (t23()) -> t23() when is_subtype(t23(), atom()),
-                              is_subtype(t23(), t14());
-        (t24()) -> t24() when is_subtype(t24(), atom()),
-                              is_subtype(t24(), t14()),
-                              is_subtype(t24(), t4()).
-
--spec over(I :: integer()) -> R1 :: foo:typen();
-          (A :: atom()) -> R2 :: foo:atomen();
-          (T :: tuple()) -> R3 :: bar:typen().
-
--spec mod:t2() -> any().
-
--spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
-                        | {'del_member', name(), pid()},
-                  #state{}) -> {'noreply', #state{}}.
-
--spec handle_cast(Cast ::
-                    {'exchange', node(), [[name(),...]]}
-                  | {'del_member', name(), pid()},
-                  #state{}) -> {'noreply', #state{}}.
-
--spec all(fun((T) -> boolean()), List :: [T]) ->
-                 boolean() when is_subtype(T, term()). % (*)
-
--spec get_closest_pid(term()) ->
-                             Return :: pid()
-                                     | {'error', {'no_process', term()}
-                                        | {'no_such_group', term()}}.
-
--spec add( X :: integer()
-         , Y :: integer()
-         ) -> integer().
-
--opaque attributes_data() ::
-          [{'column', column()} | {'line', info_line()} |
-           {'text', string()}] |  {line(),column()}.
--record(r,{
-	  f1 :: attributes_data(),
-          f222 = foo:bar(34, #rec3{}, 234234234423,
-                         aassdsfsdfsdf, 2234242323) ::
-                   [t24() | 1|2|3|4|a|b|c|d|
-                    nonempty_maybe_improper_list(integer, any())],
-          f333 :: [t24() | 1|2|3|4|a|b|c|d|
-                   nonempty_maybe_improper_list(integer, any())],
-          f3 = x:y(),
-          f4 = x:z() :: t99(),
-          f17 :: 'undefined',
-          f18 :: 1 | 2 | 'undefined',
-          f19 = 3 :: integer()|undefined,
-          f5 = 3 :: undefined|integer()}).
-
--record(state, {
-          sequence_number = 1          :: integer()
-         }).
-
-
-highlighting(X)			  % Function definitions should be highlighted
-  when is_integer(X) ->	  % and so should `when' and `is_integer' be
-    %% Highlighting
-    %% Various characters (we keep an `atom' after to see that highlighting ends)
-    $a,atom,			  % Characters should be marked
-    "string",atom,		  % and strings
-    'asdasd',atom,		  % quote should be atoms??
-    'VaV',atom,
-    'aVa',atom,
-    '\'atom',atom,
-    'atom\'',atom,
-    'at\'om',atom,
-    '#1',atom,
-
-    $", atom,					% atom should be ok
-    $', atom,
-
-    "string$", atom,  "string$", atom,  		% currently buggy I know...
-    "string\$", atom,   				% workaround for bug above
-
-    "char $in string", atom,
-
-    'atom$', atom,  'atom$', atom,
-    'atom\$', atom,
-
-    'char $in atom', atom,
-
-    $[, ${, $\\, atom,
-    ?MACRO_1,
-    ?MACRO_2(foo),
-
-    %% Numerical constants
-    16#DD,					% AD Should not be highlighted
-    32#dd,					% AD Should not be highlighted
-    32#ddAB,				        % AD Should not be highlighted
-    32#101,				        % AD Should not be highlighted
-    32#ABTR,				        % AD Should not be highlighted
-
-    %% Variables
-    Variables = lists:foo(),
-    _Variables = lists:foo(),                      % AD
-    AppSpec = Xyz/2,
-    Module42 = Xyz(foo, bar),
-    Module:foo(),
-    _Module:foo(),				% AD
-    FooÅÅ = lists:reverse([tl,hd,tl,hd]),	% AD Should highlight FooÅÅ
-    _FooÅÅ = 42,				% AD Should highlight _FooÅÅ
-
-    %% Bifs
-    erlang:registered(),
-    registered(),
-    hd(tl(tl(hd([a,b,c])))),
-    erlang:anything(lists),
-    %% Guards
-    is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
-    is_function(Fun), is_pid(self()),
-    not_a_guard:is_list([]),
-    %% Other Types
-
-    atom,			  % not (currently) hightlighted
-    234234,
-    234.43,
-
-    [list, are, not, higlighted],
-    {nor, is, tuple},
-    ok.
-
-%%%
-%%%  Indentation
-%%%
-
-%%%  Left
-
-%%   Indented
-
-                                                %    Right
-
-
-indent_basics(X, Y, Z)
-  when X > 42,
-       Z < 13;
-       Y =:= 4711 ->
-    %% comments
-                                                % right comments
-    case lists:filter(fun(_, AlongName,
-                          B,
-                          C) ->
-                              true
-                      end,
-                      [a,v,b])
-    of
-        [] ->
-            Y = 5 * 43,
-            ok;
-        [_|_] ->
-            Y = 5 * 43,
-            ok
-    end,
-    Y,
-    %% List, tuples and binaries
-    [a,
-     b, c
-    ],
-    [ a,
-      b, c
-    ],
-
-    [
-     a,
-     b
-    ],
-    {a,
-     b,c
-    },
-    { a,
-      b,c
-    },
-
-    {
-      a,
-      b
-    },
-
-    <<1:8,
-      2:8
-    >>,
-    <<
-      1:8,
-      2:8
-    >>,
-    << 1:8,
-       2:8
-    >>,
-
-    (a,
-     b,
-     c
-    ),
-
-    ( a,
-      b,
-      c
-    ),
-
-
-    (
-      a,
-      b,
-      c
-    ),
-
-    call(2#42423 bor
-             #4234,
-         2#5432,
-         other_arg),
-    ok;
-indent_basics(Xlongname,
-              #struct{a=Foo,
-                      b=Bar},
-              [X|
-               Y]) ->
-    testing_next_clause,
-    ok;
-indent_basics(					% AD added clause
-  X, 						% not sure how this should look
-  Y,
-  Z)
-  when
-      X < 42, Z > 13;
-      Y =:= 4711 ->
-    foo;
-indent_basics(X, Y, Z) when			% AD added clause
-      X < 42, Z > 13;				% testing when indentation
-      Y =:= 4711 ->
-    foo;
-indent_basics(X, Y, Z)				% AD added clause
-  when						% testing when indentation
-      X < 42, Z > 13;				% unsure about this one
-      Y =:= 4711 ->
-    foo.
-
-
-
-indent_nested() ->
-    [
-     {foo, 2, "string"},
-     {bar, 3, "another string"}
-    ].
-
-
-indent_icr(Z) -> 				% icr = if case receive
-    %% If
-    if Z >= 0 ->
-            X = 43 div 4,
-            foo(X);
-       Z =< 10 ->
-            X = 43 div 4,
-            foo(X);
-       Z == 5 orelse
-       Z == 7 ->
-            X = 43 div 4,
-            foo(X);
-       true ->
-            if_works
-    end,
-    %% Case
-    case {Z, foo, bar} of
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}	when
-              Z =:= 42 ->				% AD line should be indented as a when
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}
-          when Z < 10 ->			% AD when should be indented
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}
-          when					% AD when should be indented
-              Z < 10				% and the guards should follow when
-              andalso				% unsure about how though
-              true ->
-            X = 43 div 4,
-            foo(X)
-    end,
-    %% begin
-    begin
-        sune,
-        X = 74234 + foo(8456) +
-            345 div 43,
-        ok
-    end,
-
-
-    %% receive
-    receive
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        Z ->
-            X = 43 div 4,
-            foo(X)
-    end,
-    receive
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        Z 					% AD added clause
-          when Z =:= 1 ->			% This line should be indented by 2
-            X = 43 div 4,
-            foo(X);
-        Z when					% AD added clause
-              Z =:= 2 ->				% This line should be indented by 2
-            X = 43 div 4,
-            foo(X);
-        Z ->
-            X = 43 div 4,
-            foo(X)
-    after infinity ->
-            foo(X),
-            asd(X),
-            5*43
-    end,
-    receive
-    after 10 ->
-            foo(X),
-            asd(X),
-            5*43
-    end,
-    ok.
-
-indent_fun() ->
-    %% Changed fun to one indention level
-    Var = spawn(fun(X)
-                      when X == 2;
-                           X > 10 ->
-                        hello,
-                        case Hello() of
-                            true when is_atom(X) ->
-                                foo;
-                            false ->
-                                bar
-                        end;
-                   (Foo) when is_atom(Foo),
-                              is_integer(X) ->
-                        X = 6* 45,
-                        Y = true andalso
-                            kalle
-                end),
-    %% check EEP37 named funs
-    Fn1 = fun Fact(N) when N > 0 ->
-                  F = Fact(N-1),
-                  N * F;
-              Fact(0) ->
-                  1
-          end,
-    %% check anonymous funs too
-    Fn2 = fun(0) ->
-                  1;
-             (N) ->
-                  N
-          end,
-    ok.
-
-indent_try_catch() ->
-    try
-        io:format(stdout, "Parsing file ~s, ",
-                  [St0#leex.xfile]),
-        {ok,Line3,REAs,Actions,St3} =
-            parse_rules(Xfile, Line2, Macs, St2)
-    catch
-        exit:{badarg,R} ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R);
-        error:R 				% AD added clause
-          when R =:= 42 ->			% when should be indented
-            foo(R);
-        error:R 				% AD added clause
-          when					% when should be indented
-              R =:= 42 ->				% but unsure about this (maybe 2 more)
-            foo(R);
-        error:R when				% AD added clause
-              R =:= foo ->				% line should be 2 indented (works)
-            foo(R);
-        error:R ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R)
-    after
-        foo('after'),
-        file:close(Xfile)
-    end;
-indent_try_catch() ->
-    try
-        foo(bar)
-    of
-        X when true andalso
-               kalle ->
-            io:format(stdout, "Parsing file ~s, ",
-                      [St0#leex.xfile]),
-            {ok,Line3,REAs,Actions,St3} =
-                parse_rules(Xfile, Line2, Macs, St2);
-        X 					% AD added clause
-          when false andalso			% when should be 2 indented
-               bengt ->
-            gurka();
-        X when					% AD added clause
-              false andalso				% line should be 2 indented
-              not bengt ->
-            gurka();
-        X ->
-            io:format(stdout, "Parsing file ~s, ",
-                      [St0#leex.xfile]),
-            {ok,Line3,REAs,Actions,St3} =
-                parse_rules(Xfile, Line2, Macs, St2)
-    catch
-        exit:{badarg,R} ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R);
-        error:R ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R)
-    after
-        foo('after'),
-        file:close(Xfile),
-        bar(with_long_arg,
-            with_second_arg)
-    end;
-indent_try_catch() ->
-    try foo()
-    after
-        foo(),
-        bar(with_long_arg,
-            with_second_arg)
-    end.
-
-indent_catch() ->
-    D = B +
-        float(43.1),
-
-    B = catch oskar(X),
-
-    A = catch (baz +
-                   bax),
-    catch foo(),
-
-    C = catch B +
-        float(43.1),
-
-    case catch foo(X) of
-        A ->
-            B
-    end,
-
-    case
-        catch foo(X)
-    of
-        A ->
-            B
-    end,
-
-    case
-        foo(X)
-    of
-        A ->
-            catch B,
-            X
-    end,
-
-    try sune of
-        _ -> foo
-    catch _:_ -> baf
-    end,
-
-    try
-        sune
-    of
-        _ ->
-            X = 5,
-            (catch foo(X)),
-            X + 10
-    catch _:_ -> baf
-    end,
-
-    try
-        (catch sune)
-    of
-        _ ->
-    catch foo()  %% BUGBUG can't handle catch inside try without parentheses
-    catch _:_ ->
-            baf
-    end,
-
-    try
-        (catch exit())
-    catch
-        _ ->
-            catch baf()
-    end,
-    ok.
-
-indent_binary() ->
-    X = lists:foldr(fun(M) ->
-                            <<Ma/binary, " ">>
-                    end, [], A),
-    A = <<X/binary, 0:8>>,
-    B.
-
-
-indent_comprehensions() ->
-    %% I don't have a good idea how we want to handle this
-    %% but they are here to show how they are indented today.
-    Result1 = [X ||
-                  #record{a=X} <- lists:seq(1, 10),
-                  true = (X rem 2)
-              ],
-    Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
-                    true = (X rem 2)
-              ],
-
-    Binary1 = << <<X:8>> ||
-                  #record{a=X} <- lists:seq(1, 10),
-                  true = (X rem 2)
-              >>,
-
-    Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
-                            true = (X rem 2)
-              >>,
-    ok.
-
-%% This causes an error in earlier erlang-mode versions.
-foo() ->
-    [#foo{
-        foo = foo}].
-
-%% Record indentation
-some_function_with_a_very_long_name() ->
-    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-       field1=a,
-       field2=b},
-    case dummy_function_with_a_very_very_long_name(x) of
-        #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-           field1=a,
-           field2=b} ->
-            ok;
-        Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-                 field1=a,
-                 field2=b} ->
-            Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-              field1=a,
-              field2=b};
-        #xyz{
-           a=1,
-           b=2} ->
-            ok
-    end.
-
-another_function_with_a_very_very_long_name() ->
-    #rec{
-       field1=1,
-       field2=1}.
-
-some_function_name_xyz(xyzzy, #some_record{
-                                 field1=Field1,
-                                 field2=Field2}) ->
-    SomeVariable = f(#'Some-long-record-name'{
-                        field_a = 1,
-                        'inter-xyz-parameters' =
-                            #'Some-other-very-long-record-name'{
-                               field2 = Field1,
-                               field2 = Field2}}),
-    {ok, SomeVariable}.
-
-commas_first() ->
-    {abc, [ {some_var, 1}
-          , {some_other_var, 2}
-          , {erlang_ftw, 9}
-          , {erlang_cookie, 'cookie'}
-          , {cmds,
-             [ {one,   "sudo ls"}
-             , {one,   "sudo ls"}
-             , {two,   "sudo ls"}
-             , {three, "sudo ls"}
-             , {four,  "sudo ls"}
-             , {three, "sudo ls"}
-             ] }
-          , {ssh_username, "yow"}
-          , {cluster,
-             [ {aaaa, [ {"10.198.55.12" , "" }
-                      , {"10.198.55.13" , "" }
-                      ] }
-             , {bbbb, [ {"10.198.55.151", "" }
-                      , {"10.198.55.123", "" }
-                      , {"10.198.55.34" , "" }
-                      , {"10.198.55.85" , "" }
-                      , {"10.198.55.67" , "" }
-                      ] }
-             , {cccc, [ {"10.198.55.68" , "" }
-                      , {"10.198.55.69" , "" }
-                      ] }
-             ] }
-          ]
-    }.
-
-
-%% this used to result in a scan-sexp error
-[{
- }].
-
-%% this used to result in 2x the correct indentation within the function
-%% body, due to the function name being mistaken for a keyword
-catcher(N) ->
-    try generate_exception(N) of
-        Val -> {N, normal, Val}
-    catch
-        throw:X -> {N, caught, thrown, X};
-        exit:X -> {N, caught, exited, X};
-        error:X -> {N, caught, error, X}
-    end.
diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig
deleted file mode 100644
index c0cf1749b6..0000000000
--- a/lib/tools/emacs/test.erl.orig
+++ /dev/null
@@ -1,784 +0,0 @@
-%% -*- Mode: erlang; indent-tabs-mode: nil -*-
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-
-%%%-------------------------------------------------------------------
-%%% File    : test.erl
-%%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description :   Test emacs mode indention and font-locking
-%%%                 this file is intentionally not indented.
-%%%                 Copy the file and indent it and you should end up with test.erl.indented
-%%% Created :  6 Oct 2009 by Dan Gudmundsson <[email protected]>
-%%%-------------------------------------------------------------------
-
-%% Start off with syntax highlighting you have to verify this by looking here
-%% and see that the code looks alright
-
--module(test).
--compile(export_all).
-
-%% Used to cause an "Unbalanced parentheses" error.
-foo(M) ->
-M#{a :=<<"a">>
-,b:=1}.
-foo() ->
-#{a =><<"a">>
-,b=>1}.
-
-%% Module attributes should be highlighted
-
--export([t/1]).
--record(record1, {a,
- b,
- c
-}).
--record(record2, {
-  a,
-  b
- }).
-
--record(record3, {a = 8#42423 bor
-    8#4234,
-  b = 8#5432
-		  bor 2#1010101
-  c = 123 +
-234,
-		  d}).
-
--record(record4, {
- a = 8#42423 bor
-   8#4234,
- b = 8#5432
-    bor 2#1010101
- c = 123 +
-     234,
- d}).
-
--record(record5, { a = 1 :: integer()
-, b = foobar :: atom()
-}).
-
--define(MACRO_1, macro).
--define(MACRO_2(_), macro).
-
--spec t(integer()) -> any().
-
--type ann() :: Var :: integer().
--type ann2() :: Var ::
-   'return'
- | 'return_white_spaces'
-  | 'return_comments'
-  | 'text' | ann().
--type paren() ::
-  (ann2()).
--type t1() :: atom().
--type t2() :: [t1()].
--type t3(Atom) :: integer(Atom).
--type t4() :: t3(foobar).
--type t5() :: {t1(), t3(foo)}.
--type t6() :: 1 | 2 | 3 |
-	'foo' | 'bar'.
--type t7() :: [].
--type t71() :: [_].
--type t8() :: {any(),none(),pid(),port(),
-	       reference(),float()}.
--type t9() :: [1|2|3|foo|bar] |
-    list(a | b | c) | t71().
--type t10() :: {1|2|3|foo|t9()} | {}.
--type t11() :: 1..2.
--type t13() :: maybe_improper_list(integer(), t11()).
--type t14() :: [erl_scan:foo() |
-        %% Should be highlighted
-	term() |
-	bool() |
-	byte() |
-	char() |
-	non_neg_integer() | nonempty_list() |
-	pos_integer() |
-	neg_integer() |
-	number() |
-	list() |
-	nonempty_improper_list() | nonempty_maybe_improper_list() |
-	maybe_improper_list() | string() | iolist() | byte() |
-	module() |
-	mfa() 	|
-	node() 	|
-	timeout() |
-	no_return() |
-	%% Should not be highlighted
-	nonempty_() | nonlist() |
- erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
-
-
--type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
-		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
-<<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
-<<_:34>>|<<_:34>>|<<_:34>>].
--type t16() :: fun().
--type t17() :: fun((...) -> paren()).
--type t18() :: fun(() -> t17() | t16()).
--type t19() :: fun((t18()) -> t16()) |
-  fun((nonempty_maybe_improper_list('integer', any())|
-      1|2|3|a|b|<<_:3,_:_*14>>|integer()) ->
-nonempty_maybe_improper_list('integer', any())|
-1|2|3|a|b|<<_:3,_:_*14>>|integer()).
--type t20() :: [t19(), ...].
--type t21() :: tuple().
--type t21(A) :: A.
--type t22() :: t21(integer()).
--type t23() :: #rec1{}.
--type t24() :: #rec2{a :: t23(), b :: [atom()]}.
--type t25() :: #rec3{f123 :: [t24() |
-1|2|3|4|a|b|c|d|
-nonempty_maybe_improper_list(integer, any())]}.
--type t26() :: #rec4{ a :: integer()
-, b :: any()
-}.
--type t27() :: { integer()
-, atom()
-}.
--type t99() ::
-{t2(),t4(),t5(),t6(),t7(),t8(),t10(),t14(),
-t15(),t20(),t21(), t22(),t25()}.
--spec t1(FooBar :: t99()) -> t99();
-(t2()) -> t2();
-	(t4()) -> t4() when is_subtype(t4(), t24);
-(t23()) -> t23() when is_subtype(t23(), atom()),
-                      is_subtype(t23(), t14());
-(t24()) -> t24() when is_subtype(t24(), atom()),
-                      is_subtype(t24(), t14()),
-	   is_subtype(t24(), t4()).
-
--spec over(I :: integer()) -> R1 :: foo:typen();
-  (A :: atom()) -> R2 :: foo:atomen();
- (T :: tuple()) -> R3 :: bar:typen().
-
--spec mod:t2() -> any().
-
--spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
-  | {'del_member', name(), pid()},
-     #state{}) -> {'noreply', #state{}}.
-
--spec handle_cast(Cast ::
-   {'exchange', node(), [[name(),...]]}
- | {'del_member', name(), pid()},
-   #state{}) -> {'noreply', #state{}}.
-
--spec all(fun((T) -> boolean()), List :: [T]) ->
- boolean() when is_subtype(T, term()). % (*)
-
--spec get_closest_pid(term()) ->
-       Return :: pid()
- | {'error', {'no_process', term()}
-   | {'no_such_group', term()}}.
-
--spec add( X :: integer()
-, Y :: integer()
-) -> integer().
-
--opaque attributes_data() ::
-[{'column', column()} | {'line', info_line()} |
- {'text', string()}] |  {line(),column()}.
--record(r,{
-	  f1 :: attributes_data(),
-f222 = foo:bar(34, #rec3{}, 234234234423,
-               aassdsfsdfsdf, 2234242323) ::
-[t24() | 1|2|3|4|a|b|c|d|
- nonempty_maybe_improper_list(integer, any())],
-f333 :: [t24() | 1|2|3|4|a|b|c|d|
-	 nonempty_maybe_improper_list(integer, any())],
-f3 = x:y(),
-f4 = x:z() :: t99(),
-f17 :: 'undefined',
-f18 :: 1 | 2 | 'undefined',
-f19 = 3 :: integer()|undefined,
-f5 = 3 :: undefined|integer()}).
-
--record(state, {
-  sequence_number = 1          :: integer()
-  }).
-
-
-highlighting(X)			  % Function definitions should be highlighted
-  when is_integer(X) ->	  % and so should `when' and `is_integer' be
- %% Highlighting
- %% Various characters (we keep an `atom' after to see that highlighting ends)
- $a,atom,			  % Characters should be marked
- "string",atom,		  % and strings
- 'asdasd',atom,		  % quote should be atoms??
- 'VaV',atom,
- 'aVa',atom,
- '\'atom',atom,
- 'atom\'',atom,
- 'at\'om',atom,
- '#1',atom,
-
- $", atom,					% atom should be ok
- $', atom,
-
- "string$", atom,  "string$", atom,  		% currently buggy I know...
- "string\$", atom,   				% workaround for bug above
-
- "char $in string", atom,
-
- 'atom$', atom,  'atom$', atom,
- 'atom\$', atom,
-
- 'char $in atom', atom,
-
- $[, ${, $\\, atom,
- ?MACRO_1,
- ?MACRO_2(foo),
-
- %% Numerical constants
- 16#DD,					% AD Should not be highlighted
- 32#dd,					% AD Should not be highlighted
- 32#ddAB,				        % AD Should not be highlighted
- 32#101,				        % AD Should not be highlighted
- 32#ABTR,				        % AD Should not be highlighted
-
- %% Variables
- Variables = lists:foo(),
- _Variables = lists:foo(),                      % AD
- AppSpec = Xyz/2,
- Module42 = Xyz(foo, bar),
- Module:foo(),
- _Module:foo(),				% AD
- FooÅÅ = lists:reverse([tl,hd,tl,hd]),	% AD Should highlight FooÅÅ
- _FooÅÅ = 42,				% AD Should highlight _FooÅÅ
-
- %% Bifs
- erlang:registered(),
- registered(),
- hd(tl(tl(hd([a,b,c])))),
- erlang:anything(lists),
- %% Guards
- is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
- is_function(Fun), is_pid(self()),
- not_a_guard:is_list([]),
- %% Other Types
-
- atom,			  % not (currently) hightlighted
- 234234,
- 234.43,
-
- [list, are, not, higlighted],
- {nor, is, tuple},
- ok.
-
-%%%
-%%%  Indentation
-%%%
-
-%%%  Left
-
-%%   Indented
-
-%    Right
-
-
-indent_basics(X, Y, Z)
-  when X > 42,
-Z < 13;
-Y =:= 4711 ->
- %% comments
- % right comments
- case lists:filter(fun(_, AlongName,
-	      B,
-    C) ->
-		       true
-		   end,
-		   [a,v,b])
- of
- [] ->
- Y = 5 * 43,
- ok;
- [_|_] ->
- Y = 5 * 43,
- ok
- end,
- Y,
- %% List, tuples and binaries
- [a,
-  b, c
- ],
- [ a,
-   b, c
-  ],
-
- [
- a,
- b
-],
- {a,
-  b,c
- },
- { a,
-  b,c
-    },
-
- {
- a,
- b
- },
-
-<<1:8,
-  2:8
-  >>,
- <<
- 1:8,
- 2:8
-  >>,
- << 1:8,
-   2:8
-    >>,
-
- (a,
-  b,
-  c
- ),
-
-    ( a,
-     b,
-     c
-    ),
-
-
- (
-  a,
-  b,
-  c
- ),
-
- call(2#42423 bor
-   #4234,
-  2#5432,
- other_arg),
- ok;
-indent_basics(Xlongname,
-     #struct{a=Foo,
-     b=Bar},
-       [X|
-	Y]) ->
- testing_next_clause,
- ok;
-indent_basics(					% AD added clause
- X, 						% not sure how this should look
- Y,
- Z)
- when
- X < 42, Z > 13;
- Y =:= 4711 ->
- foo;
-indent_basics(X, Y, Z) when			% AD added clause
- X < 42, Z > 13;				% testing when indentation
- Y =:= 4711 ->
- foo;
-indent_basics(X, Y, Z)				% AD added clause
- when						% testing when indentation
- X < 42, Z > 13;				% unsure about this one
- Y =:= 4711 ->
- foo.
-
-
-
-indent_nested() ->
- [
- {foo, 2, "string"},
- {bar, 3, "another string"}
-  ].
-
-
-indent_icr(Z) -> 				% icr = if case receive
- %% If
- if Z >= 0 ->
-	 X = 43 div 4,
-	 foo(X);
-    Z =< 10 ->
-	 X = 43 div 4,
-	 foo(X);
-    Z == 5 orelse
-    Z == 7 ->
-	 X = 43 div 4,
-	 foo(X);
-    true ->
-	 if_works
-  end,
- %% Case
- case {Z, foo, bar} of
-  {Z,_,_} ->
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}	when
-  Z =:= 42 ->				% AD line should be indented as a when
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}
-  when Z < 10 ->			% AD when should be indented
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}
-  when					% AD when should be indented
-  Z < 10				% and the guards should follow when
-  andalso				% unsure about how though
-  true ->
-  X = 43 div 4,
-  foo(X)
- end,
- %% begin
- begin
- sune,
- X = 74234 + foo(8456) +
-  345 div 43,
- ok
- end,
-
-
- %% receive
-  receive
-  {Z,_,_} ->
-    X = 43 div 4,
-    foo(X);
-  Z ->
-   X = 43 div 4,
-   foo(X)
-  end,
-  receive
-  {Z,_,_} ->
-  X = 43 div 4,
-  foo(X);
- Z 					% AD added clause
-  when Z =:= 1 ->			% This line should be indented by 2
-  X = 43 div 4,
-  foo(X);
- Z when					% AD added clause
-  Z =:= 2 ->				% This line should be indented by 2
-  X = 43 div 4,
-  foo(X);
- Z ->
-    X = 43 div 4,
-    foo(X)
- after infinity ->
-    foo(X),
-    asd(X),
-    5*43
- end,
- receive
- after 10 ->
- foo(X),
- asd(X),
- 5*43
- end,
- ok.
-
-indent_fun() ->
-    %% Changed fun to one indention level
-Var = spawn(fun(X)
-       when X == 2;
-	     X > 10 ->
-  hello,
-  case Hello() of
-   true when is_atom(X) ->
-      foo;
-  false ->
-      bar
-  end;
- (Foo) when is_atom(Foo),
-   is_integer(X) ->
-  X = 6* 45,
-  Y = true andalso
-	  kalle
- end),
-%% check EEP37 named funs
-Fn1 = fun Fact(N) when N > 0 ->
-   F = Fact(N-1),
-          N * F;
-Fact(0) ->
-                 1
-  end,
-%% check anonymous funs too
-   Fn2 = fun(0) ->
-1;
-   (N) ->
-   N
- end,
-  ok.
-
-indent_try_catch() ->
- try
- io:format(stdout, "Parsing file ~s, ",
- [St0#leex.xfile]),
- {ok,Line3,REAs,Actions,St3} =
- parse_rules(Xfile, Line2, Macs, St2)
- catch
-  exit:{badarg,R} ->
-  foo(R),
-  io:format(stdout,
-   "ERROR reason ~p~n",
-    R);
-  error:R 				% AD added clause
-  when R =:= 42 ->			% when should be indented
-  foo(R);
-  error:R 				% AD added clause
-  when					% when should be indented
-  R =:= 42 ->				% but unsure about this (maybe 2 more)
-  foo(R);
-  error:R when				% AD added clause
-  R =:= foo ->				% line should be 2 indented (works)
-  foo(R);
-  error:R ->
-  foo(R),
-  io:format(stdout,
-   "ERROR reason ~p~n",
-    R)
- after
-  foo('after'),
-  file:close(Xfile)
- end;
-indent_try_catch() ->
- try
-   foo(bar)
- of
- X when true andalso
- kalle ->
-  io:format(stdout, "Parsing file ~s, ",
-  [St0#leex.xfile]),
-  {ok,Line3,REAs,Actions,St3} =
-  parse_rules(Xfile, Line2, Macs, St2);
- X 					% AD added clause
-  when false andalso			% when should be 2 indented
-  bengt ->
-  gurka();
- X when					% AD added clause
-  false andalso				% line should be 2 indented
-  not bengt ->
-  gurka();
- X ->
-  io:format(stdout, "Parsing file ~s, ",
-  [St0#leex.xfile]),
-  {ok,Line3,REAs,Actions,St3} =
-  parse_rules(Xfile, Line2, Macs, St2)
- catch
- exit:{badarg,R} ->
-    foo(R),
-    io:format(stdout,
-	      "ERROR reason ~p~n",
-	      R);
- error:R ->
-    foo(R),
-    io:format(stdout,
-	      "ERROR reason ~p~n",
-	      R)
- after
- foo('after'),
-  file:close(Xfile),
-  bar(with_long_arg,
-       with_second_arg)
- end;
- indent_try_catch() ->
- try foo()
- after
-  foo(),
-  bar(with_long_arg,
-      with_second_arg)
- end.
-
-indent_catch() ->
-  D = B +
-  float(43.1),
-
-  B = catch oskar(X),
-
-  A = catch (baz +
-      bax),
- catch foo(),
-
-  C = catch B +
-     float(43.1),
-
-  case catch foo(X) of
-  A ->
- B
- end,
-
- case
-  catch foo(X)
- of
- A ->
-   B
-  end,
-
-  case
-  foo(X)
-   of
- A ->
-	  catch B,
-	  X
-   end,
-
- try sune of
- _ -> foo
-   catch _:_ -> baf
-   end,
-
-    try
-sune
-   of
- _ ->
-   X = 5,
-   (catch foo(X)),
-   X + 10
-   catch _:_ -> baf
-   end,
-
-   try
- (catch sune)
-   of
- _ ->
-   catch foo()  %% BUGBUG can't handle catch inside try without parentheses
-   catch _:_ ->
-    baf
-   end,
-
-   try
-(catch exit())
-   catch
-_ ->
-    catch baf()
-   end,
- ok.
-
-indent_binary() ->
-  X = lists:foldr(fun(M) ->
-    <<Ma/binary, " ">>
-    end, [], A),
-  A = <<X/binary, 0:8>>,
-  B.
-
-
-indent_comprehensions() ->
-%% I don't have a good idea how we want to handle this
-%% but they are here to show how they are indented today.
-Result1 = [X ||
-  #record{a=X} <- lists:seq(1, 10),
-  true = (X rem 2)
-     ],
-Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
-    true = (X rem 2)
-       ],
-
-Binary1 = << <<X:8>> ||
-  #record{a=X} <- lists:seq(1, 10),
-  true = (X rem 2)
-      >>,
-
-Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
-  true = (X rem 2)
-      >>,
-ok.
-
-%% This causes an error in earlier erlang-mode versions.
-foo() ->
-[#foo{
-foo = foo}].
-
-%% Record indentation
-some_function_with_a_very_long_name() ->
- #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b},
- case dummy_function_with_a_very_very_long_name(x) of
- #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b} ->
- ok;
- Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b} ->
- Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b};
- #xyz{
- a=1,
- b=2} ->
- ok
- end.
-
-another_function_with_a_very_very_long_name() ->
- #rec{
- field1=1,
- field2=1}.
-
-some_function_name_xyz(xyzzy, #some_record{
- field1=Field1,
- field2=Field2}) ->
- SomeVariable = f(#'Some-long-record-name'{
- field_a = 1,
- 'inter-xyz-parameters' =
- #'Some-other-very-long-record-name'{
- field2 = Field1,
- field2 = Field2}}),
- {ok, SomeVariable}.
-
-commas_first() ->
- {abc, [ {some_var, 1}
-        , {some_other_var, 2}
-        , {erlang_ftw, 9}
-        , {erlang_cookie, 'cookie'}
-        , {cmds,
-            [ {one,   "sudo ls"}
-              , {one,   "sudo ls"}
-              , {two,   "sudo ls"}
-              , {three, "sudo ls"}
-              , {four,  "sudo ls"}
-              , {three, "sudo ls"}
-            ] }
-        , {ssh_username, "yow"}
-        , {cluster,
-            [ {aaaa, [ {"10.198.55.12" , "" }
-                     , {"10.198.55.13" , "" }
-                     ] }
-            , {bbbb, [ {"10.198.55.151", "" }
-                     , {"10.198.55.123", "" }
-                     , {"10.198.55.34" , "" }
-                     , {"10.198.55.85" , "" }
-                     , {"10.198.55.67" , "" }
-                     ] }
-            , {cccc, [ {"10.198.55.68" , "" }
-                     , {"10.198.55.69" , "" }
-                     ] }
-            ] }
-]
-}.
-
-
-%% this used to result in a scan-sexp error
-[{
-}].
-
-%% this used to result in 2x the correct indentation within the function
-%% body, due to the function name being mistaken for a keyword
-catcher(N) ->
-try generate_exception(N) of
-Val -> {N, normal, Val}
-catch
-throw:X -> {N, caught, thrown, X};
-exit:X -> {N, caught, exited, X};
-error:X -> {N, caught, error, X}
-end.
diff --git a/lib/tools/test/emacs_SUITE.erl b/lib/tools/test/emacs_SUITE.erl
index 77a8813db5..f4e78da667 100644
--- a/lib/tools/test/emacs_SUITE.erl
+++ b/lib/tools/test/emacs_SUITE.erl
@@ -23,10 +23,10 @@
 
 -export([all/0, init_per_testcase/2, end_per_testcase/2]).
 
--export([bif_highlight/1]).
+-export([bif_highlight/1, indent/1]).
 
-all() -> 
-    [bif_highlight].
+all() ->
+    [bif_highlight, indent].
 
 init_per_testcase(_Case, Config) ->
     ErlangEl = filename:join([code:lib_dir(tools),"emacs","erlang.el"]),
@@ -74,4 +74,69 @@ check_bif_highlight(Bin, Tag, Compare) ->
     [] = Compare -- EmacsIntBifs,
     [] = EmacsIntBifs -- Compare.
     
-    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+indent(Config) ->
+    case emacs_version_ok() of
+        false -> {skip, "Old or no emacs found"};
+        true ->
+            Def = filename:dirname(code:which(?MODULE)) ++ "/" ++ ?MODULE_STRING ++ "_data",
+            Dir = proplists:get_value(data_dir, Config, Def),
+            OrigFs = filelib:wildcard(Dir ++ "/*"),
+            io:format("Dir: ~s~nFs: ~p~n", [Dir, OrigFs]),
+            Fs = [{File, unindent(File)} || File <- OrigFs,
+                                            filename:extension(File) =:= ""],
+            Indent = fun emacs/1,
+            [Indent(File) || {_, File} <- Fs],
+            Res = [diff(Orig, File) || {Orig, File} <- Fs],
+            [file:delete(File) || {ok, File} <- Res],       %% Cleanup
+            [] = [Fail || {fail, Fail} <- Res],
+            ok
+    end.
+
+unindent(Input) ->
+    Output = Input ++ ".erl",
+    {ok, Bin} = file:read_file(Input),
+    Lines0 = string:split(Bin, "\n", all),
+    Lines = [string:trim(Line, leading, [$\s,$\t]) || Line <- Lines0],
+    %% io:format("File: ~s lines: ~w~n", [Input, length(Lines0)]),
+    %% [io:format("~s~n", [L]) || L <- Lines],
+    ok = file:write_file(Output, lists:join("\n", Lines)),
+    Output.
+
+diff(Orig, File) ->
+    case os:cmd(["diff ", Orig, " ", File]) of
+        "" -> {ok, File};
+        Diff ->
+            io:format("Fail: ~s vs ~s~n~s~n~n",[Orig, File, Diff]),
+            {fail, File}
+    end.
+
+emacs_version_ok() ->
+    case os:cmd("emacs --version | head -1") of
+        "GNU Emacs " ++ Ver ->
+            case string:to_float(Ver) of
+                {Vsn, _} when Vsn >= 24.1 ->
+                    true;
+                _ ->
+                    io:format("Emacs version fail~n~s~n~n",[Ver]),
+                    false
+            end;
+        Res ->
+            io:format("Emacs version fail~n~s~n~n",[Res]),
+            false
+    end.
+
+emacs(File) ->
+    EmacsErlDir = filename:join([code:lib_dir(tools), "emacs"]),
+    Cmd = ["emacs ",
+           "--batch --quick ",
+           "--directory ", EmacsErlDir, " ",
+           "--eval \"(require 'erlang-start)\" ",
+           File, " ",
+           "--eval '(indent-region (point-min) (point-max) nil)' ",
+           "--eval '(save-buffer 0)'"
+          ],
+    _Res = os:cmd(Cmd),
+    % io:format("cmd ~s:~n=> ~s~n", [Cmd, _Res]),
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/comments b/lib/tools/test/emacs_SUITE_data/comments
new file mode 100644
index 0000000000..ff974ca295
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/comments
@@ -0,0 +1,25 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% 3 comment chars: always left indented
+%%% 2 comment chars: Context indented
+%%% 1 comment char: Rigth indented
+
+%%% left
+%% context dependent
+                                                % rigth
+
+func() ->
+%%% left
+    %% context dependent
+                                                % right indented
+    case get(foo) of
+        undefined ->
+            %% Testing indention
+            ok;
+        %% Catch all
+        Other ->
+            Other
+    end,
+    ok.
+
diff --git a/lib/tools/test/emacs_SUITE_data/comprehensions b/lib/tools/test/emacs_SUITE_data/comprehensions
new file mode 100644
index 0000000000..45279850a5
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/comprehensions
@@ -0,0 +1,47 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of comprehensions
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+list() ->
+    %% I don't have a good idea how we want to handle this
+    %% but they are here to show how they are indented today.
+    Result1 = [X ||
+                  #record{a=X} <- lists:seq(1, 10),
+                  true = (X rem 2)
+              ],
+    Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
+                    true = (X rem 2)
+              ],
+    Res = [ func(X,
+                 arg2)
+            ||
+              #record{a=X} <- lists:seq(1, 10),
+              true = (X rem 2)
+          ],
+    Result1.
+
+binary(B) ->
+    Binary1 = << <<X:8>> ||
+                  #record{a=X} <- lists:seq(1, 10),
+                  true = (X rem 2)
+              >>,
+
+    Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
+                            true = (X rem 2)
+              >>,
+
+    Bin3 = <<
+             <<
+               X:8,
+               34:8
+             >>
+             || <<X:32,_:32>> <= <<0:512>>,
+                true = (X rem 2)
+           >>,
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/funcs b/lib/tools/test/emacs_SUITE_data/funcs
new file mode 100644
index 0000000000..877f982005
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/funcs
@@ -0,0 +1,174 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Function (and funs) indentation
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+-export([
+         func1/0,
+         func2/0,
+         a_function_with_a_very_very_long_name/0,
+         when1/2
+        ]).
+
+-compile([nowarn_unused_functions,
+          {inline, [
+                    func2/2,
+                    func3/2
+                   ]
+          }
+         ]).
+
+func1() ->
+    basic.
+
+func2(A1,
+      A2) ->
+    ok.
+
+func3(
+  A1,
+  A2
+ ) ->
+    ok.
+
+%% Okeefe style
+func4(A1
+     ,A2
+     ,A3
+     ) ->
+    ok.
+
+func5(
+  A41
+ ,A42) ->
+    ok.
+
+a_function_with_a_very_very_long_name() ->
+    A00 = #record{
+             field1=1,
+             field2=1
+            },
+    A00.
+
+when1(W1, W2)
+  when is_number(W1),
+       is_number(W2) ->
+    ok.
+
+when2(W1,W2,W3) when
+      W1 > W2,
+      W2 > W3 ->
+    ok.
+
+when3(W1,W2,W3) when
+      W1 > W2,
+      W2 > W3
+      ->
+    ok.
+
+when4(W1,W2,W3)
+  when
+      W1 > W2,
+      W2 > W3 ->
+    ok.
+
+match1({[H|T],
+        Other},
+       M1A2) ->
+    ok.
+
+match2(
+  {
+   [H|T],
+   Other
+  },
+  M2A2
+ ) ->
+    ok.
+
+match3({
+        M3A1,
+        [
+         H |
+         T
+        ],
+        Other
+       },
+       M3A2
+      ) ->
+    ok.
+
+match4(<<
+         M4A:8,
+         M4B:16/unsigned-integer,
+         _/binary
+       >>,
+       M4C) ->
+    ok.
+
+match5(M5A,
+       #record{
+          b=M5B,
+          c=M5C
+         }
+      ) ->
+    ok.
+
+match6(M6A,
+       #{key6a := a6,
+         key6b := b6
+        }) ->
+    ok.
+
+funs(1)
+  when
+      X ->
+    %% Changed fun to one indention level
+    %% 'when' and several clause forces a depth of '4'
+    Var = spawn(fun(X, _)
+                      when X == 2;
+                           X > 10 ->
+                        hello,
+                        case Hello() of
+                            true when is_atom(X) ->
+                                foo;
+                            false ->
+                                bar
+                        end;
+                   (Foo) when is_atom(Foo),
+                              is_integer(X) ->
+                        X = 6 * 45,
+                        Y = true andalso
+                            kalle
+                end),
+    Var;
+funs(2) ->
+    %% check EEP37 named funs
+    Fn1 = fun
+              Factory(N) when
+                    N > 0 ->
+                  F = Fact(N-1),
+                  N * F;
+              Factory(0) ->
+                  1
+          end,
+    Fn1;
+funs(3) ->
+    %% check anonymous funs too
+    Fn2 = fun(0) ->
+                  1;
+             (N) ->
+                  N
+          end,
+    ok;
+funs(4) ->
+    X = lists:foldr(fun(M) ->
+                            <<M/binary, " ">>
+                    end, [], Z),
+    A = <<X/binary, 0:8>>,
+    A.
diff --git a/lib/tools/test/emacs_SUITE_data/highlight b/lib/tools/test/emacs_SUITE_data/highlight
new file mode 100644
index 0000000000..0719f6516a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/highlight
@@ -0,0 +1,78 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Open this file in your editor and manually check the colors of
+%%% different types and calls and builtin words
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+
+highlighting(X)			  % Function definitions should be highlighted
+  when is_integer(X) ->	          % and so should `when' and `is_integer' be
+    %% Highlighting
+    %% Various characters (we keep an `atom' after to see that highlighting ends)
+    $a,atom,			  % Characters should be marked
+    "string",atom,		  % and strings
+    'asdasd',atom,		  % quote should be atoms??
+    'VaV',atom,
+    'aVa',atom,
+    '\'atom',atom,
+    'atom\'',atom,
+    'at\'om',atom,
+    '#1',atom,
+
+    $", atom,					% atom should be ok
+    $', atom,
+
+    "string$", atom,  "string$", atom,  		% currently buggy I know...
+    "string\$", atom,   				% workaround for bug above
+
+    "char $in string", atom,
+
+    'atom$', atom,  'atom$', atom,
+    'atom\$', atom,
+
+    'char $in atom', atom,
+
+    $[, ${, $\\, atom,
+    ?MACRO_1,
+    ?MACRO_2(foo),
+
+    %% Numerical constants
+    16#DD,					% Should not be highlighted
+    32#dd,					% Should not be highlighted
+    32#ddAB,				        % Should not be highlighted
+    32#101,				        % Should not be highlighted
+    32#ABTR,				        % Should not be highlighted
+
+    %% Variables
+    Variables = lists:foo(),
+    _Variables = lists:foo(),
+    AppSpec = Xyz/2,
+    Module42 = Xyz(foo, bar),
+    Module:foo(),
+    _Module:foo(),				%
+    FooÅÅ = lists:reverse([tl,hd,tl,hd]),	%  Should highlight FooÅÅ
+    _FooÅÅ = 42,				%  Should highlight _FooÅÅ
+
+    %% Bifs
+    erlang:registered(),
+    registered(),
+    hd(tl(tl(hd([a,b,c])))),
+    erlang:anything(lists),
+    %% Guards
+    is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
+    is_function(Fun), is_pid(self()),
+    not_a_guard:is_list([]),
+    %% Other Types
+
+    atom,			  % not (currently) hightlighted
+    234234,
+    234.43,
+
+    [list, are, not, higlighted],
+    {nor, is, tuple},
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/icr b/lib/tools/test/emacs_SUITE_data/icr
new file mode 100644
index 0000000000..8445c1a74d
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/icr
@@ -0,0 +1,157 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of if case receive statements
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+indent_if(1, Z) ->
+    %% If
+    if Z >= 0 ->
+            X = 43 div Z,
+            X;
+       Z =< 10 ->
+            X = 43 div Z,
+            X;
+       Z == 5 orelse
+       Z == 7 ->
+            X = 43 div Z,
+            X;
+       is_number(Z),
+       Z < 32 ->
+            Z;
+       is_number(Z);
+       Z < 32 ->
+            Z * 32;
+       true ->
+            if_works
+    end;
+indent_if(2, Z) ->
+    %% If
+    if
+        Z >= 0 ->
+            X = 43 div Z,
+            X
+      ; Z =< 10 ->
+            43 div Z
+      ; Z == 5 orelse
+        Z == 7 ->
+            X = 43 div Z,
+            X
+      ; is_number(Z),
+        Z < 32 ->
+            Z
+      ; true ->
+            if_works
+    end.
+
+indent_case(1, Z) ->
+    %% Case
+    case {Z, foo, bar} of
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X);
+        {Z,_,_}	when
+              Z =:= 42 ->                       % line should be indented as a when
+            X = 43 div 4,
+            foo(X);
+        {Z,_,_}
+          when   Z < 10 orelse
+                 Z =:= foo ->			% Binary op alignment here !!!
+            X = 43 div 4,
+            Bool = Z < 5 orelse                 % Binary op args align differently after when
+                Z =:= foo,                      % and elsewhere ???
+            foo(X);
+        {Z,_,_}
+          when					% when should be indented
+              Z < 10				% and the guards should follow when
+              andalso				% unsure about how though
+              true ->
+            X = 43 div 4,
+            foo(X)
+    end;
+indent_case(2, Z) ->
+    %% Case
+    case {Z, foo, bar} of
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}	when
+              Z =:= 42 ->                       % line should be indented as a when
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}
+          when Z < 10 ->			% when should be indented
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}
+          when					% when should be indented
+              Z < 10				% and the guards should follow when
+              andalso				% unsure about how though
+              true ->
+            X = 43 div 4,
+            foo(X)
+    end.
+
+indent_begin(Z) ->
+    %% Begin
+    begin
+        sune,
+        Z = 74234 +
+            foo(8456) +
+            345 div 43,
+        Foo = begin
+                  ok,
+                  foo(234),
+                  begin
+                      io:format("Down here\n")
+                  end
+              end,
+        {Foo,
+         bar}
+    end.
+
+indent_receive(1) ->
+    %% receive
+    receive
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X)
+      ; Z ->
+            X = 43 div 4,
+            foo(X)
+    end,
+    ok;
+indent_receive(2) ->
+    receive
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X);
+        Z 					% added clause
+          when Z =:= 1 ->			% This line should be indented by 2
+            X = 43 div 4,
+            foo(X);
+        Z when					% added clause
+              Z =:= 2 ->			% This line should be indented by 2
+            X = 43 div 4,
+            foo(X);
+        Z ->
+            X = 43 div 4,
+            foo(X)
+    after infinity ->
+            foo(X),
+            asd(X),
+            5*43
+    end,
+    ok;
+indent_receive() ->
+    receive
+    after 10 ->
+            foo(X),
+            asd(X),
+            5*43
+    end,
+    ok.
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().
diff --git a/lib/tools/test/emacs_SUITE_data/records b/lib/tools/test/emacs_SUITE_data/records
new file mode 100644
index 0000000000..241582718c
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/records
@@ -0,0 +1,35 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%% Test that records are indented correctly
+
+-record(record0,
+        {
+         r0a,
+         r0b,
+         r0c
+        }).
+
+-record(record1, {r1a,
+                  r1b,
+                  r1c
+                 }).
+
+-record(record2, {
+                  r2a,
+                  r2b
+                 }).
+
+-record(record3, {r3a = 8#42423 bor
+                      8#4234,
+                  r3b = 8#5432
+                      bor 2#1010101,
+                  r3c = 123 +
+                      234,
+                  r3d}).
+
+-record(record5,
+        { r5a = 1 :: integer()
+        , r5b = foobar :: atom()
+        }).
+
diff --git a/lib/tools/test/emacs_SUITE_data/terms b/lib/tools/test/emacs_SUITE_data/terms
new file mode 100644
index 0000000000..352364a73c
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/terms
@@ -0,0 +1,174 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of terms contain builtin types
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+
+list(1) ->
+    [a,
+     b,
+     c
+    ];
+list(2) ->
+    [ a,
+      b, c
+    ];
+list(3) ->
+    [
+     a,
+     b, c
+    ];
+list(4) ->
+    [ a
+    , b
+    , c
+    ].
+
+tuple(1) ->
+    {a,
+     b,c
+    };
+tuple(2) ->
+    { a,
+      b,c
+    };
+tuple(3) ->
+    {
+     a,
+     b,c
+    };
+tuple(4) ->
+    { a
+    , b
+    ,c
+    }.
+
+binary(1) ->
+    <<1:8,
+      2:8
+    >>;
+binary(2) ->
+    <<
+      1:8,
+      2:8
+    >>;
+binary(3) ->
+    << 1:8,
+       2:8
+    >>;
+binary(4) ->
+    <<
+      1:8
+     ,2:8
+    >>;
+binary(5) ->
+    << 1:8
+     , 2:8
+    >>.
+
+record(1) ->
+    #record{a=1,
+            b=2
+           };
+record(2) ->
+    #record{ a=1,
+             b=2
+           };
+record(3) ->
+    #record{
+       a=1,
+       b=2
+      };
+record(4) ->
+    #record{
+       a=1
+      ,b=2
+      };
+record(Record) ->
+    Record#record{
+      a=1
+     ,b=2
+     }.
+
+map(1) ->
+    #{a=>1,
+      b=>2
+     };
+map(2) ->
+    #{ a=>1,
+       b=>2
+     };
+map(3) ->
+    #{
+      a=>1,
+      b=>2
+     };
+map(4) ->
+    #{
+      a => <<"a">>
+     ,b => 2
+     };
+map(MapVar) ->
+    MapVar = #{a :=<<"a">>
+              ,b:=1}.
+
+deep(Rec) ->
+    Rec#rec{ atom = 'atom',
+             map = #{ k1 => {v,
+                             1},
+                      k2 => [
+                             1,
+                             2,
+                             3
+                            ],
+                      {key,
+                       3}
+                      =>
+                          <<
+                            123:8,
+                            255:8
+                          >>
+                    }
+           }.
+
+%% Record indentation
+some_function_with_a_very_long_name() ->
+    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+       field1=a,
+       field2=b},
+    case dummy_function_with_a_very_very_long_name(x) of
+        #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+           field1=a,
+           field2=b} ->
+            ok;
+        Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+                 field1=a,
+                 field2=b} ->
+            Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+              field1=a,
+              field2=b};
+        #xyz{
+           a=1,
+           b=2} ->
+            ok
+    end.
+
+some_function_name_xyz(xyzzy, #some_record{
+                                 field1=Field1,
+                                 field2=Field2}) ->
+    SomeVariable = f(#'Some-long-record-name'{
+                        field_a = 1,
+                        'inter-xyz-parameters' =
+                            #'Some-other-very-long-record-name'{
+                               field2 = Field1,
+                               field2 = Field2}}),
+    {ok, SomeVariable}.
+
+foo() ->
+    [#foo{
+        foo = foo}].
diff --git a/lib/tools/test/emacs_SUITE_data/try_catch b/lib/tools/test/emacs_SUITE_data/try_catch
new file mode 100644
index 0000000000..0005b2003a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/try_catch
@@ -0,0 +1,166 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Try and catch indentation is hard
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+try_catch() ->
+    try
+        io:format(stdout, "Parsing file ~s, ",
+                  [St0#leex.xfile]),
+        {ok,Line3,REAs,Actions,St3} =
+            parse_rules(Xfile, Line2, Macs, St2)
+    catch
+        exit:{badarg,R} ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R);
+        error:R
+          when R =:= 42 ->			% when should be indented
+            foo(R);
+        error:R
+          when					% when should be indented
+              R =:= 42 ->			% but unsure about this (maybe 2 more)
+            foo(R);
+        error:R when
+              R =:= foo ->			% line should be 2 indented (works)
+            foo(R);
+        error:R ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R)
+    after
+        foo('after'),
+        file:close(Xfile)
+    end;
+try_catch() ->
+    try
+        foo(bar)
+    of
+        X when true andalso
+               kalle ->
+            io:format(stdout, "Parsing file ~s, ",
+                      [St0#leex.xfile]),
+            {ok,Line3,REAs,Actions,St3} =
+                parse_rules(Xfile, Line2, Macs, St2);
+        X
+          when false andalso			% when should be 2 indented
+               bengt ->
+            gurka();
+        X when
+              false andalso			% line should be 2 indented
+              not bengt ->
+            gurka();
+        X ->
+            io:format(stdout, "Parsing file ~s, ",
+                      [St0#leex.xfile]),
+            {ok,Line3,REAs,Actions,St3} =
+                parse_rules(Xfile, Line2, Macs, St2)
+    catch
+        exit:{badarg,R} ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R);
+        error:R ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R)
+    after
+        foo('after'),
+        file:close(Xfile),
+        bar(with_long_arg,
+            with_second_arg)
+    end;
+try_catch() ->
+    try foo()
+    after
+        foo(),
+        bar(with_long_arg,
+            with_second_arg)
+    end.
+
+indent_catch() ->
+    D = B +
+        float(43.1),
+
+    B = catch oskar(X),
+
+    A = catch (baz +
+                   bax),
+    catch foo(),
+
+    C = catch B +
+        float(43.1),
+
+    case catch foo(X) of
+        A ->
+            B
+    end,
+
+    case
+        catch foo(X)
+    of
+        A ->
+            B
+    end,
+
+    case
+        foo(X)
+    of
+        A ->
+            catch B,
+            X
+    end,
+
+    try sune of
+        _ -> foo
+    catch _:_ -> baf
+    end,
+
+    Variable = try
+                   sune
+               of
+                   _ ->
+                       X = 5,
+                       (catch foo(X)),
+                       X + 10
+               catch _:_ -> baf
+               after cleanup()
+               end,
+
+    try
+        (catch sune)
+    of
+        _ ->
+            foo1(),
+    catch foo()  %% BUGBUG can't handle catch inside try without parentheses
+    catch _:_ ->
+            baf
+    end,
+
+    try
+        (catch exit())
+    catch
+        _ ->
+            catch baf()
+    end,
+    ok.
+
+%% this used to result in 2x the correct indentation within the function
+%% body, due to the function name being mistaken for a keyword
+catcher(N) ->
+    try generate_exception(N) of
+        Val -> {N, normal, Val}
+    catch
+        throw:X -> {N, caught, thrown, X};
+        exit:X -> {N, caught, exited, X};
+        error:X -> {N, caught, error, X}
+    end.
diff --git a/lib/tools/test/emacs_SUITE_data/type_specs b/lib/tools/test/emacs_SUITE_data/type_specs
new file mode 100644
index 0000000000..e71841cc7a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/type_specs
@@ -0,0 +1,110 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%% Tests how types and specs are indented (also that the editor can parse them)
+%% May need improvements
+
+
+-type ann() :: Var :: integer().
+-type ann2() ::
+        'return'
+      | 'return_white_spaces'
+      | 'return_comments'
+      | 'text' | ann().
+-type paren() ::
+        (ann2()).
+
+-type t6() ::
+        1 | 2 | 3 |
+        'foo'
+      | 'bar'.
+
+-type t8() :: {any(),none(),pid(),port(),
+               reference(),float()}.
+
+-type t14() :: [erl_scan:foo() |
+                %% Should be highlighted
+                term() |
+                boolean() |
+                byte() |
+                char() |
+                non_neg_integer() | nonempty_list() |
+                pos_integer() |
+                neg_integer() |
+                number() |
+                list() |
+                nonempty_improper_list() | nonempty_maybe_improper_list() |
+                maybe_improper_list() | string() | iolist() | byte() |
+                module() |
+                mfa()   |
+                node()  |
+                timeout() |
+                no_return() |
+                %% Should not be highlighted
+                nonempty_() | nonlist() |
+                erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
+
+-type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
+                <<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
+                                        <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
+                                        <<_:34>>|<<_:34>>|<<_:34>>].
+
+-type t18() ::
+        fun(() -> t17() | t16()).
+-type t19() ::
+        fun((t18()) -> t16()) |
+        fun((nonempty_maybe_improper_list('integer', any())|
+             1|2|3|a|b|<<_:3,_:_*14>>|integer())
+            ->
+                   nonempty_maybe_improper_list('integer', any())|   %% left to col 16?
+                   1|2|3|a|b|<<_:3,_:_*14>>|integer()).              %% left to col 16?
+-type t20() :: [t19(), ...].
+-type t25() :: #rec3{f123 :: [t24() |
+                              1|2|3|4|a|b|c|d|
+                              nonempty_maybe_improper_list(integer, any())]}.
+-type t26() :: #rec4{ a :: integer()
+                    , b :: any()
+                    }.
+
+%% Spec
+
+-spec t1(FooBar :: t99()) -> t99();
+        (t2()) -> t2();
+        (t4()) -> t4() when is_subtype(t4(), t24);
+        (t23()) -> t23() when is_subtype(t23(), atom()),
+                              is_subtype(t23(), t14());
+        (t24()) -> t24() when is_subtype(t24(), atom()),
+                              is_subtype(t24(), t14()),
+                              is_subtype(t24(), t4()).
+
+-spec over(I :: integer()) -> R1 :: foo:typen();
+          (A :: atom()) -> R2 :: foo:atomen();
+          (T :: tuple()) -> R3 :: bar:typen().
+
+-spec mod:t2() -> any().
+
+-spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
+                        | {'del_member', name(), pid()},
+                  #state{}) -> {'noreply', #state{}}.
+
+-spec handle_cast(Cast ::
+                    {'exchange', node(), [[name(),...]]}
+                  | {'del_member', name(), pid()},
+                  #state{}) ->
+                         {'noreply', #state{}}. %% left to col 10?
+
+-spec all(fun((T) -> boolean()), List :: [T]) ->
+                 boolean() when is_subtype(T, term()). % (*)
+
+-spec get_closest_pid(term()) ->
+                             Return :: pid()  %% left to col 10?
+                                     | {'error', {'no_process', term()}} %% left to col 10?
+                                     | {'no_such_group', term()}. %% left to col 10?
+
+-spec add( X :: integer()
+         , Y :: integer()
+         ) -> integer().
+
+-opaque attributes_data() ::
+          [{'column', column()} | {'line', info_line()} |
+           {'text', string()}] |  {line(),column()}.