Merge branch 'maint'

* maint:
  Improve the nice 'badarith' message displayed by the shell

3 files changed, 10 insertions, 10 deletions

diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index 314fd60903..cf4b87d7eb 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -209,7 +209,7 @@ explain_reason(badarg, error, [], _PF, _S) ->
 explain_reason({badarg,V}, error=Cl, [], PF, S) -> % orelse, andalso
     format_value(V, <<"bad argument: ">>, Cl, PF, S);
 explain_reason(badarith, error, [], _PF, _S) ->
-    <<"bad argument in an arithmetic expression">>;
+    <<"an error occurred when evaluating an arithmetic expression">>;
 explain_reason({badarity,{Fun,As}}, error, [], _PF, _S) 
                                       when is_function(Fun) ->
     %% Only the arity is displayed, not the arguments As.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 5be14767fa..4b83e42ee0 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -153,7 +153,7 @@ start_restricted_from_shell(Config) when is_list(Config) ->
 	comm_err(<<"begin init:stop() end.">>),
     ?line "exception exit: restricted shell does not allow init:stop()" = 
 	comm_err(<<"begin F = fun() -> init:stop() end, F() end.">>),
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
 	comm_err(<<"begin +a end.">>),
     ?line "exception exit: restricted shell does not allow a + b" = 
 	comm_err(<<"begin a+b end.">>),
@@ -2359,7 +2359,7 @@ otp_6554(Config) when is_list(Config) ->
         comm_err(<<"fun(X) -> not X end(a).">>),
     ?line "exception error: bad argument: a" = 
         comm_err(<<"fun(A, B) -> A orelse B end(a, b).">>),
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"math:sqrt(2)/round(math:sqrt(0)).">>),
     ?line "exception error: interpreted function with arity 1 called with no arguments" = 
         comm_err(<<"fun(V) -> V end().">>),
@@ -2478,9 +2478,9 @@ otp_6554(Config) when is_list(Config) ->
                      "  receive {'EXIT', Pid, {{nocatch,foo},_}} -> ok end "
                      "end.">>),
 
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"begin catch_exception(true), 1/0 end.">>),
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"begin catch_exception(false), 1/0 end.">>),
     ?line "exception error: no function clause matching call to catch_exception/1" = 
         comm_err(<<"catch_exception(1).">>),
@@ -2637,7 +2637,7 @@ otp_8393(Config) when is_list(Config) ->
         prompt_err(<<"shell:prompt_func('> ').">>),
 
     ?line _ = shell:prompt_func(default),
-    ?line "exception error: bad argument in an arithmetic expression"++_ =
+    ?line "exception error: an error occurred when evaluating an arithmetic expression"++_ =
         prompt_err(<<"shell:prompt_func({shell_SUITE,prompt4}).">>),
 
     ?line _ = shell:prompt_func(default),
@@ -2710,7 +2710,7 @@ prompt3(L) ->
     integer_to_list(N).
 
 prompt4(_L) ->
-    erlang:apply({erlang,'/'}, [1,0]).
+    erlang:apply(fun erlang:'/'/2, [1,0]).
 
 prompt5(_L) ->
     [1050,1072,1082,1074,1086,32,1077,32,85,110,105,99,111,100,101,32,63].
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index 5fca7225bb..d564b20ca6 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -685,7 +685,7 @@ Expr1 <input>op</input> Expr2</pre>
 8> <input>2#10 bor 2#01.</input>
 3
 9> <input>a + 10.</input>
-** exception error: bad argument in an arithmetic expression
+** exception error: an error occurred when evaluating an arithmetic expression
      in operator  +/2
         called as a + 10
 10> <input>1 bsl (1 bsl 64).</input>