aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-09-17 13:08:27 +0200
committerHenrik Nord <[email protected]>2015-09-17 13:08:27 +0200
commit906d515b76abd98b7c0db52db484d2d7a0ba70bf (patch)
tree77c0198c1c1005c80eb6b728eb1a6c751f7fad16 /lib
parent92566fedf24762545f4f7527b9306eb4fd4a9ff9 (diff)
parent6c9f25aafc8682387f13f6a6ac505ffaeff476c0 (diff)
downloadotp-906d515b76abd98b7c0db52db484d2d7a0ba70bf.tar.gz
otp-906d515b76abd98b7c0db52db484d2d7a0ba70bf.tar.bz2
otp-906d515b76abd98b7c0db52db484d2d7a0ba70bf.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/shell.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index c64123a207..f215a66812 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -23,7 +23,7 @@
-export([whereis_evaluator/0, whereis_evaluator/1]).
-export([start_restricted/1, stop_restricted/0]).
-export([local_allowed/3, non_local_allowed/3]).
--export([prompt_func/1, strings/1]).
+-export([catch_exception/1, prompt_func/1, strings/1]).
-define(LINEMAX, 30).
-define(CHAR_MAX, 60).