aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-09-06 12:38:05 +0200
committerJohn Högberg <[email protected]>2017-09-06 12:38:05 +0200
commitad5d9eef3f41274f08008cdbb43afb2088d3276e (patch)
tree9d3263d517f6e3c20a5f2f855673f20efc302c9f /lib/tools
parent7394b41b9f254c7f83d508cfc615bd1d63a84507 (diff)
parenteed25a02ba2416c48587699542aaecdd09609718 (diff)
downloadotp-ad5d9eef3f41274f08008cdbb43afb2088d3276e.tar.gz
otp-ad5d9eef3f41274f08008cdbb43afb2088d3276e.tar.bz2
otp-ad5d9eef3f41274f08008cdbb43afb2088d3276e.zip
Merge branch 'lukas/erts/nif_vector_q/OTP-14598' into maint
OTP-14520
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 012de479d3..9a3985541b 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -931,6 +931,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"has_prepared_code_on_load"
"hibernate"
"insert_element"
+ "iolist_to_iovec"
"is_builtin"
"load_nif"
"loaded"