aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-06-05 09:16:55 +0200
committerFredrik Gustafsson <[email protected]>2013-06-05 09:16:55 +0200
commitbef52cfebbbdc1f11f23387883a1e64a5d98fccc (patch)
tree1c3dd72ebf84d566cb0369a4d70273f3aab5271d
parentb2c5216804b4470066414977026cf8de76d005c5 (diff)
parentd73dc3d3c6d85f0d2bb332458d5f52c576e27715 (diff)
downloadotp-bef52cfebbbdc1f11f23387883a1e64a5d98fccc.tar.gz
otp-bef52cfebbbdc1f11f23387883a1e64a5d98fccc.tar.bz2
otp-bef52cfebbbdc1f11f23387883a1e64a5d98fccc.zip
Merge branch 'maint'
-rw-r--r--lib/tools/emacs/erlang.el1
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"