aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-06-06 01:48:32 +0200
committerRickard Green <[email protected]>2014-06-06 01:48:32 +0200
commit8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (patch)
treef32ea9f4a0a235707ce59fbbd76467d1ae1f59a0 /lib
parentfd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82 (diff)
parentd23496206b4892dae0efd053104d16904d1d8eab (diff)
downloadotp-8b4659d5246166cef9b8e9aa91c644e3b3ec66d5.tar.gz
otp-8b4659d5246166cef9b8e9aa91c644e3b3ec66d5.tar.bz2
otp-8b4659d5246166cef9b8e9aa91c644e3b3ec66d5.zip
Merge branch 'rickard/invalid_bitstr_bifs/OTP-11942' into maint
* rickard/invalid_bitstr_bifs/OTP-11942: Remove invalid 'bitstr' exports in erlang.erl
Diffstat (limited to 'lib')
-rw-r--r--lib/tools/emacs/erlang.el2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index ec5a1f4bc5..4e3c49c717 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -853,7 +853,6 @@ resulting regexp is surrounded by \\_< and \\_>."
"append_element"
"await_proc_exit"
"await_sched_wall_time_modifications"
- "bitstr_to_list"
"bump_reductions"
"call_on_load_function"
"cancel_timer"
@@ -899,7 +898,6 @@ resulting regexp is surrounded by \\_< and \\_>."
"hibernate"
"insert_element"
"is_builtin"
- "list_to_bitstr"
"load_nif"
"loaded"
"localtime"