diff options
author | Fredrik Gustafsson <[email protected]> | 2013-06-05 09:16:46 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-06-05 09:16:46 +0200 |
commit | d73dc3d3c6d85f0d2bb332458d5f52c576e27715 (patch) | |
tree | 11b40cff999956f053205a5f6689876d679c99c5 /lib | |
parent | 528c24a93685850b3f54d6c08a975b05b7ede55a (diff) | |
parent | 293374dc2ee6bc4dce2f3d1f0fa59c3a97bb82d2 (diff) | |
download | otp-d73dc3d3c6d85f0d2bb332458d5f52c576e27715.tar.gz otp-d73dc3d3c6d85f0d2bb332458d5f52c576e27715.tar.bz2 otp-d73dc3d3c6d85f0d2bb332458d5f52c576e27715.zip |
Merge branch 'fredrik/tools/emacs_bifs' into maint
* fredrik/tools/emacs_bifs:
tools: Added gather_gc_info_result to bifs
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tools/emacs/erlang.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index ddd22707dd..f3bc95e3e5 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -883,6 +883,7 @@ resulting regexp is surrounded by \\_< and \\_>." "fun_to_list" "function_exported" "garbage_collect_message_area" + "gather_gc_info_result" "gather_sched_wall_time_result" "get_cookie" "get_module_info" |