diff options
| author | Dan Gudmundsson <[email protected]> | 2014-09-10 12:56:16 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-09-10 12:56:16 +0200 |
| commit | 832625e71879f83e1f3f391cd65e42b8b7da5750 (patch) | |
| tree | f479c6b68c3be194094597c0bcfd14eee6571d71 /lib | |
| parent | 7af44569ffe0b453761fcd7d45a0408d523c5195 (diff) | |
| parent | 64a1a0ceaaee1201c5393ff00cb5b97828ffe549 (diff) | |
| download | otp-832625e71879f83e1f3f391cd65e42b8b7da5750.tar.gz otp-832625e71879f83e1f3f391cd65e42b8b7da5750.tar.bz2 otp-832625e71879f83e1f3f391cd65e42b8b7da5750.zip | |
Merge branch 'dgud/tools/emacs-fix' into maint
* dgud/tools/emacs-fix:
Add new bif to emacs mode
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 3 |
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" |