18 files changed, 226 insertions, 254 deletions
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 4876b37127..f8db48e00c 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -75,13 +75,13 @@
 
   <datatypes>
     <datatype>
-      <name name="t_datetime"/>
+      <name name="datetime"/>
     </datatype>
     <datatype>
-      <name name="t_datetime1970"/>
+      <name name="datetime1970"/>
     </datatype>
     <datatype>
-      <name name="t_date"/>
+      <name name="date"/>
     </datatype>
     <datatype>
       <name name="year"/>
@@ -100,7 +100,7 @@
       <name name="day"/>
     </datatype>
     <datatype>
-      <name name="t_time"/>
+      <name name="time"/>
     </datatype>
     <datatype>
       <name name="hour"/>
@@ -118,12 +118,7 @@
       <name name="ldom"/>
     </datatype>
     <datatype>
-      <name name="t_now"/>
-      <desc><p>See <seealso marker="erts:erlang#now/0">erlang:now/0</seealso>.</p>
-      </desc>
-    </datatype>
-    <datatype>
-      <name name="t_yearweeknum"/>
+      <name name="yearweeknum"/>
     </datatype>
     <datatype>
       <name name="weeknum"/>
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index d15383c621..4900a8f0ef 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -438,7 +438,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
       <fsummary>Initialize process and internal state name and state data.</fsummary>
       <type>
         <v>Args = term()</v>
-        <v>Return = {ok,StateName,StateData} | {ok,StateName,StateData,Timeout}</v>
+        <v>Result = {ok,StateName,StateData} | {ok,StateName,StateData,Timeout}</v>
 	<v>&nbsp;&nbsp;| {ok,StateName,StateData,hibernate}</v>
         <v>&nbsp;&nbsp;| {stop,Reason} | ignore</v>
         <v>&nbsp;StateName = atom()</v>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index af9c75d546..667d758e29 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -439,7 +439,7 @@ ok</pre>
           <item>
             <p>Prints the argument with the <c>string</c> syntax. The
               argument is, if no Unicode translation modifier is present, an 
-	      <seealso marker="erts:erlang#iolist_definition">I/O list</seealso>, a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
+              iolist(), a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
               are printed without quotes. The string is first truncated
 	      by the given precision and then padded and justified
 	      to the given field width. The default precision is the field width.</p>
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index 416df1f02c..b48ad8c1f3 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -52,7 +52,7 @@
 <tag>UCS-4</tag>
 <item>Basically the same as UTF-32, but without some Unicode semantics, defined by IEEE and has little use as a separate encoding standard. For all normal (and possibly abnormal) usages, UTF-32 and UCS-4 are interchangeable.</item>
 </taglist>
-<p>Certain ranges of characters are left unused and certain ranges are even deemed invalid. The most notable invalid range is 16#D800 - 16#DFFF, as the UTF-16 encoding does not allow for encoding of these numbers. It can be speculated that the UTF-16 encoding standard was, from the beginning, expected to be able to hold all Unicode characters in one 16-bit entity, but then had to be extended, leaving a whole in the Unicode range to cope with backward compatibility.</p>
+<p>Certain ranges of characters are left unused and certain ranges are even deemed invalid. The most notable invalid range is 16#D800 - 16#DFFF, as the UTF-16 encoding does not allow for encoding of these numbers. It can be speculated that the UTF-16 encoding standard was, from the beginning, expected to be able to hold all Unicode characters in one 16-bit entity, but then had to be extended, leaving a hole in the Unicode range to cope with backward compatibility.</p>
 <p>Additionally, the codepoint 16#FEFF is used for byte order marks (BOM's) and use of that character is not encouraged in other contexts than that. It actually is valid though, as the character "ZWNBS" (Zero Width Non Breaking Space). BOM's are used to identify encodings and byte order for programs where such parameters are not known in advance. Byte order marks are more seldom used than one could expect, put their use is becoming more widely spread as they provide the means for programs to make educated guesses about the Unicode format of a certain file.</p>
 </section>
 <section>
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index 8d1071209e..0320e0cd0e 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -63,7 +63,7 @@
 %% Types
 %%----------------------------------------------------------------------
 
--export_type([t_now/0]).
+-export_type([date/0, time/0, datetime/0, datetime1970/0]).
 
 -type year()     :: non_neg_integer().
 -type year1970() :: 1970..10000.	% should probably be 1970..
@@ -76,15 +76,11 @@
 -type ldom()     :: 28 | 29 | 30 | 31. % last day of month
 -type weeknum()  :: 1..53.
 
--type t_now()    :: {MegaSecs :: non_neg_integer(),
-                     Secs :: non_neg_integer(),
-                     MicroSecs :: non_neg_integer()}.
-
--type t_date()         :: {year(),month(),day()}.
--type t_time()         :: {hour(),minute(),second()}.
--type t_datetime()     :: {t_date(),t_time()}.
--type t_datetime1970() :: {{year1970(),month(),day()},t_time()}.
--type t_yearweeknum()  :: {year(),weeknum()}.
+-type date()           :: {year(),month(),day()}.
+-type time()           :: {hour(),minute(),second()}.
+-type datetime()       :: {date(),time()}.
+-type datetime1970()   :: {{year1970(),month(),day()},time()}.
+-type yearweeknum()    :: {year(),weeknum()}.
 
 %%----------------------------------------------------------------------
 
@@ -123,7 +119,7 @@ date_to_gregorian_days(Year, Month, Day) when is_integer(Day), Day > 0 ->
     end.
 
 -spec date_to_gregorian_days(Date) -> Days when
-      Date :: t_date(),
+      Date :: date(),
       Days :: non_neg_integer().
 date_to_gregorian_days({Year, Month, Day}) ->
     date_to_gregorian_days(Year, Month, Day).
@@ -135,7 +131,7 @@ date_to_gregorian_days({Year, Month, Day}) ->
 %% January 1st.
 %%
 -spec datetime_to_gregorian_seconds(DateTime) -> Seconds when
-      DateTime :: t_datetime(),
+      DateTime :: datetime(),
       Seconds :: non_neg_integer().
 datetime_to_gregorian_seconds({Date, Time}) ->
     ?SECONDS_PER_DAY*date_to_gregorian_days(Date) +
@@ -155,14 +151,14 @@ day_of_the_week(Year, Month, Day) ->
     (date_to_gregorian_days(Year, Month, Day) + 5) rem 7 + 1.
 
 -spec day_of_the_week(Date) -> daynum() when
-      Date:: t_date().
+      Date:: date().
 day_of_the_week({Year, Month, Day}) ->
     day_of_the_week(Year, Month, Day).
 
 
 %% gregorian_days_to_date(Days) = {Year, Month, Day}
 %%
--spec gregorian_days_to_date(Days) -> t_date() when
+-spec gregorian_days_to_date(Days) -> date() when
       Days :: non_neg_integer().
 gregorian_days_to_date(Days) ->
     {Year, DayOfYear} = day_to_year(Days),
@@ -172,7 +168,7 @@ gregorian_days_to_date(Days) ->
 
 %% gregorian_seconds_to_datetime(Secs)
 %%
--spec gregorian_seconds_to_datetime(Seconds) -> t_datetime() when
+-spec gregorian_seconds_to_datetime(Seconds) -> datetime() when
       Seconds :: non_neg_integer().
 gregorian_seconds_to_datetime(Secs) when Secs >= 0 ->
     Days = Secs div ?SECONDS_PER_DAY,
@@ -198,7 +194,7 @@ is_leap_year1(_) -> false.
 %%
 %% Calculates the iso week number for the current date.
 %%
--spec iso_week_number() -> t_yearweeknum().
+-spec iso_week_number() -> yearweeknum().
 iso_week_number() ->
     {Date, _} = local_time(),
     iso_week_number(Date).
@@ -207,8 +203,8 @@ iso_week_number() ->
 %%
 %% Calculates the iso week number for the given date.
 %%
--spec iso_week_number(Date) -> t_yearweeknum() when
-      Date :: t_date().
+-spec iso_week_number(Date) -> yearweeknum() when
+      Date :: date().
 iso_week_number({Year, Month, Day}) ->
     D = date_to_gregorian_days({Year, Month, Day}),
     W01_1_Year = gregorian_days_of_iso_w01_1(Year),
@@ -260,7 +256,7 @@ last_day_of_the_month1(_, M) when is_integer(M), M > 0, M < 13 ->
 %% local_time()
 %%
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
--spec local_time() -> t_datetime().
+-spec local_time() -> datetime().
 local_time() ->
     erlang:localtime().
 
@@ -268,20 +264,20 @@ local_time() ->
 %% local_time_to_universal_time(DateTime)
 %%
 -spec local_time_to_universal_time(DateTime1) -> DateTime2 when
-      DateTime1 :: t_datetime1970(),
-      DateTime2 :: t_datetime1970().
+      DateTime1 :: datetime1970(),
+      DateTime2 :: datetime1970().
 local_time_to_universal_time(DateTime) ->
     erlang:localtime_to_universaltime(DateTime).
 
--spec local_time_to_universal_time(t_datetime1970(),
+-spec local_time_to_universal_time(datetime1970(),
 				   'true' | 'false' | 'undefined') ->
-       					t_datetime1970().
+                                          datetime1970().
 local_time_to_universal_time(DateTime, IsDst) ->
     erlang:localtime_to_universaltime(DateTime, IsDst).
 
 -spec local_time_to_universal_time_dst(DateTime1) -> [DateTime] when
-      DateTime1 :: t_datetime1970(),
-      DateTime :: t_datetime1970().
+      DateTime1 :: datetime1970(),
+      DateTime :: datetime1970().
 local_time_to_universal_time_dst(DateTime) ->
     UtDst = erlang:localtime_to_universaltime(DateTime, true),
     Ut    = erlang:localtime_to_universaltime(DateTime, false),
@@ -309,14 +305,14 @@ local_time_to_universal_time_dst(DateTime) ->
 %% = MilliSec = integer() 
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
 %% 
--spec now_to_datetime(Now) -> t_datetime1970() when
-      Now :: t_now().
+-spec now_to_datetime(Now) -> datetime1970() when
+      Now :: erlang:timestamp().
 now_to_datetime({MSec, Sec, _uSec}) ->
     Sec0 = MSec*1000000 + Sec + ?DAYS_FROM_0_TO_1970*?SECONDS_PER_DAY,
     gregorian_seconds_to_datetime(Sec0).
 
--spec now_to_universal_time(Now) -> t_datetime1970() when
-      Now :: t_now().
+-spec now_to_universal_time(Now) -> datetime1970() when
+      Now :: erlang:timestamp().
 now_to_universal_time(Now) ->
     now_to_datetime(Now).
 
@@ -325,8 +321,8 @@ now_to_universal_time(Now) ->
 %%
 %% Args: Now = now()
 %%
--spec now_to_local_time(Now) -> t_datetime1970() when
-      Now :: t_now().
+-spec now_to_local_time(Now) -> datetime1970() when
+      Now :: erlang:timestamp().
 now_to_local_time({MSec, Sec, _uSec}) ->
     erlang:universaltime_to_localtime(
       now_to_universal_time({MSec, Sec, _uSec})).
@@ -338,7 +334,7 @@ now_to_local_time({MSec, Sec, _uSec}) ->
 -spec seconds_to_daystime(Seconds) -> {Days, Time} when
       Seconds :: integer(),
       Days :: integer(),
-      Time :: t_time().
+      Time :: time().
 seconds_to_daystime(Secs) ->
     Days0 = Secs div ?SECONDS_PER_DAY,
     Secs0 = Secs rem ?SECONDS_PER_DAY,
@@ -356,7 +352,7 @@ seconds_to_daystime(Secs) ->
 %% Wraps.
 %%
 -type secs_per_day() :: 0..?SECONDS_PER_DAY.
--spec seconds_to_time(Seconds) -> t_time() when
+-spec seconds_to_time(Seconds) -> time() when
       Seconds :: secs_per_day().
 seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
     Secs0 = Secs rem ?SECONDS_PER_DAY,
@@ -375,10 +371,10 @@ seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
 %% Year = Month = Day = Hour = Minute = Sec = integer()
 %%
 -spec time_difference(T1, T2) -> {Days, Time} when
-      T1 :: t_datetime(),
-      T2 :: t_datetime(),
+      T1 :: datetime(),
+      T2 :: datetime(),
       Days :: integer(),
-      Time :: t_time().
+      Time :: time().
 time_difference({{Y1, Mo1, D1}, {H1, Mi1, S1}}, 
 		{{Y2, Mo2, D2}, {H2, Mi2, S2}}) ->
     Secs = datetime_to_gregorian_seconds({{Y2, Mo2, D2}, {H2, Mi2, S2}}) -
@@ -390,7 +386,7 @@ time_difference({{Y1, Mo1, D1}, {H1, Mi1, S1}},
 %% time_to_seconds(Time)
 %%
 -spec time_to_seconds(Time) -> secs_per_day() when
-      Time :: t_time().
+      Time :: time().
 time_to_seconds({H, M, S}) when is_integer(H), is_integer(M), is_integer(S) ->
     H * ?SECONDS_PER_HOUR +
 	M * ?SECONDS_PER_MINUTE + S.
@@ -399,15 +395,15 @@ time_to_seconds({H, M, S}) when is_integer(H), is_integer(M), is_integer(S) ->
 %% universal_time()
 %%
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
--spec universal_time() -> t_datetime().
+-spec universal_time() -> datetime().
 universal_time() ->
     erlang:universaltime().
  
 
 %% universal_time_to_local_time(DateTime)
 %%
--spec universal_time_to_local_time(DateTime) -> t_datetime() when
-      DateTime :: t_datetime1970().
+-spec universal_time_to_local_time(DateTime) -> datetime() when
+      DateTime :: datetime1970().
 universal_time_to_local_time(DateTime) ->
     erlang:universaltime_to_localtime(DateTime).
 
@@ -429,7 +425,7 @@ valid_date1(_, _, _) ->
     false.
 
 -spec valid_date(Date) -> boolean() when
-      Date :: t_date().
+      Date :: date().
 valid_date({Y, M, D}) ->
     valid_date(Y, M, D).
 
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 718ca2e91a..10b2ed2e49 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -408,7 +408,12 @@ set_attr(line, {Line,Column}, Fun) when ?ALINE(Line), ?COLUMN(Column) ->
     end;
 set_attr(line=Tag, Attrs, Fun) when is_list(Attrs) ->
     {line,Line} = lists:keyfind(Tag, 1, Attrs),
-    lists:keyreplace(Tag, 1, Attrs, {line,Fun(Line)});
+    case lists:keyreplace(Tag, 1, Attrs, {line,Fun(Line)}) of
+        [{line,Ln}] when ?ALINE(Ln) ->
+            Ln;
+        As ->
+            As
+    end;
 set_attr(T1, T2, T3) ->
     erlang:error(badarg, [T1,T2,T3]).
 
diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index fd85c7aef5..306834e845 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -798,30 +798,10 @@ set_extracted_file_info(Name, #tar_header{mode=Mode, mtime=Mtime}) ->
 
 %% Makes all directories leading up to the file.
 
-make_dirs(Name, Type) ->
-    make_dirs1(filename:split(Name), Type).
-
-make_dirs1([Dir, Next|Rest], Type) ->
-    case file:read_file_info(Dir) of
-	{ok, #file_info{type=directory}} ->
-	    make_dirs1([filename:join(Dir, Next)|Rest], Type);
-	{ok, #file_info{}} ->
-	    throw({error, enotdir});
-	{error, _} ->
-	    case file:make_dir(Dir) of
-		ok ->
-		    make_dirs1([filename:join(Dir, Next)|Rest], Type);
-		{error, Reason} ->
-		    throw({error, Reason})
-	    end
-    end;
-make_dirs1([_], file) -> ok;
-make_dirs1([Dir], dir) ->
-    file:make_dir(Dir);
-make_dirs1([], _) ->
-    %% There must be something wrong here.  The list was not supposed
-    %% to be empty.
-    throw({error, enoent}).
+make_dirs(Name, file) ->
+	filelib:ensure_dir(Name);
+make_dirs(Name, dir) ->
+	filelib:ensure_dir(filename:join(Name,"*")).
 
 %% Prints the message on if the verbose option is given (for reading).
 
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 54c7283abf..165e03e506 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -100,7 +100,7 @@ fwrite(Format, Args) ->
 -spec fread(Format, String) -> Result when
       Format :: string(),
       String :: string(),
-      Result :: {'ok', InputList :: chars(), LeftOverChars :: string()}
+      Result :: {'ok', InputList :: [term()], LeftOverChars :: string()}
               | {'more', RestFormat :: string(),
                  Nchars :: non_neg_integer(),
                  InputStack :: chars()}
@@ -115,7 +115,7 @@ fread(Chars, Format) ->
       Format :: string(),
       Return :: {'more', Continuation1 :: continuation()}
               | {'done', Result, LeftOverChars :: string()},
-      Result :: {'ok', InputList :: chars()}
+      Result :: {'ok', InputList :: [term()]}
               | 'eof'
               | {'error', What :: term()}.
 
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 52aa4d073c..ded1346097 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -24,6 +24,10 @@
 
 -import(lists, [reverse/1,reverse/2]).
 
+-define(is_whitespace(C),
+	((C) =:= $\s orelse (C) =:= $\t
+	 orelse (C) =:= $\r orelse (C) =:= $\n)).
+
 %%-----------------------------------------------------------------------
 
 %% fread(Continuation, CharList, FormatString)
@@ -106,31 +110,27 @@ fread_line(Format0, Line, N0, Results0, More, Newline) ->
 fread(Format, Line) ->
     fread(Format, Line, 0, []).
 
-fread([$~|Format0], Line, N, Results) ->
+fread([$~|Format0]=AllFormat, Line, N, Results) ->
     {Format,F,Sup,Unicode} = fread_field(Format0),
-    fread1(Format, F, Sup, Unicode, Line, N, Results, Format0);
-fread([$\s|Format], Line, N, Results) ->
-    fread_skip_white(Format, Line, N, Results);
-fread([$\t|Format], Line, N, Results) ->
-    fread_skip_white(Format, Line, N, Results);
-fread([$\r|Format], Line, N, Results) ->
-    fread_skip_white(Format, Line, N, Results);
-fread([$\n|Format], Line, N, Results) ->
+    fread1(Format, F, Sup, Unicode, Line, N, Results, AllFormat);
+fread([C|Format], Line, N, Results) when ?is_whitespace(C) ->
     fread_skip_white(Format, Line, N, Results);
 fread([C|Format], [C|Line], N, Results) ->
     fread(Format, Line, N+1, Results);
 fread([_F|_Format], [_C|_Line], _N, _Results) ->
     fread_error(input);
+fread([_|_]=Format, [], N, Results) ->
+    {more,Format,N,Results};
+fread([_|_], eof, 0, []) ->
+    %% This is at start of input so no error.
+    eof;
+fread([_|_], eof, _N, _Results) ->
+    %% This is an error as there is no more input.
+    fread_error(input);
 fread([], Line, _N, Results) ->
     {ok,reverse(Results),Line}.
 
-fread_skip_white(Format, [$\s|Line], N, Results) ->
-    fread_skip_white(Format, Line, N+1, Results);
-fread_skip_white(Format, [$\t|Line], N, Results) ->
-    fread_skip_white(Format, Line, N+1, Results);
-fread_skip_white(Format, [$\r|Line], N, Results) ->
-    fread_skip_white(Format, Line, N+1, Results);
-fread_skip_white(Format, [$\n|Line], N, Results) ->
+fread_skip_white(Format, [C|Line], N, Results) when ?is_whitespace(C) ->
     fread_skip_white(Format, Line, N+1, Results);
 fread_skip_white(Format, Line, N, Results) ->
     fread(Format, Line, N, Results).
@@ -166,9 +166,9 @@ fread1([$l|Format], _F, Sup, _U, Line, N, Res, _AllFormat) ->
     fread(Format, Line, N, fread_result(Sup, N, Res));
 fread1(_Format, _F, _Sup, _U, [], N, Res, AllFormat) ->
     %% Need more input here.
-    {more,[$~|AllFormat],N,Res};
-fread1(_Format, _F, _Sup, _U, eof, _N, [], _AllFormat) ->
-    %% This is at start of format string so no error.
+    {more,AllFormat,N,Res};
+fread1(_Format, _F, _Sup, _U, eof, 0, [], _AllFormat) ->
+    %% This is at start of input so no error.
     eof;
 fread1(_Format, _F, _Sup, _U, eof, _N, _Res, _AllFormat) ->
     %% This is an error as there is no more input.
@@ -386,26 +386,16 @@ fread_string_cs(Line0, N0, true) ->
 %% fread_digits(Line, N, Base, Characters)
 %%  Read segments of things, return "thing" characters in reverse order.
 
-fread_skip_white([$\s|Line]) -> fread_skip_white(Line);
-fread_skip_white([$\t|Line]) -> fread_skip_white(Line);
-fread_skip_white([$\r|Line]) -> fread_skip_white(Line);
-fread_skip_white([$\n|Line]) -> fread_skip_white(Line);
+fread_skip_white([C|Line]) when ?is_whitespace(C) ->
+    fread_skip_white(Line);
 fread_skip_white(Line) -> Line.
 
-fread_skip_white([$\s|Line], N) ->
-    fread_skip_white(Line, N+1);
-fread_skip_white([$\t|Line], N) ->
-    fread_skip_white(Line, N+1);
-fread_skip_white([$\r|Line], N) ->
-    fread_skip_white(Line, N+1);
-fread_skip_white([$\n|Line], N) ->
+fread_skip_white([C|Line], N) when ?is_whitespace(C) ->
     fread_skip_white(Line, N+1);
 fread_skip_white(Line, N) -> {Line,N}.
 
-fread_skip_latin1_nonwhite([$\s|Line], N, Cs) -> {[$\s|Line],N,Cs};
-fread_skip_latin1_nonwhite([$\t|Line], N, Cs) -> {[$\t|Line],N,Cs};
-fread_skip_latin1_nonwhite([$\r|Line], N, Cs) -> {[$\r|Line],N,Cs};
-fread_skip_latin1_nonwhite([$\n|Line], N, Cs) -> {[$\n|Line],N,Cs};
+fread_skip_latin1_nonwhite([C|Line], N, Cs) when ?is_whitespace(C) ->
+    {[C|Line],N,Cs};
 fread_skip_latin1_nonwhite([C|Line], N, []) when C > 255 ->
     {[C|Line],N,error};
 fread_skip_latin1_nonwhite([C|Line], N, Cs) when C > 255 ->
@@ -414,10 +404,8 @@ fread_skip_latin1_nonwhite([C|Line], N, Cs) ->
     fread_skip_latin1_nonwhite(Line, N+1, [C|Cs]);
 fread_skip_latin1_nonwhite([], N, Cs) -> {[],N,Cs}.
 
-fread_skip_nonwhite([$\s|Line], N, Cs) -> {[$\s|Line],N,Cs};
-fread_skip_nonwhite([$\t|Line], N, Cs) -> {[$\t|Line],N,Cs};
-fread_skip_nonwhite([$\r|Line], N, Cs) -> {[$\r|Line],N,Cs};
-fread_skip_nonwhite([$\n|Line], N, Cs) -> {[$\n|Line],N,Cs};
+fread_skip_nonwhite([C|Line], N, Cs) when ?is_whitespace(C) ->
+    {[C|Line],N,Cs};
 fread_skip_nonwhite([C|Line], N, Cs) ->
     fread_skip_nonwhite(Line, N+1, [C|Cs]);
 fread_skip_nonwhite([], N, Cs) -> {[],N,Cs}.
diff --git a/lib/stdlib/src/queue.erl b/lib/stdlib/src/queue.erl
index 4c6b4d710b..afe917b151 100644
--- a/lib/stdlib/src/queue.erl
+++ b/lib/stdlib/src/queue.erl
@@ -56,16 +56,14 @@
 new() -> {[],[]}. %{RearList,FrontList}
 
 %% O(1)
--spec is_queue(Term) -> boolean() when
-      Term :: term().
+-spec is_queue(Term :: term()) -> boolean().
 is_queue({R,F}) when is_list(R), is_list(F) ->
     true;
 is_queue(_) ->
     false.
 
 %% O(1)
--spec is_empty(Q) -> boolean() when
-      Q :: queue().
+-spec is_empty(Q :: queue()) -> boolean().
 is_empty({[],[]}) ->
     true;
 is_empty({In,Out}) when is_list(In), is_list(Out) ->
@@ -74,16 +72,14 @@ is_empty(Q) ->
     erlang:error(badarg, [Q]).
 
 %% O(len(Q))
--spec len(Q) -> non_neg_integer() when
-      Q :: queue().
+-spec len(Q :: queue()) -> non_neg_integer().
 len({R,F}) when is_list(R), is_list(F) ->
     length(R)+length(F);
 len(Q) ->
     erlang:error(badarg, [Q]).
 
 %% O(len(Q))
--spec to_list(Q) -> list() when
-      Q :: queue().
+-spec to_list(Q :: queue()) -> list().
 to_list({In,Out}) when is_list(In), is_list(Out) ->
     Out++lists:reverse(In, []);
 to_list(Q) ->
@@ -92,8 +88,7 @@ to_list(Q) ->
 %% Create queue from list
 %%
 %% O(length(L))
--spec from_list(L) -> queue() when
-      L :: list().
+-spec from_list(L :: list()) -> queue().
 from_list(L) when is_list(L) ->
     f2r(L);
 from_list(L) ->
@@ -102,9 +97,7 @@ from_list(L) ->
 %% Return true or false depending on if element is in queue
 %% 
 %% O(length(Q)) worst case
--spec member(Item, Q) -> boolean() when
-      Item :: term(),
-      Q :: queue().
+-spec member(Item :: term(), Q :: queue()) -> boolean().
 member(X, {R,F}) when is_list(R), is_list(F) ->
     lists:member(X, R) orelse lists:member(X, F);
 member(X, Q) ->
@@ -117,10 +110,7 @@ member(X, Q) ->
 %% Put at least one element in each list, if it is cheap
 %%
 %% O(1)
--spec in(Item, Q1) -> Q2 when
-      Item :: term(),
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec in(Item :: term(), Q1 :: queue()) -> Q2 :: queue().
 in(X, {[_]=In,[]}) ->
     {[X], In};
 in(X, {In,Out}) when is_list(In), is_list(Out) ->
@@ -132,10 +122,7 @@ in(X, Q) ->
 %% Put at least one element in each list, if it is cheap
 %%
 %% O(1)
--spec in_r(Item, Q1) -> Q2 when
-      Item :: term(),
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec in_r(Item :: term(), Q1 :: queue()) -> Q2 :: queue().
 in_r(X, {[],[_]=F}) ->
     {F,[X]};
 in_r(X, {R,F}) when is_list(R), is_list(F) ->
@@ -146,10 +133,9 @@ in_r(X, Q) ->
 %% Take from head/front
 %%
 %% O(1) amortized, O(len(Q)) worst case
--spec out(Q1) -> Result when
-      Q1 :: queue(),
-      Q2 :: queue(),
-      Result :: {{value, Item :: term()}, Q2} | {empty, Q1}.
+-spec out(Q1 :: queue()) ->
+                 {{value, Item :: term()}, Q2 :: queue()} |
+                 {empty, Q1 :: queue()}.
 out({[],[]}=Q) ->
     {empty,Q};
 out({[V],[]}) ->
@@ -167,10 +153,9 @@ out(Q) ->
 %% Take from tail/rear
 %%
 %% O(1) amortized, O(len(Q)) worst case
--spec out_r(Q1) -> Result when
-      Q1 :: queue(),
-      Q2 :: queue(),
-      Result :: {{value, Item :: term()}, Q2} | {empty, Q1}.
+-spec out_r(Q1 :: queue()) ->
+                   {{value, Item :: term()}, Q2 :: queue()} |
+                   {empty, Q1 :: queue()}.
 out_r({[],[]}=Q) ->
     {empty,Q};
 out_r({[],[V]}) ->
@@ -191,9 +176,7 @@ out_r(Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec get(Q) -> Item when
-      Q :: queue(),
-      Item :: term().
+-spec get(Q :: queue()) -> Item :: term().
 get({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 get({R,F}) when is_list(R), is_list(F) ->
@@ -212,9 +195,7 @@ get([_|R], []) -> % malformed queue -> O(len(Q))
 %% Return the last element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec get_r(Q) -> Item when
-      Q :: queue(),
-      Item :: term().
+-spec get_r(Q :: queue()) -> Item :: term().
 get_r({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 get_r({[H|_],F}) when is_list(F) ->
@@ -229,9 +210,7 @@ get_r(Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec peek(Q) -> 'empty' | {'value',Item} when
-      Q :: queue(),
-      Item :: term().
+-spec peek(Q :: queue()) -> empty | {value,Item :: term()}.
 peek({[],[]}) ->
     empty;
 peek({R,[H|_]}) when is_list(R) ->
@@ -246,9 +225,7 @@ peek(Q) ->
 %% Return the last element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec peek_r(Q) -> 'empty' | {'value',Item} when
-      Q :: queue(),
-      Item :: term().
+-spec peek_r(Q :: queue()) -> empty | {value,Item :: term()}.
 peek_r({[],[]}) ->
     empty;
 peek_r({[H|_],F}) when is_list(F) ->
@@ -263,9 +240,7 @@ peek_r(Q) ->
 %% Remove the first element and return resulting queue
 %%
 %% O(1) amortized
--spec drop(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec drop(Q1 :: queue()) -> Q2 :: queue().
 drop({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 drop({[_],[]}) ->
@@ -283,9 +258,7 @@ drop(Q) ->
 %% Remove the last element and return resulting queue
 %%
 %% O(1) amortized
--spec drop_r(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec drop_r(Q1 :: queue()) -> Q2 :: queue().
 drop_r({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 drop_r({[],[_]}) ->
@@ -306,9 +279,7 @@ drop_r(Q) ->
 %% Return reversed queue
 %%
 %% O(1)
--spec reverse(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec reverse(Q1 :: queue()) -> Q2 :: queue().
 reverse({R,F}) when is_list(R), is_list(F) ->
     {F,R};
 reverse(Q) ->
@@ -318,10 +289,7 @@ reverse(Q) ->
 %%
 %% Q2 empty: O(1)
 %% else:     O(len(Q1))
--spec join(Q1, Q2) -> Q3 when
-      Q1 :: queue(),
-      Q2 :: queue(),
-      Q3 :: queue().
+-spec join(Q1 :: queue(), Q2 :: queue()) -> Q3 :: queue().
 join({R,F}=Q, {[],[]}) when is_list(R), is_list(F) ->
     Q;
 join({[],[]}, {R,F}=Q) when is_list(R), is_list(F) ->
@@ -335,11 +303,8 @@ join(Q1, Q2) ->
 %%
 %% N = 0..len(Q)
 %% O(max(N, len(Q)))
--spec split(N, Q1) -> {Q2,Q3} when
-      N :: non_neg_integer(),
-      Q1 :: queue(),
-      Q2 :: queue(),
-      Q3 :: queue().
+-spec split(N :: non_neg_integer(), Q1 :: queue()) ->
+                   {Q2 :: queue(),Q3 :: queue()}.
 split(0, {R,F}=Q) when is_list(R), is_list(F) ->
     {{[],[]},Q};
 split(N, {R,F}=Q) when is_integer(N), N >= 1, is_list(R), is_list(F) ->
@@ -380,10 +345,8 @@ split_r1_to_f2(N, [X|R1], F1, R2, F2) ->
 %% 
 %% Fun(_) -> List: O(length(List) * len(Q))
 %% else:           O(len(Q)
--spec filter(Fun, Q1) -> Q2 when
-      Fun :: fun((Item :: term()) -> boolean() | list()),
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec filter(Fun, Q1 :: queue()) -> Q2 :: queue() when
+      Fun :: fun((Item :: term()) -> boolean() | list()).
 filter(Fun, {R0,F0}) when is_function(Fun, 1), is_list(R0), is_list(F0) ->
     F = filter_f(Fun, F0),
     R = filter_r(Fun, R0),
@@ -459,10 +422,7 @@ filter_r(Fun, [X|R0]) ->
 
 %% Cons to head
 %%
--spec cons(Item, Q1) -> Q2 when
-      Item :: term(),
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec cons(Item :: term(), Q1 :: queue()) -> Q2 :: queue().
 cons(X, Q) ->
     in_r(X, Q).
 
@@ -471,9 +431,7 @@ cons(X, Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec head(Q) -> Item when
-      Q :: queue(),
-      Item :: term().
+-spec head(Q :: queue()) -> Item :: term().
 head({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 head({R,F}) when is_list(R), is_list(F) ->
@@ -483,9 +441,7 @@ head(Q) ->
 
 %% Remove head element and return resulting queue
 %%
--spec tail(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec tail(Q1 :: queue()) -> Q2 :: queue().
 tail(Q) ->
     drop(Q).
 
@@ -493,35 +449,22 @@ tail(Q) ->
 
 %% Cons to tail
 %%
--spec snoc(Q1, Item) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue(),
-      Item :: term().
+-spec snoc(Q1 :: queue(), Item :: term()) -> Q2 :: queue().
 snoc(Q, X) ->
     in(X, Q).
 
 %% Return last element
--spec daeh(Q) -> Item when
-      Q :: queue(),
-      Item :: term().
+-spec daeh(Q :: queue()) -> Item :: term().
 daeh(Q) -> get_r(Q).
--spec last(Q) -> Item when
-      Q :: queue(),
-      Item :: term().
+-spec last(Q :: queue()) -> Item :: term().
 last(Q) -> get_r(Q).
 
 %% Remove last element and return resulting queue
--spec liat(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec liat(Q1 :: queue()) -> Q2 :: queue().
 liat(Q) -> drop_r(Q).
--spec lait(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec lait(Q1 :: queue()) -> Q2 :: queue().
 lait(Q) -> drop_r(Q). %% Oops, mis-spelled 'tail' reversed. Forget this one.
--spec init(Q1) -> Q2 when
-      Q1 :: queue(),
-      Q2 :: queue().
+-spec init(Q1 :: queue()) -> Q2 :: queue().
 init(Q) -> drop_r(Q).
 
 %%--------------------------------------------------------------------------
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index 89fae05e4f..689e42051f 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -199,9 +199,9 @@ tc(M, F, A) ->
 %% Calculate the time difference (in microseconds) of two
 %% erlang:now() timestamps, T2-T1.
 %%
--spec now_diff(T1, T2) -> Tdiff when
-      T1 :: calendar:t_now(),
-      T2 :: calendar:t_now(),
+-spec now_diff(T2, T1) -> Tdiff when
+      T1 :: erlang:timestamp(),
+      T2 :: erlang:timestamp(),
       Tdiff :: integer().
 now_diff({A2, B2, C2}, {A1, B1, C1}) ->
     ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1.
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index 524d709431..c82c8159b6 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -223,7 +223,7 @@ openzip_open(F, Options) ->
 do_openzip_open(F, Options) ->
     Opts = get_openzip_options(Options),
     #openzip_opts{output = Output, open_opts = OpO, cwd = CWD} = Opts,
-    Input = get_zip_input(F),
+    Input = get_input(F),
     In0 = Input({open, F, OpO -- [write]}, []),
     {[#zip_comment{comment = C} | Files], In1} =
 	get_central_dir(In0, fun raw_file_info_etc/5, Input),
@@ -489,7 +489,7 @@ do_list_dir(F, Options) ->
 %% Print zip directory in short form
 
 -spec(t(Archive) -> ok when
-      Archive :: file:name() | binary | ZipHandle,
+      Archive :: file:name() | binary() | ZipHandle,
       ZipHandle :: pid()).
 
 t(F) when is_pid(F) -> zip_t(F);
@@ -513,7 +513,7 @@ do_t(F, RawPrint) ->
 %% Print zip directory in long form (like ls -l)
 
 -spec(tt(Archive) -> ok when
-      Archive :: file:name() | binary | ZipHandle,
+      Archive :: file:name() | binary() | ZipHandle,
       ZipHandle :: pid()).
 
 tt(F) when is_pid(F) -> zip_tt(F);
@@ -1174,7 +1174,7 @@ zip_get(Pid) when is_pid(Pid) ->
 zip_close(Pid) when is_pid(Pid) ->
     request(self(), Pid, close).
 
--spec(zip_get(FileName, ZipHandle) -> {ok, [Result]} | {error, Reason} when
+-spec(zip_get(FileName, ZipHandle) -> {ok, Result} | {error, Reason} when
       FileName :: file:name(),
       ZipHandle :: pid(),
       Result :: file:name() | {file:name(), binary()},
@@ -1183,7 +1183,7 @@ zip_close(Pid) when is_pid(Pid) ->
 zip_get(FileName, Pid) when is_pid(Pid) ->
     request(self(), Pid, {get, FileName}).
 
--spec(zip_list_dir(ZipHandle) -> Result | {error, Reason} when
+-spec(zip_list_dir(ZipHandle) -> {ok, Result} | {error, Reason} when
       Result :: [zip_comment() | zip_file()],
       ZipHandle :: pid(),
       Reason :: term()).
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 31a4f94294..4298b2c701 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -737,6 +737,10 @@ set_attribute() ->
         (catch {foo, erl_scan:set_attribute(line, [], F2)}), % type error
     ?line {'EXIT',{badarg,_}} =
         (catch {foo, erl_scan:set_attribute(column, [], F2)}), % type error
+
+    %% OTP-9412
+    ?line 8 = erl_scan:set_attribute(line, [{line,{nos,'X',8}}],
+                                     fun({nos,_V,VL}) -> VL end),
     ok.
 
 column_errors() ->
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 9d348b5f1a..9341300f90 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -72,6 +72,7 @@
 	 exit_many_many_tables_owner/1]).
 -export([write_concurrency/1, heir/1, give_away/1, setopts/1]).
 -export([bad_table/1, types/1]).
+-export([otp_9423/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
@@ -143,7 +144,8 @@ all() ->
      otp_8166, exit_large_table_owner,
      exit_many_large_table_owner, exit_many_tables_owner,
      exit_many_many_tables_owner, write_concurrency, heir,
-     give_away, setopts, bad_table, types].
+     give_away, setopts, bad_table, types,
+     otp_9423].
 
 groups() -> 
     [{new, [],
@@ -5420,7 +5422,39 @@ types_do(Opts) ->
     ?line verify_etsmem(EtsMem).
 
 
-
+otp_9423(doc) -> ["vm-deadlock caused by race between ets:delete and others on write_concurrency table"];
+otp_9423(Config) when is_list(Config) ->
+    InitF = fun(_) -> {0,0} end,
+    ExecF = fun({S,F}) -> 
+		    receive 
+			stop -> 
+			    io:format("~p got stop\n", [self()]),
+			    [end_of_work | {"Succeded=",S,"Failed=",F}]
+		    after 0 ->
+			    %%io:format("~p (~p) doing lookup\n", [self(), {S,F}]),
+			    try ets:lookup(otp_9423, key) of
+				[] -> {S+1,F}
+			    catch
+				error:badarg -> {S,F+1}
+			    end
+		    end
+	    end,
+    FiniF = fun(R) -> R end,
+    case run_workers(InitF, ExecF, FiniF, infinite, 1) of
+	Pids when is_list(Pids) ->
+	    %%[P ! start || P <- Pids],
+	    repeat(fun() -> ets:new(otp_9423, [named_table, public, {write_concurrency,true}]),
+			    ets:delete(otp_9423)
+		   end, 10000),
+	    [P ! stop || P <- Pids],
+	    wait_pids(Pids),
+	    ok;
+	
+	Skipped -> Skipped
+    end.
+	    
+    
+    
 
 %
 % Utility functions:
@@ -5434,21 +5468,30 @@ add_lists([E1|T1], [E2|T2], Acc) ->
     add_lists(T1, T2, [E1+E2 | Acc]).    
 
 run_workers(InitF,ExecF,FiniF,Laps) ->
+    run_workers(InitF,ExecF,FiniF,Laps, 0).
+run_workers(InitF,ExecF,FiniF,Laps, Exclude) ->
     case erlang:system_info(smp_support) of
 	true ->
-	    run_workers_do(InitF,ExecF,FiniF,Laps);
+	    run_workers_do(InitF,ExecF,FiniF,Laps, Exclude);
 	false ->
 	    {skipped,"No smp support"}
     end.
-   
+
 run_workers_do(InitF,ExecF,FiniF,Laps) ->
-    NumOfProcs = erlang:system_info(schedulers),
+    run_workers_do(InitF,ExecF,FiniF,Laps, 0).
+run_workers_do(InitF,ExecF,FiniF,Laps, Exclude) ->
+    ?line NumOfProcs = case erlang:system_info(schedulers) of
+			   N when (N > Exclude) -> N - Exclude
+		       end,
     io:format("smp starting ~p workers\n",[NumOfProcs]),
     Seeds = [{ProcN,random:uniform(9999)} || ProcN <- lists:seq(1,NumOfProcs)],
     Parent = self(),
     Pids = [spawn_link(fun()-> worker(Seed,InitF,ExecF,FiniF,Laps,Parent,NumOfProcs) end)
 	    || Seed <- Seeds],
-    wait_pids(Pids).
+    case Laps of
+	infinite -> Pids;
+	_ -> wait_pids(Pids)
+    end.
 	    
 worker({ProcN,Seed}, InitF, ExecF, FiniF, Laps, Parent, NumOfProcs) ->
     io:format("smp worker ~p, seed=~p~n",[self(),Seed]),
@@ -5463,6 +5506,8 @@ worker_loop(0, _, State) ->
     State;
 worker_loop(_, _, [end_of_work|State]) ->
     State;
+worker_loop(infinite, ExecF, State) ->
+    worker_loop(infinite,ExecF,ExecF(State));
 worker_loop(N, ExecF, State) ->
     worker_loop(N-1,ExecF,ExecF(State)).
     
@@ -5517,20 +5562,21 @@ etsmem() ->
      case erlang:system_info({allocator,ets_alloc}) of
 	 false -> undefined;
 	 MemInfo ->
-	     MSBCS = lists:foldl(
-		       fun ({instance, _, L}, Acc) ->
-			       {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
-			       {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
-			       [MBCS,SBCS | Acc]
-		       end,
-		       [],
-		       MemInfo),
+	     CS = lists:foldl(
+		    fun ({instance, _, L}, Acc) ->
+			    {value,{_,SBMBCS}} = lists:keysearch(sbmbcs, 1, L),
+			    {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
+			    {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
+			    [SBMBCS,MBCS,SBCS | Acc]
+		    end,
+		    [],
+		    MemInfo),
 	     lists:foldl(
 	       fun(L, {Bl0,BlSz0}) ->
 		       {value,{_,Bl,_,_}} = lists:keysearch(blocks, 1, L),
 		       {value,{_,BlSz,_,_}} = lists:keysearch(blocks_size, 1, L),
 		       {Bl0+Bl,BlSz0+BlSz}
-	       end, {0,0}, MSBCS)
+	       end, {0,0}, CS)
      end},
      {Mem,AllTabs}.
 
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 54a98985cd..bb02a879c2 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -27,7 +27,7 @@
          otp_6282/1, otp_6354/1, otp_6495/1, otp_6517/1, otp_6502/1,
          manpage/1, otp_6708/1, otp_7084/1, otp_7421/1,
 	 io_lib_collect_line_3_wb/1, cr_whitespace_in_string/1,
-	 io_fread_newlines/1, otp_8989/1]).
+	 io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1]).
 
 %-define(debug, true).
 
@@ -62,7 +62,7 @@ all() ->
      otp_6282, otp_6354, otp_6495, otp_6517, otp_6502,
      manpage, otp_6708, otp_7084, otp_7421,
      io_lib_collect_line_3_wb, cr_whitespace_in_string,
-     io_fread_newlines, otp_8989].
+     io_fread_newlines, otp_8989, io_lib_fread_literal].
 
 groups() -> 
     [].
@@ -1995,3 +1995,29 @@ otp_8989(Suite) when is_list(Suite) ->
     ?line "Hel " = fmt("~-4.*s", [3,Hello]),
     ?line "Hel " = fmt("~*.*s", [-4,3,Hello]),
     ok.
+
+io_lib_fread_literal(doc) ->
+    "OTP-9439 io_lib:fread bug for literate at end";
+io_lib_fread_literal(Suite) when is_list(Suite) ->
+    ?line {more,"~d",0,""} = io_lib:fread("~d", ""),
+    ?line {error,{fread,integer}} = io_lib:fread("~d", " "),
+    ?line {more,"~d",1,""} = io_lib:fread(" ~d", " "),
+    ?line {ok,[17],"X"} = io_lib:fread(" ~d", " 17X"),
+    %%
+    ?line {more,"d",0,""} = io_lib:fread("d", ""),
+    ?line {error,{fread,input}} = io_lib:fread("d", " "),
+    ?line {more,"d",1,""} = io_lib:fread(" d", " "),
+    ?line {ok,[],"X"} = io_lib:fread(" d", " dX"),
+    %%
+    ?line {done,eof,_} = io_lib:fread([], eof, "~d"),
+    ?line {done,eof,_} = io_lib:fread([], eof, " ~d"),
+    ?line {more,C1} = io_lib:fread([], " \n", " ~d"),
+    ?line {done,{error,{fread,input}},_} = io_lib:fread(C1, eof, " ~d"),
+    ?line {done,{ok,[18]},""} = io_lib:fread(C1, "18\n", " ~d"),
+    %%
+    ?line {done,eof,_} = io_lib:fread([], eof, "d"),
+    ?line {done,eof,_} = io_lib:fread([], eof, " d"),
+    ?line {more,C2} = io_lib:fread([], " \n", " d"),
+    ?line {done,{error,{fread,input}},_} = io_lib:fread(C2, eof, " d"),
+    ?line {done,{ok,[]},[]} = io_lib:fread(C2, "d\n", " d"),
+    ok.
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index c79a5002fb..ff5e4c629a 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -114,10 +114,9 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(count_children_memory, Config) ->
-    MemoryState = erlang:system_info(allocator),
-    case count_children_allocator_test(MemoryState) of
-	true -> Config;
-	false ->
+    try erlang:memory() of
+	_ -> Config
+    catch error:notsup ->
 	    {skip, "+Meamin used during test; erlang:memory/1 not available"}
     end;
 init_per_testcase(_Case, Config) ->
@@ -1032,17 +1031,6 @@ count_children_memory(Config) when is_list(Config) ->
     [terminate(SupPid, Pid, child, kill) || {undefined, Pid, worker, _Modules} <- Children3],
     [1,0,0,0] = get_child_counts(sup_test).
 
-count_children_allocator_test(MemoryState) ->
-    Allocators = [temp_alloc, eheap_alloc, binary_alloc, ets_alloc,
-		  driver_alloc, sl_alloc, ll_alloc, fix_alloc, std_alloc,
-		  sys_alloc],
-    MemoryStateList = element(4, MemoryState),
-    AllocTypes = [lists:keyfind(Alloc, 1, MemoryStateList)
-		  || Alloc <- Allocators],
-    AllocStates = [lists:keyfind(e, 1, AllocValue)
-		   || {_Type, AllocValue} <- AllocTypes],
-    lists:all(fun(State) -> State == {e, true} end, AllocStates).
-
 %%-------------------------------------------------------------------------
 do_not_save_start_parameters_for_temporary_children(doc) ->
     ["Temporary children shall not be restarted so they should not "
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index d5f2cd52d4..7233c061ef 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -375,7 +375,8 @@ zip_options(Config) when is_list(Config) ->
     ok = file:set_cwd(?config(data_dir, Config)),
 
     %% Create a zip archive
-    {ok, Zip} = zip:zip("filename_not_used.zip", Names, [memory, {cwd, PrivDir}]),
+    {ok, {_,Zip}} =
+        zip:zip("filename_not_used.zip", Names, [memory, {cwd, PrivDir}]),
 
     %% Open archive
     {ok, ZipSrv} = zip:zip_open(Zip, [memory]),
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index c0956030cf..9d4ed17774 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.17.4
+STDLIB_VSN = 1.17.5