Merge branch 'hb/tools/unicode_fix/OTP-12567' into maint

* hb/tools/unicode_fix/OTP-12567:
  tools: Fix a Unicode bug in the tags module

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/tools/src/tags.erl b/lib/tools/src/tags.erl
index e3cc51cdb2..e25db2eb1b 100644
--- a/lib/tools/src/tags.erl
+++ b/lib/tools/src/tags.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. 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
@@ -297,15 +297,16 @@ word_char(_) -> false.
 
 %% Check the options `outfile' and `outdir'.
 open_out(Options) ->
+    Opts = [write, {encoding, unicode}],
     case lists:keysearch(outfile, 1, Options) of
 	{value, {outfile, File}} ->
-	    file:open(File, [write]);
+	    file:open(File, Opts);
 	_ ->
 	    case lists:keysearch(outdir, 1, Options) of
 		{value, {outdir, Dir}} ->
-		    file:open(filename:join(Dir, "TAGS"), [write]);
+		    file:open(filename:join(Dir, "TAGS"), Opts);
 		_ ->
-		    file:open("TAGS", [write])
+		    file:open("TAGS", Opts)
 	    end
     end.