Merge branch 'fenollp/shell-expand-0arity-completely'

* fenollp/shell-expand-0arity-completely:
  Correct parenthesis expansion
  Clean up edlin_expand_SUITE.erl to facilitate maintainance

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/stdlib/src/edlin_expand.erl b/lib/stdlib/src/edlin_expand.erl
index 0033010dce..a2b4663219 100644
--- a/lib/stdlib/src/edlin_expand.erl
+++ b/lib/stdlib/src/edlin_expand.erl
@@ -73,7 +73,7 @@ to_atom(Str) ->
 	    error
     end.
 
-match(Prefix, Alts, Extra) ->
+match(Prefix, Alts, Extra0) ->
     Len = length(Prefix),
     Matches = lists:sort(
 		[{S, A} || {H, A} <- Alts,
@@ -89,13 +89,11 @@ match(Prefix, Alts, Extra) ->
  		    {yes, Remain, []}
  	    end;
  	{complete, Str} ->
-            {_, Arity} = lists:keyfind(Str, 1, Matches),
-            case {Arity, Extra} of
-                {0, "("} ->
-                    {yes, nthtail(Len, Str) ++ "()", []};
-                _ ->
-                    {yes, nthtail(Len, Str) ++ Extra, []}
-            end;
+	    Extra = case {Extra0,Matches} of
+			{"(",[{Str,0}]} -> "()";
+			{_,_} -> Extra0
+		    end,
+	    {yes, nthtail(Len, Str) ++ Extra, []};
  	no ->
  	    {no, [], []}
     end.