aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-09-10 12:59:28 +0200
committerDan Gudmundsson <[email protected]>2014-09-10 12:59:28 +0200
commit08c6c7b0f5cef8e3851ee23adcb9b8235f9b44d8 (patch)
tree19d64553a5b749330d0b0857facd5aab39d3f5fe
parent45f9f2051a1c8fd18be13442a7f12bea7d84a911 (diff)
parent832625e71879f83e1f3f391cd65e42b8b7da5750 (diff)
downloadotp-08c6c7b0f5cef8e3851ee23adcb9b8235f9b44d8.tar.gz
otp-08c6c7b0f5cef8e3851ee23adcb9b8235f9b44d8.tar.bz2
otp-08c6c7b0f5cef8e3851ee23adcb9b8235f9b44d8.zip
Merge branch 'maint'
-rw-r--r--lib/tools/emacs/erlang.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 4e3c49c717..c56759ebb9 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -7,7 +7,7 @@
;; %CopyrightBegin%
;;
-;; Copyright Ericsson AB 1996-2013. All Rights Reserved.
+;; Copyright Ericsson AB 1996-2014. All Rights Reserved.
;;
;; The contents of this file are subject to the Erlang Public License,
;; Version 1.1, (the "License"); you may not use this file except in
@@ -886,6 +886,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"flush_monitor_message"
"format_cpu_topology"
"fun_info"
+ "fun_info_mfa"
"fun_to_list"
"function_exported"
"garbage_collect_message_area"