diff options
| author | Bruce Yinhe <[email protected]> | 2014-07-07 11:37:06 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-07-07 11:37:06 +0200 |
| commit | 3cdc67f07cad5982be5428eba532619109861915 (patch) | |
| tree | 71c1a8e4b603b1690ffbca5a9b561ebfc08fde38 /lib | |
| parent | 980d7fa32128d43d36fb9527df1967eff801be9c (diff) | |
| parent | 4a1ffc3b3666436a92532e242bde9f5b67902469 (diff) | |
| download | otp-3cdc67f07cad5982be5428eba532619109861915.tar.gz otp-3cdc67f07cad5982be5428eba532619109861915.tar.bz2 otp-3cdc67f07cad5982be5428eba532619109861915.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/io_lib_format.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/io_SUITE.erl | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl index 56e15a17ec..89ae6fb187 100644 --- a/lib/stdlib/src/io_lib_format.erl +++ b/lib/stdlib/src/io_lib_format.erl @@ -255,7 +255,7 @@ term(T, none, _Adj, none, _Pad) -> T; term(T, none, Adj, P, Pad) -> term(T, P, Adj, P, Pad); term(T, F, Adj, P0, Pad) -> L = lists:flatlength(T), - P = case P0 of none -> erlang:min(L, F); _ -> P0 end, + P = erlang:min(L, case P0 of none -> F; _ -> min(P0, F) end), if L > P -> adjust(chars($*, P), chars(Pad, F-P), Adj); diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl index 5a8971c071..3a76275f31 100644 --- a/lib/stdlib/test/io_SUITE.erl +++ b/lib/stdlib/test/io_SUITE.erl @@ -30,7 +30,7 @@ io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1, printable_range/1, io_lib_print_binary_depth_one/1, otp_10302/1, otp_10755/1, - otp_10836/1]). + otp_10836/1, io_lib_width_too_small/1]). -export([pretty/2]). @@ -69,7 +69,8 @@ all() -> io_lib_collect_line_3_wb, cr_whitespace_in_string, io_fread_newlines, otp_8989, io_lib_fread_literal, printable_range, - io_lib_print_binary_depth_one, otp_10302, otp_10755, otp_10836]. + io_lib_print_binary_depth_one, otp_10302, otp_10755, otp_10836, + io_lib_width_too_small]. groups() -> []. @@ -2213,3 +2214,8 @@ compile_file(File, Text, Config) -> try compile:file(Fname, [return]) after ok %file:delete(Fname) end. + +io_lib_width_too_small(Config) -> + "**" = lists:flatten(io_lib:format("~2.3w", [3.14])), + "**" = lists:flatten(io_lib:format("~2.5w", [3.14])), + ok. |