aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2017-10-17 14:53:23 +0200
committerHans Bolinder <[email protected]>2017-10-17 14:53:23 +0200
commit5b696724cc894691da09bef0675dde5e2c0adaa9 (patch)
treed5b5f0d8ea539ffe03040d213b2c3cb52ca877bb /lib/stdlib/src
parent62db6a63625ef67d7474da1efc8d4f65bfd8c251 (diff)
parentfc4b103d27e447ffb439adbdf39e5fea87a27b31 (diff)
downloadotp-5b696724cc894691da09bef0675dde5e2c0adaa9.tar.gz
otp-5b696724cc894691da09bef0675dde5e2c0adaa9.tar.bz2
otp-5b696724cc894691da09bef0675dde5e2c0adaa9.zip
Merge branch 'maint'
* maint: stdlib: Make ets:i/1 exit cleaner upon ^D (old Erlang shell)
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/ets.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 4858c8d13c..b6548626f3 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1700,6 +1700,8 @@ choice(Height, Width, P, Mode, Tab, Key, Turn, Opos) ->
io:format("~ts\n", [ErrorString]),
choice(Height, Width, P, Mode, Tab, Key, Turn, Opos)
end;
+ eof ->
+ ok;
_ ->
choice(Height, Width, P, Mode, Tab, Key, Turn, Opos)
end.