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/stdlib/src | |
| 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/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/io_lib_format.erl | 2 |
1 files changed, 1 insertions, 1 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); |