From 771b21fa519a52a27134806e1d62440d8535f6b5 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 4 Feb 2013 16:11:43 +0100
Subject: Make Unicode corrections

---
 lib/kernel/doc/src/file.xml               | 4 +---
 lib/kernel/src/application_controller.erl | 4 ++--
 lib/kernel/src/file.erl                   | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 4a9b7d2ceb..a96da0fb4e 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -156,9 +156,6 @@
     <datatype>
       <name name="file_info_option"/>
     </datatype>
-    <datatype>
-      <name name="sendfile_option"/>
-    </datatype>
    </datatypes>
 
   <funcs>
@@ -1648,6 +1645,7 @@
     <func>
       <name name="sendfile" arity="5"/>
       <fsummary>send a file to a socket</fsummary>
+      <type name="sendfile_option"/>
       <desc>
         <p>Sends <c>Bytes</c> from the file
         referenced by <c>RawFile</c> beginning at <c>Offset</c> to
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index 3c860af48e..1602745669 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -1447,7 +1447,7 @@ prim_consult(FullName) ->
 	{ok, Bin, _} ->
             case file_binary_to_list(Bin) of
                 {ok, String} ->
-                    case erl_scan:string(String, 1, [unicode]) of
+                    case erl_scan:string(String) of
                         {ok, Tokens, _EndLine} ->
                             prim_parse(Tokens, []);
                         {error, Reason, _EndLine} ->
@@ -1600,7 +1600,7 @@ conv(_) -> [].
 
 %%% Fix some day: eliminate the duplicated code here
 make_term(Str) -> 
-    case erl_scan:string(Str, 1, [unicode]) of
+    case erl_scan:string(Str) of
 	{ok, Tokens, _} ->		  
 	    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
 		{ok, Term} ->
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 70c4583ad2..e7a0451011 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1196,7 +1196,7 @@ change_time(Name, {{AY, AM, AD}, {AH, AMin, ASec}}=Atime,
 -spec sendfile(RawFile, Socket, Offset, Bytes, Opts) ->
    {'ok', non_neg_integer()} | {'error', inet:posix() | 
 				closed | badarg | not_owner} when
-      RawFile :: file:fd(),
+      RawFile :: fd(),
       Socket :: inet:socket(),
       Offset :: non_neg_integer(),
       Bytes :: non_neg_integer(),
@@ -1222,7 +1222,7 @@ sendfile(File, Sock, Offset, Bytes, Opts) ->
 -spec sendfile(Filename, Socket) ->
    {'ok', non_neg_integer()} | {'error', inet:posix() | 
 				closed | badarg | not_owner}
-      when Filename :: file:name(),
+      when Filename :: name(),
 	   Socket :: inet:socket().
 sendfile(Filename, Sock)  ->
     case file:open(Filename, [read, raw, binary]) of
@@ -1345,7 +1345,7 @@ eval_stream(Fd, Handling, Bs) ->
     eval_stream(Fd, Handling, 1, undefined, [], Bs).
 
 eval_stream(Fd, H, Line, Last, E, Bs) ->
-    eval_stream2(io:parse_erl_exprs(Fd, '', Line, [unicode]), Fd, H, Last, E, Bs).
+    eval_stream2(io:parse_erl_exprs(Fd, '', Line), Fd, H, Last, E, Bs).
 
 eval_stream2({ok,Form,EndLine}, Fd, H, Last, E, Bs0) ->
     try erl_eval:exprs(Form, Bs0) of
-- 
cgit v1.2.3