From 67240584fd4594faafa9125036a13b52361f496f Mon Sep 17 00:00:00 2001
From: Andrey Teplyashin <andrey.teplyashin@eltex.loc>
Date: Tue, 30 Aug 2016 13:35:04 +0700
Subject: Support for unicode expander

---
 lib/stdlib/src/edlin_expand.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stdlib/src/edlin_expand.erl b/lib/stdlib/src/edlin_expand.erl
index ec64470461..5f821caef0 100644
--- a/lib/stdlib/src/edlin_expand.erl
+++ b/lib/stdlib/src/edlin_expand.erl
@@ -118,7 +118,7 @@ format_col([A|T], Width, Len, Acc0) ->
 	    {H1, _} -> H1;
  	    H2 -> H2
  	end,
-    Acc = [io_lib:format("~-*s", [Width,H]) | Acc0],
+    Acc = [io_lib:format("~-*ts", [Width,H]) | Acc0],
     format_col(T, Width, Len+Width, Acc);
 format_col([], _, _, Acc) ->
     lists:reverse(Acc, "\n").
-- 
cgit v1.2.3


From 8d0490a14b3cb647afe0ac3d678fcbdc19efa851 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Fri, 23 Sep 2016 15:41:25 +0200
Subject: stdlib: Add a testcase for Unicode expander

---
 lib/stdlib/test/edlin_expand_SUITE.erl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index ccffa2e244..718d91c6a3 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -21,7 +21,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
--export([normal/1, quoted_fun/1, quoted_module/1, quoted_both/1]).
+-export([normal/1, quoted_fun/1, quoted_module/1, quoted_both/1, erl_1152/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -36,7 +36,7 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() -> 
-    [normal, quoted_fun, quoted_module, quoted_both].
+    [normal, quoted_fun, quoted_module, quoted_both, erl_1152].
 
 groups() -> 
     [].
@@ -149,5 +149,12 @@ quoted_both(Config) when is_list(Config) ->
     {yes,"weird-fun-name'()",[]} = do_expand("'ExpandTestCaps1':'#"),
     ok.
 
+erl_1152(Config) when is_list(Config) ->
+    "\n"++"foo"++"    "++[1089]++_ = do_format(["foo",[1089]]),
+    ok.
+
 do_expand(String) ->
     edlin_expand:expand(lists:reverse(String)).
+
+do_format(StringList) ->
+    lists:flatten(edlin_expand:format_matches(StringList)).
-- 
cgit v1.2.3