diff options
| author | Dan Gudmundsson <[email protected]> | 2015-06-15 08:15:10 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-06-15 08:15:10 +0200 |
| commit | 75e0da6a5c5c6b2ac21dfdffb1feb9ac96834e5d (patch) | |
| tree | bdcb0a998491acd65f41932c9d62c6e9e1723cad /lib/tools | |
| parent | 8e49f765b5a467cf47d64f873e5feb226e3f7cae (diff) | |
| parent | 895041205f8b1d720aaa4532b50e77246d1cbbca (diff) | |
| download | otp-75e0da6a5c5c6b2ac21dfdffb1feb9ac96834e5d.tar.gz otp-75e0da6a5c5c6b2ac21dfdffb1feb9ac96834e5d.tar.bz2 otp-75e0da6a5c5c6b2ac21dfdffb1feb9ac96834e5d.zip | |
Merge branch 'dgud/emacs/bifs'
* dgud/emacs/bifs:
tools: Add new bifs to emacs highlighter
Diffstat (limited to 'lib/tools')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index 3610356355..ca194703bb 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -880,10 +880,10 @@ resulting regexp is surrounded by \\_< and \\_>." "dt_restore_tag" "dt_spread_tag" "dunlink" + "convert_time_unit" "external_size" "finish_after_on_load" "finish_loading" - "flush_monitor_message" "format_cpu_topology" "fun_info" "fun_info_mfa" @@ -913,6 +913,7 @@ resulting regexp is surrounded by \\_< and \\_>." "memory" "module_info" "monitor_node" + "monotonic_time" "nif_error" "phash" "phash2" @@ -946,13 +947,17 @@ resulting regexp is surrounded by \\_< and \\_>." "system_info" "system_monitor" "system_profile" + "system_time" "trace" "trace_delivered" "trace_info" "trace_pattern" + "time_offset" + "timestamp" "universaltime" "universaltime_to_localtime" "universaltime_to_posixtime" + "unique_integer" "yield") "Erlang built-in functions (BIFs) that needs erlang: prefix")) |