diff options
| author | Rickard Green <rickard@erlang.org> | 2014-06-06 01:49:42 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2014-06-06 01:49:42 +0200 |
| commit | c54a0025e6a4d152ba73e92a2007052ebde391bf (patch) | |
| tree | 96547f56d48c53d197a5a70acd167c0bdcdaf4af /lib/tools | |
| parent | d30fd47e2e886094d72d8dcb00f1392cabeda23f (diff) | |
| parent | 8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (diff) | |
| download | otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.tar.gz otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.tar.bz2 otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/tools')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 2 | ||||
| -rw-r--r-- | lib/tools/test/xref_SUITE.erl | 2 |
2 files changed, 1 insertions, 3 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" diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl index 353275ae3b..6870aefe5c 100644 --- a/lib/tools/test/xref_SUITE.erl +++ b/lib/tools/test/xref_SUITE.erl @@ -1098,7 +1098,6 @@ read_expected(Version) -> {POS1+1,{FF,{mod17,fun17,0}}}, {POS1+2,{FF,{erlang,spawn,1}}}, {POS1+2,{FF,{read,local,0}}}, - {POS1+3,{FF,{erlang,binary_to_term,1}}}, {POS1+3,{FF,{erlang,spawn,1}}}, {POS1+4,{FF,{dist,func,0}}}, {POS1+4,{FF,{erlang,spawn,1}}}, @@ -1207,6 +1206,7 @@ read_expected(Version) -> OKB1 = [{POS13+1,{FF,{erts_debug,apply,4}}}, {POS13+2,{FF,{erts_debug,apply,4}}}, {POS13+3,{FF,{erts_debug,apply,4}}}, + {POS1+3, {FF,{erlang,binary_to_term,1}}}, {POS3+1, {FF,{erlang,spawn,3}}}, {POS3+2, {FF,{erlang,spawn,3}}}, {POS3+3, {FF,{erlang,spawn_link,3}}}, |