aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-06-12 09:51:22 +0200
committerErlang/OTP <[email protected]>2019-06-12 09:51:22 +0200
commitaa5a674421f5485bfd479ae4445ce66959dc1b75 (patch)
treee868a99f76fd57af9393d6310d8ac7a26d2eaf0a /lib/stdlib/src
parent28e30d0e5c3bfb97c739092996fa21308b3befd6 (diff)
parentacc3b04fb0128fca1770a3823b6651f632d73939 (diff)
downloadotp-aa5a674421f5485bfd479ae4445ce66959dc1b75.tar.gz
otp-aa5a674421f5485bfd479ae4445ce66959dc1b75.tar.bz2
otp-aa5a674421f5485bfd479ae4445ce66959dc1b75.zip
Merge branch 'hasse/stdlib/chars_limit_bug/OTP-15875/ERL-967' into maint-22
* hasse/stdlib/chars_limit_bug/OTP-15875/ERL-967: stdlib: Fix a bug concerning io_lib option 'chars_limit' # Conflicts: # lib/stdlib/test/io_SUITE.erl
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/io_lib_pretty.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 0cb3b01aae..77f02eafe0 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -462,7 +462,9 @@ find_upper(Lower, Term, T, Dl, Dd, D, RF, Enc, Str) ->
case If of
{_, _, _Dots=0, _} -> % even if Len > T
If;
- {_, Len, _, _} when Len =< T, D1 < D orelse D < 0 ->
+ {_, _Len=T, _, _} -> % increasing the depth is meaningless
+ If;
+ {_, Len, _, _} when Len < T, D1 < D orelse D < 0 ->
find_upper(If, Term, T, D1, Dd2, D, RF, Enc, Str);
_ ->
search_depth(Lower, If, Term, T, Dl, D1, RF, Enc, Str)