aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-09-06 12:42:28 +0200
committerJohn Högberg <[email protected]>2017-09-06 13:48:51 +0200
commit0cc04010ae73fcb591be4f35c00eb61b653cc0d0 (patch)
tree01f3790ea5682742297cb786cd676fb49ae21dc0 /lib/tools
parent28759f8cbde480be7782bac9169eeb9e4fb60bce (diff)
parentad5d9eef3f41274f08008cdbb43afb2088d3276e (diff)
downloadotp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.tar.gz
otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.tar.bz2
otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.zip
Merge branch 'maint' into john/erts/merge-zlib-and-vector-q
Diffstat (limited to 'lib/tools')
-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 e6e2050f29..46256daca9 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -936,6 +936,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"has_prepared_code_on_load"
"hibernate"
"insert_element"
+ "iolist_to_iovec"
"is_builtin"
"load_nif"
"loaded"