diff options
| author | Henrik Nord <[email protected]> | 2015-09-17 09:22:52 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-09-17 09:22:52 +0200 |
| commit | 2f3556934883d7b249a322d3a52db04e78d3a591 (patch) | |
| tree | 9dab6b50afabd1f692b59df21812db61c16bec4f /lib | |
| parent | 1fe8cdfd8e29000cb54d6fd8830d7d711dab0c9d (diff) | |
| parent | b602ed02a44e2cb6eec2d8e79f723cf607138934 (diff) | |
| download | otp-2f3556934883d7b249a322d3a52db04e78d3a591.tar.gz otp-2f3556934883d7b249a322d3a52db04e78d3a591.tar.bz2 otp-2f3556934883d7b249a322d3a52db04e78d3a591.zip | |
Merge branch 'leoliu/export-catch_exception' into maint
* leoliu/export-catch_exception:
Export shell:catch_exception/1 as documented
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/shell.erl | 2 |
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). |