2 files changed, 50 insertions, 15 deletions

diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl
index 31a653bda0..d5ab294fb8 100644
--- a/lib/stdlib/src/edlin.erl
+++ b/lib/stdlib/src/edlin.erl
@@ -281,12 +281,32 @@ do_op(_, Bef, Aft, Rs) ->
 %%  Step over word/non-word characters pushing the stepped over ones on
 %%  the stack.
 
-over_word([C|Cs], Stack, N) ->
+
+over_word(Cs, Stack, N) ->
+    L = length([1 || $\' <- Cs]),
+    case L rem 2 of
+	0 ->
+	    over_word1(Cs, Stack, N);
+	1 ->
+	    until_quote(Cs, Stack, N)
+    end.
+
+until_quote([$\'|Cs], Stack, N) ->
+    {Cs, [$\'|Stack], N+1};
+until_quote([C|Cs], Stack, N) ->
+    until_quote(Cs, [C|Stack], N+1).
+
+over_word1([$\'=C|Cs], Stack, N) ->
+    until_quote(Cs, [C|Stack], N+1);
+over_word1(Cs, Stack, N) ->
+    over_word2(Cs, Stack, N).
+
+over_word2([C|Cs], Stack, N) ->
     case word_char(C) of
-	true -> over_word(Cs, [C|Stack], N+1);
+	true -> over_word2(Cs, [C|Stack], N+1);
 	false -> {[C|Cs],Stack,N}
     end;
-over_word([], Stack, N) when is_integer(N) ->
+over_word2([], Stack, N) when is_integer(N) ->
     {[],Stack,N}.
 
 over_non_word([C|Cs], Stack, N) ->
diff --git a/lib/stdlib/src/edlin_expand.erl b/lib/stdlib/src/edlin_expand.erl
index 7ed76a6b09..a38e118e68 100644
--- a/lib/stdlib/src/edlin_expand.erl
+++ b/lib/stdlib/src/edlin_expand.erl
@@ -46,23 +46,38 @@ expand_module_name(Prefix) ->
     match(Prefix, code:all_loaded(), ":").
 
 expand_function_name(ModStr, FuncPrefix) ->
-    Mod = list_to_atom(ModStr),
-    case erlang:module_loaded(Mod) of
- 	true ->
-            L = Mod:module_info(),
- 	    case lists:keyfind(exports, 1, L) of
- 		{_, Exports} ->
- 		    match(FuncPrefix, Exports, "(");
- 		_ ->
- 		    {no, [], []}
- 	    end;
- 	false ->
+    case to_atom(ModStr) of
+	{ok, Mod} ->
+	    case erlang:module_loaded(Mod) of
+		true ->
+		    L = Mod:module_info(),
+		    case lists:keyfind(exports, 1, L) of
+			{_, Exports} ->
+			    match(FuncPrefix, Exports, "(");
+			_ ->
+			    {no, [], []}
+		    end;
+		false ->
+		    {no, [], []}
+	    end;
+	error ->
 	    {no, [], []}
     end.
 
+%% if it's a quoted atom, atom_to_list/1 will do the wrong thing.
+to_atom(Str) ->
+    case erl_scan:string(Str) of
+	{ok, [{atom,_,A}], _} ->
+	    {ok, A};
+	_ ->
+	    error
+    end.
+
 match(Prefix, Alts, Extra) ->
     Len = length(Prefix),
-    Matches = [{S, A} || {H, A} <- Alts, prefix(Prefix, S=atom_to_list(H))],
+    Matches = lists:sort(
+		[{S, A} || {H, A} <- Alts,
+			   prefix(Prefix, S=hd(io_lib:fwrite("~w",[H])))]),
     case longest_common_head([N || {N, _} <- Matches]) of
  	{partial, []} ->
  	    {no, [], Matches}; % format_matches(Matches)};