Merge branch 'hb/stdlib/unicode_corrections/OTP-10820'

* hb/stdlib/unicode_corrections/OTP-10820:
  Use ~ts for filenames

17 files changed, 80 insertions, 80 deletions

diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 599036f380..0114cc906f 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -660,7 +660,7 @@ read_source(Name, Opts0) ->
 	    check_forms(Forms, Name),
 	    Forms;
 	{error, R} ->
-	    edoc_report:error({"error reading file '~s'.",
+	    edoc_report:error({"error reading file '~ts'.",
                                [edoc_lib:filename(Name)]}),
 	    exit({error, R})
     end.
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index a0c1ae1c0f..ce1e94a26a 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -200,7 +200,7 @@ source({M, P, Name, Path}, Dir, Suffix, Env, Set, Private, Hidden,
 		    {Set, Error}
 	    end;
 	R ->
-	    report("skipping source file '~s': ~W.", [File, R, 15]),
+	    report("skipping source file '~ts': ~W.", [File, R, 15]),
 	    {Set, true}
     end.
 
@@ -216,14 +216,14 @@ check_name(M, M0, P0, File) ->
 	    ok;
 	_ ->
 	    if N =/= N0 ->
-		    warning("file '~s' actually contains module '~s'.",
+		    warning("file '~ts' actually contains module '~s'.",
 			    [File, M]);
 	       true ->
 		    ok
 	    end
     end,
     if P =/= P0 ->
-	    warning("file '~s' belongs to package '~s', not '~s'.",
+	    warning("file '~ts' belongs to package '~s', not '~s'.",
 		    [File, P, P0]);
        true ->
 	    ok
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index d9c225e099..276f48453e 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -466,20 +466,20 @@ uri_get("file://localhost/" ++ Path) ->
     uri_get_file(Path);
 uri_get("file://" ++ Path) ->
     Msg = io_lib:format("cannot handle 'file:' scheme with "
-			"nonlocal network-path: 'file://~s'.",
+			"nonlocal network-path: 'file://~ts'.",
 			[Path]),
     {error, Msg};
 uri_get("file:/" ++ Path) ->
     uri_get_file(Path);
 uri_get("file:" ++ Path) ->
-    Msg = io_lib:format("ignoring malformed URI: 'file:~s'.", [Path]),
+    Msg = io_lib:format("ignoring malformed URI: 'file:~ts'.", [Path]),
     {error, Msg};
 uri_get("http:" ++ Path) ->
     uri_get_http("http:" ++ Path);
 uri_get("ftp:" ++ Path) ->
     uri_get_ftp("ftp:" ++ Path);
 uri_get("//" ++ Path) ->
-    Msg = io_lib:format("cannot access network-path: '//~s'.", [Path]),
+    Msg = io_lib:format("cannot access network-path: '//~ts'.", [Path]),
     {error, Msg};
 uri_get([C, $:, $/ | _]=Path) when C >= $A, C =< $Z; C >= $a, C =< $z ->
     uri_get_file(Path);  % special case for Windows
@@ -490,7 +490,7 @@ uri_get(URI) ->
 	true ->
 	    uri_get_file(URI);
 	false ->
-	    Msg = io_lib:format("cannot handle URI: '~s'.", [URI]),
+	    Msg = io_lib:format("cannot handle URI: '~ts'.", [URI]),
 	    {error, Msg}
     end.
 
@@ -555,12 +555,12 @@ uri_get_http_1(Result, URI) ->
     end.
 
 http_errmsg(Reason, URI) ->
-    io_lib:format("http error: ~s: '~s'", [Reason, URI]).
+    io_lib:format("http error: ~ts: '~ts'", [Reason, URI]).
 
 %% TODO: implement ftp access method
 
 uri_get_ftp(URI) ->
-    Msg = io_lib:format("cannot access ftp scheme yet: '~s'.", [URI]),
+    Msg = io_lib:format("cannot access ftp scheme yet: '~ts'.", [URI]),
     {error, Msg}.
 
 %% @private
@@ -615,7 +615,7 @@ copy_file(From, To) ->
 	{ok, _} -> ok;
 	{error, R} ->
 	    R1 = file:format_error(R),
-	    report("error copying '~s' to '~s': ~s.", [From, To, R1]),
+	    report("error copying '~ts' to '~ts': ~ts.", [From, To, R1]),
 	    exit(error)
     end.
 
@@ -631,7 +631,7 @@ list_dir(Dir, Error) ->
 			fun (S, As) -> warning(S, As), [] end
 		end,
 	    R1 = file:format_error(R),
-	    F("could not read directory '~s': ~s.", [filename(Dir), R1])
+	    F("could not read directory '~ts': ~ts.", [filename(Dir), R1])
     end.
 
 %% @private
@@ -667,7 +667,7 @@ simplify_path(P) ->
 %% 	ok -> ok;
 %% 	{error, R} ->
 %% 	    R1 = file:format_error(R),
-%% 	    report("cannot create directory '~s': ~s.", [Dir, R1]),
+%% 	    report("cannot create directory '~ts': ~ts.", [Dir, R1]),
 %% 	    exit(error)
 %%     end.
 
@@ -707,7 +707,7 @@ write_file(Text, Dir, Name, Package, Options) ->
 	    ok = file:close(FD);
 	{error, R} ->
 	    R1 = file:format_error(R),
-	    report("could not write file '~s': ~s.", [File, R1]),
+	    report("could not write file '~ts': ~ts.", [File, R1]),
 	    exit(error)
     end.
 
@@ -761,7 +761,7 @@ read_info_file(Dir) ->
 		    parse_info_file(Text, File);
 		{error, R} ->
 		    R1 = file:format_error(R),
-		    warning("could not read '~s': ~s.", [File, R1]),
+		    warning("could not read '~ts': ~ts.", [File, R1]),
 		    {?NO_APP, [], []}
 	    end;	    
 	false ->
@@ -776,7 +776,7 @@ uri_get_info_file(Base) ->
 	{ok, Text} ->
 	    parse_info_file(Text, URI);
 	{error, Msg} ->
-	    warning("could not read '~s': ~s.", [URI, Msg]),
+	    warning("could not read '~ts': ~ts.", [URI, Msg]),
 	    {?NO_APP, [], []}
     end.
 
@@ -785,10 +785,10 @@ parse_info_file(Text, Name) ->
 	{ok, Vs} ->
 	    info_file_data(Vs);
 	{error, eof} ->
-	    warning("unexpected end of file in '~s'.", [Name]),
+	    warning("unexpected end of file in '~ts'.", [Name]),
 	    {?NO_APP, [], []};
 	{error, {_Line,Module,R}} ->
-	    warning("~s: ~s.", [Module:format_error(R), Name]),
+	    warning("~ts: ~ts.", [Module:format_error(R), Name]),
 	    {?NO_APP, [], []}
     end.
 
@@ -1033,7 +1033,7 @@ run_plugin(Name, Key, Default, Fun, Opts) when is_atom(Name) ->
 	{ok, Value} ->
 	    Value;
 	R ->
-	    report("error in ~s '~w': ~W.", [Name, Module, R, 20]),
+	    report("error in ~ts '~w': ~W.", [Name, Module, R, 20]),
 	    exit(error)
     end.
 
diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl
index 08686c4fb5..8efbfd00c7 100644
--- a/lib/edoc/src/edoc_macros.erl
+++ b/lib/edoc/src/edoc_macros.erl
@@ -88,7 +88,7 @@ link_macro(S, Line, Env) ->
 		 true -> " target=\"_top\""; % note the initial space
 		 false -> ""
 	     end,
-    lists:flatten(io_lib:fwrite("<a href=\"~s\"~s>~ts</a>",
+    lists:flatten(io_lib:fwrite("<a href=\"~ts\"~ts>~ts</a>",
 				[URI, Target, Txt])).
 
 section_macro(S, _Line, _Env) ->
@@ -102,7 +102,7 @@ type_macro(S, Line, Env) ->
     Def = edoc_parser:parse_typedef(S1, Line),
     {#t_typedef{type = T}, _} = Def,
     Txt = edoc_layout:type(edoc_data:type(T, Env)),
-    lists:flatten(io_lib:fwrite("<code>~s</code>", [Txt])).
+    lists:flatten(io_lib:fwrite("<code>~ts</code>", [Txt])).
 
 
 %% Expand inline macros in tag content.
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index cf1a2d6b11..a20f152f34 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -462,4 +462,4 @@ throw_error({parse_throws, E}, L) ->
 throw_error(parse_param, L) ->
     throw({error, L, "missing parameter name"});
 throw_error({Where, E}, L) when is_list(Where) ->
-    throw({error,L,{"unknown error parsing ~s: ~P.",[Where,E,15]}}).
+    throw({error,L,{"unknown error parsing ~ts: ~P.",[Where,E,15]}}).
diff --git a/lib/edoc/src/edoc_report.erl b/lib/edoc/src/edoc_report.erl
index 9bec08ab97..dc6320df6d 100644
--- a/lib/edoc/src/edoc_report.erl
+++ b/lib/edoc/src/edoc_report.erl
@@ -83,13 +83,13 @@ report(L, Where, S, Vs) ->
     io:nl().
 
 where({File, module}) ->
-    io_lib:fwrite("~s, in module header: ", [File]);
+    io_lib:fwrite("~ts, in module header: ", [File]);
 where({File, footer}) ->
-    io_lib:fwrite("~s, in module footer: ", [File]);
+    io_lib:fwrite("~ts, in module footer: ", [File]);
 where({File, header}) ->
-    io_lib:fwrite("~s, in header file: ", [File]);
+    io_lib:fwrite("~ts, in header file: ", [File]);
 where({File, {F, A}}) ->
-    io_lib:fwrite("~s, function ~s/~w: ", [File, F, A]);
+    io_lib:fwrite("~ts, function ~s/~w: ", [File, F, A]);
 where([]) ->
     io_lib:fwrite("~s: ", [?APPLICATION]);
 where(File) when is_list(File) ->
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 48b6137ac1..b5a1ef713d 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -162,7 +162,7 @@ file(Args) ->
 -spec invalid_args(string(), list()) -> no_return().
 
 invalid_args(Where, Args) ->
-    report("invalid arguments to ~s: ~w.", [Where, Args]),
+    report("invalid arguments to ~ts: ~w.", [Where, Args]),
     shutdown_error().
 
 run(F) ->
@@ -213,13 +213,13 @@ parse_arg(A) ->
 	{ok, Expr} ->
 	    case catch erl_parse:normalise(Expr) of
 		{'EXIT', _} ->
-		    report("bad argument: '~s':", [A]),
+		    report("bad argument: '~ts':", [A]),
 		    exit(error);
 		Term ->
 		    Term
 	    end;
 	{error, _, D} ->
-	    report("error parsing argument '~s'", [A]),
+	    report("error parsing argument '~ts'", [A]),
 	    error(D),
 	    exit(error)
     end.
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index 2d986988c2..eb41f1922a 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -391,10 +391,10 @@ parse_header(Data, Line, Env, Where) when is_list(Where) ->
 -spec throw_error(line(), err()) -> no_return().
 
 throw_error(L, {read_file, File, R}) ->
-    throw_error(L, {"error reading file '~s': ~w",
+    throw_error(L, {"error reading file '~ts': ~w",
 		    [edoc_lib:filename(File), R]});
 throw_error(L, {file_not_found, F}) ->
-    throw_error(L, {"file not found: ~s", [F]});
+    throw_error(L, {"file not found: ~ts", [F]});
 throw_error(L, file_not_string) ->
     throw_error(L, "expected file name as a string");
 throw_error(L, D) ->
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index cc0529d2a9..5d0d78bf3c 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -295,7 +295,7 @@ expand_uri([], _, L, _Ss, Us, _As) ->
 
 expand_uri_error(Us, L) ->
     {Ps, _} = edoc_lib:split_at(lists:reverse(Us), $:),
-    throw_error(L, {"reference '[~s:...' ended unexpectedly", [Ps]}).
+    throw_error(L, {"reference '[~ts:...' ended unexpectedly", [Ps]}).
 
 
 push_uri(Us, Ss, As) ->
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 1e12a647d7..7d463103e3 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -391,7 +391,7 @@ create_cookie(Name) ->
 	{error,Reason} ->
 	    {error,
 	     lists:flatten(
-	       io_lib:format("Failed to create cookie file '~s': ~p", [Name, Reason]))}
+	       io_lib:format("Failed to create cookie file '~ts': ~p", [Name, Reason]))}
     end.
 
 random_cookie(0, _, Result) ->
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index 22b496258f..e531b78a5b 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -127,7 +127,7 @@ file(File, Opts0) ->
     leex_ret(St).             
 
 format_error({file_error, Reason}) ->
-    io_lib:fwrite("~s",[file:format_error(Reason)]);
+    io_lib:fwrite("~ts",[file:format_error(Reason)]);
 format_error(missing_defs) -> "missing Definitions";
 format_error(missing_rules) -> "missing Rules";
 format_error(missing_code) -> "missing Erlang code";
@@ -301,10 +301,10 @@ pack_warnings([]) ->
 report_errors(St) ->
     when_opt(fun () -> 
                      foreach(fun({File,{none,Mod,E}}) -> 
-                                     io:fwrite("~s: ~ts\n",
+                                     io:fwrite("~ts: ~ts\n",
                                                [File,Mod:format_error(E)]);
                                 ({File,{Line,Mod,E}}) -> 
-                                     io:fwrite("~s:~w: ~ts\n",
+                                     io:fwrite("~ts:~w: ~ts\n",
                                                [File,Line,Mod:format_error(E)])
                              end, sort(St#leex.errors))
              end, report_errors, St#leex.opts).
@@ -319,11 +319,11 @@ report_warnings(St) ->
     ShouldReport = member(report_warnings, St#leex.opts) orelse ReportWerror,
     when_bool(fun () ->
 		      foreach(fun({File,{none,Mod,W}}) ->
-				      io:fwrite("~s: ~s~ts\n",
+				      io:fwrite("~ts: ~s~ts\n",
 						[File,Prefix,
 						 Mod:format_error(W)]);
 				 ({File,{Line,Mod,W}}) ->
-				      io:fwrite("~s:~w: ~s~ts\n",
+				      io:fwrite("~ts:~w: ~s~ts\n",
 						[File,Line,Prefix,
 						 Mod:format_error(W)])
 			      end, sort(St#leex.warnings))
@@ -401,7 +401,7 @@ parse_file(St0) ->
         {ok,Xfile} ->
             St1 = St0#leex{encoding = epp:set_encoding(Xfile)},
             try
-                verbose_print(St1, "Parsing file ~s, ", [St1#leex.xfile]),
+                verbose_print(St1, "Parsing file ~ts, ", [St1#leex.xfile]),
                 %% We KNOW that errors throw so we can ignore them here.
                 {ok,Line1,St2} = parse_head(Xfile, St1),
                 {ok,Line2,Macs,St3} = parse_defs(Xfile, Line1, St2),
@@ -1292,7 +1292,7 @@ pack_dfa([], _, Rs, PDFA) -> {PDFA,Rs}.
 %%  the code for the actions.
 
 out_file(St0, DFA, DF, Actions, Code) ->
-    verbose_print(St0, "Writing file ~s, ", [St0#leex.efile]),
+    verbose_print(St0, "Writing file ~ts, ", [St0#leex.efile]),
     case open_inc_file(St0) of
         {ok,Ifile} ->
             try
@@ -1582,7 +1582,7 @@ pp_sep(_, _, _, _) -> " ".
 %%  with Graphviz.
 
 out_dfa_graph(St, DFA, DF) ->
-    verbose_print(St, "Writing DFA to file ~s, ", [St#leex.gfile]),
+    verbose_print(St, "Writing DFA to file ~ts, ", [St#leex.gfile]),
     case file:open(St#leex.gfile, [write]) of
         {ok,Gfile} ->
             try
@@ -1644,7 +1644,7 @@ output_encoding_comment(File, #leex{encoding = Encoding}) ->
     io:fwrite(File, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
 
 output_file_directive(File, Filename, Line) ->
-    io:fwrite(File, <<"-file(~s, ~w).\n">>, 
+    io:fwrite(File, <<"-file(~ts, ~w).\n">>,
               [format_filename(Filename), Line]).
 
 format_filename(Filename) ->
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 30e0db421e..53292b037a 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -185,7 +185,7 @@ format_error({endsymbol_is_terminal, Symbol}) ->
 format_error({error, Module, Error}) ->
     Module:format_error(Error);
 format_error({file_error, Reason}) ->
-    io_lib:fwrite("~s",[file:format_error(Reason)]);
+    io_lib:fwrite("~ts",[file:format_error(Reason)]);
 format_error(illegal_empty) ->
     io_lib:fwrite("illegal use of empty symbol", []);
 format_error({internal_error, Error}) ->
@@ -481,7 +481,7 @@ generate(St0) ->
               ?PASS(action_conflicts), ?PASS(write_file)],
     F = case member(time, St1#yecc.options) of
             true -> 
-                io:fwrite(<<"Generating parser from grammar in ~s\n">>, 
+                io:fwrite(<<"Generating parser from grammar in ~ts\n">>,
                           [format_filename(St1#yecc.infile)]),
                 fun timeit/3;
             false ->
@@ -858,10 +858,10 @@ report_errors(St) ->
     case member(report_errors, St#yecc.options) of
         true ->
             foreach(fun({File,{none,Mod,E}}) -> 
-                            io:fwrite(<<"~s: ~ts\n">>,
+                            io:fwrite(<<"~ts: ~ts\n">>,
                                       [File,Mod:format_error(E)]);
                        ({File,{Line,Mod,E}}) -> 
-                            io:fwrite(<<"~s:~w: ~ts\n">>,
+                            io:fwrite(<<"~ts:~w: ~ts\n">>,
                                       [File,Line,Mod:format_error(E)])
                     end, sort(St#yecc.errors));
         false -> 
@@ -878,11 +878,11 @@ report_warnings(St) ->
     case member(report_warnings, St#yecc.options) orelse ReportWerror of
         true ->
             foreach(fun({File,{none,Mod,W}}) -> 
-                            io:fwrite(<<"~s: ~s~ts\n">>,
+                            io:fwrite(<<"~ts: ~s~ts\n">>,
                                       [File,Prefix,
 				       Mod:format_error(W)]);
                        ({File,{Line,Mod,W}}) -> 
-                            io:fwrite(<<"~s:~w: ~s~ts\n">>,
+                            io:fwrite(<<"~ts:~w: ~s~ts\n">>,
                                       [File,Line,Prefix,
 				       Mod:format_error(W)])
                     end, sort(St#yecc.warnings));
@@ -2518,7 +2518,7 @@ output_encoding_comment(#yecc{encoding = Encoding}=St) ->
     fwrite(St, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
 
 output_file_directive(St, Filename, Line) when St#yecc.file_attrs ->
-    fwrite(St, <<"-file(~s, ~w).\n">>, 
+    fwrite(St, <<"-file(~ts, ~w).\n">>,
            [format_filename(Filename), Line]);
 output_file_directive(St, _Filename, _Line) ->
     St.
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index e31ae6b9ef..91d317489c 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -512,7 +512,7 @@ m(M) ->
 print_object_file(Mod) ->
     case code:is_loaded(Mod) of
 	{file,File} ->
-	    format("Object file: ~s\n", [File]);
+	    format("Object file: ~ts\n", [File]);
 	_ ->
 	    ignore
     end.
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 6a27cff589..48f6622565 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -3709,7 +3709,7 @@ maybe_error_logger(Name, Why) ->
     Trimmer = fun(M, _F, _A) -> M =:= erl_eval end,
     Formater = fun(Term, I) -> io_lib:print(Term, I, 80, -1) end,
     X = lib:format_stacktrace(1, Stacktrace, Trimmer, Formater),
-    error_logger:Name("qlc: temporary file was needed for ~w\n~s\n", 
+    error_logger:Name("qlc: temporary file was needed for ~w\n~ts\n",
                       [Why, lists:flatten(X)]).
 
 expand_stacktrace() ->
diff --git a/lib/syntax_tools/src/erl_comment_scan.erl b/lib/syntax_tools/src/erl_comment_scan.erl
index b949675f1c..dae7530ce7 100644
--- a/lib/syntax_tools/src/erl_comment_scan.erl
+++ b/lib/syntax_tools/src/erl_comment_scan.erl
@@ -291,7 +291,7 @@ filename(N) ->
     exit(error).
 
 error_read_file(Name) ->
-    report_error("error reading file `~s'.", [Name]).
+    report_error("error reading file `~ts'.", [Name]).
 
 report_error(S, Vs) ->
     error_logger:error_msg(lists:concat([?MODULE, ": ", S, "\n"]), Vs).
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 35fd0c2e02..0c149634f6 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -151,7 +151,7 @@ dir_1(Dir, Regexp, Env) ->
             lists:foreach(fun (X) -> dir_2(X, Regexp, Dir, Env) end,
                           Files);
         {error, _} ->
-            report_error("error reading directory `~s'",
+            report_error("error reading directory `~ts'",
                          [filename(Dir)]),
             exit(error)
     end.
@@ -180,7 +180,7 @@ dir_2(Name, Regexp, Dir, Env) ->
 
 dir_3(Name, Dir, Regexp, Env) ->
     Dir1 = filename:join(Dir, Name),
-    verbose("tidying directory `~s'.", [Dir1], Env#dir.options),
+    verbose("tidying directory `~ts'.", [Dir1], Env#dir.options),
     dir_1(Dir1, Regexp, Env).
 
 dir_4(File, Regexp, Env) ->
@@ -189,7 +189,7 @@ dir_4(File, Regexp, Env) ->
             Opts = [{outfile, File}, {dir, ""} | Env#dir.options],
             case catch file(File, Opts) of
                 {'EXIT', Value} ->
-                    warn("error tidying `~s'.~n~p", [File,Value], Opts);
+                    warn("error tidying `~ts'.~n~p", [File,Value], Opts);
                 _ ->
                     ok
             end;
@@ -314,7 +314,7 @@ file_2(Name, Opts) ->
     end.
 
 read_module(Name, Opts) ->
-    verbose("reading module `~s'.", [filename(Name)], Opts),
+    verbose("reading module `~ts'.", [filename(Name)], Opts),
     case epp_dodger:parse_file(Name, [no_fail]) of
         {ok, Forms} ->
             check_forms(Forms, Name),
@@ -335,7 +335,7 @@ check_forms(Fs, Name) ->
                                       "unknown error"
                               end,
                           report_error({Name, erl_syntax:get_pos(F),
-                                        "\n  ~s"}, [S]),
+                                        "\n  ~ts"}, [S]),
                           exit(error);
                       _ ->
                           ok
@@ -357,18 +357,18 @@ write_module(Tree, Name, Opts) ->
                        {value, directory} ->
                            ok;
                        {value, _} ->
-                           report_error("`~s' is not a directory.",
+                           report_error("`~ts' is not a directory.",
                                         [filename(Dir)]),
                            exit(error);
                        none ->
                            case file:make_dir(Dir) of
                                ok ->
-                                   verbose("created directory `~s'.",
+                                   verbose("created directory `~ts'.",
                                            [filename(Dir)], Opts),
                                    ok;
                                E ->
                                    report_error("failed to create "
-                                                "directory `~s'.",
+                                                "directory `~ts'.",
                                                 [filename(Dir)]),
                                    exit({make_dir, E})
                            end
@@ -385,7 +385,7 @@ write_module(Tree, Name, Opts) ->
     end,
     Printer = proplists:get_value(printer, Opts),
     FD = open_output_file(File, Encoding),
-    verbose("writing to file `~s'.", [File], Opts),
+    verbose("writing to file `~ts'.", [File], Opts),
     V = (catch {ok, output(FD, Printer, Tree, Opts++Encoding)}),
     ok = file:close(FD),
     case V of
@@ -471,7 +471,7 @@ backup_file_1(Name, Opts) ->
                          filename:basename(Name) ++ Suffix),
     case catch file:rename(Name, Dest) of
         ok ->
-            verbose("made backup of file `~s'.", [Name], Opts);
+            verbose("made backup of file `~ts'.", [Name], Opts);
         {error, R} ->
             error_backup_file(Name),
             exit({error, R});
@@ -1839,17 +1839,17 @@ report_export_vars(F, L, Type, Opts) ->
 	   [Type], Opts).
 
 error_read_file(Name) ->
-    report_error("error reading file `~s'.", [filename(Name)]).
+    report_error("error reading file `~ts'.", [filename(Name)]).
 
 error_write_file(Name) ->
-    report_error("error writing to file `~s'.", [filename(Name)]).
+    report_error("error writing to file `~ts'.", [filename(Name)]).
 
 error_backup_file(Name) ->
-    report_error("could not create backup of file `~s'.",
+    report_error("could not create backup of file `~ts'.",
                  [filename(Name)]).
 
 error_open_output(Name) ->
-    report_error("cannot open file `~s' for output.", [filename(Name)]).
+    report_error("cannot open file `~ts' for output.", [filename(Name)]).
 
 verbosity(Opts) ->
     case proplists:get_bool(quiet, Opts) of 
@@ -1908,9 +1908,9 @@ format({"", L, D}, Vs) when is_integer(L), L > 0 ->
 format({"", _L, D}, Vs) ->
     format(D, Vs);
 format({F, L, D}, Vs) when is_integer(L), L > 0 ->
-    [io_lib:fwrite("~s:~w: ", [filename(F), L]), format(D, Vs)];
+    [io_lib:fwrite("~ts:~w: ", [filename(F), L]), format(D, Vs)];
 format({F, _L, D}, Vs) ->
-    [io_lib:fwrite("~s: ", [filename(F)]), format(D, Vs)];
+    [io_lib:fwrite("~ts: ", [filename(F)]), format(D, Vs)];
 format(S, Vs) when is_list(S) ->
     [io_lib:fwrite(S, Vs), $\n].
 
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index 567bec00cb..d385c2b690 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -2749,7 +2749,7 @@ read_module(Name, Options) ->
     end.
 
 read_module_1(Name, Options) ->
-    verbose("reading module `~s'.", [filename(Name)], Options),
+    verbose("reading module `~ts'.", [filename(Name)], Options),
     {Forms, Enc} = read_module_2(Name, Options),
     case proplists:get_bool(comments, Options) of
 	false ->
@@ -2794,7 +2794,7 @@ check_forms([F | Fs], File) ->
 		    _ ->
 			"unknown error"
 		end,
-	    report_error("in file `~s' at line ~w:\n  ~ts",
+	    report_error("in file `~ts' at line ~w:\n  ~ts",
 			 [filename(File), erl_syntax:get_pos(F), S]),
 	    exit(error);
 	_ ->
@@ -2841,18 +2841,18 @@ write_module(Tree, Name, Dir, Opts) ->
 		       {value, directory} ->
 			   ok;
 		       {value, _} ->
-			   report_error("`~s' is not a directory.",
+			   report_error("`~ts' is not a directory.",
 					[Dir1]),
 			   exit(error);
 		       none ->
 			   case file:make_dir(Dir1) of
 			       ok ->
-				   verbose("created directory `~s'.",
+				   verbose("created directory `~ts'.",
 					   [Dir1], Opts),
 				   ok;
 			       E ->
 				   report_error("failed to create "
-						"directory `~s'.",
+						"directory `~ts'.",
 						[Dir1]),
 				   exit({make_dir, E})
 			   end
@@ -2870,7 +2870,7 @@ write_module(Tree, Name, Dir, Opts) ->
     Printer = proplists:get_value(printer, Opts),
     FD = open_output_file(File),
     ok = output_encoding(FD, Opts),
-    verbose("writing to file `~s'.", [File], Opts),
+    verbose("writing to file `~ts'.", [File], Opts),
     V = (catch {ok, output(FD, Printer, Tree, Opts)}),
     ok = file:close(FD),
     case V of
@@ -2911,7 +2911,7 @@ backup_file_1(Name, Opts) ->
 			 filename:basename(Name1) ++ Suffix),
     case catch file:rename(Name1, Dest) of
 	ok ->
-	    verbose("made backup of file `~s'.", [Name1], Opts);
+	    verbose("made backup of file `~ts'.", [Name1], Opts);
 	{error, R} ->
 	    error_backup_file(Name1),
 	    exit({error, R});
@@ -3036,19 +3036,19 @@ warning_apply_2(Module, Target) ->
 		   "possibly unsafe in `~s'.", [Module, Target]).
 
 error_open_output(Name) ->
-    report_error("cannot open file `~s' for output.", [filename(Name)]).
+    report_error("cannot open file `~ts' for output.", [filename(Name)]).
 
 error_read_file(Name) ->
-    report_error("error reading file `~s'.", [filename(Name)]).
+    report_error("error reading file `~ts'.", [filename(Name)]).
 
 error_read_file_info(Name) ->
-    report_error("error getting file info: `~s'.", [filename(Name)]).
+    report_error("error getting file info: `~ts'.", [filename(Name)]).
 
 error_write_file(Name) ->
-    report_error("error writing to file `~s'.", [filename(Name)]).
+    report_error("error writing to file `~ts'.", [filename(Name)]).
 
 error_backup_file(Name) ->
-    report_error("could not create backup of file `~s'.",
+    report_error("could not create backup of file `~ts'.",
 		 [filename(Name)]).
 
 verbose(S, Opts) ->