aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-10-25 09:06:54 +0200
committerFredrik Gustafsson <[email protected]>2013-10-25 09:06:54 +0200
commit609e1414a0685c2082d30f9d5c50ca65209a1236 (patch)
tree5bf5f9c6440c0e26f8c48bb2d67415c639e28e37 /lib
parent675fd1918de72b4d714c86108e2e6efe5ff3bcd6 (diff)
parent9464f00442433ec6165ff9b69858b86a8f7db832 (diff)
downloadotp-609e1414a0685c2082d30f9d5c50ca65209a1236.tar.gz
otp-609e1414a0685c2082d30f9d5c50ca65209a1236.tar.bz2
otp-609e1414a0685c2082d30f9d5c50ca65209a1236.zip
Merge branch 'puzza007/emacs_iodata_nonempty_string_builtin_types/OTP-11394' into maint
* puzza007/emacs_iodata_nonempty_string_builtin_types/OTP-11394: Add iodata, nonempty_string to built-in type highlighting for emacs
Diffstat (limited to 'lib')
-rw-r--r--lib/tools/emacs/erlang.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index b8699a616d..c395d22356 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -697,6 +697,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"char"
"cons"
"deep_string"
+ "iodata"
"iolist"
"maybe_improper_list"
"module"
@@ -708,6 +709,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"nonempty_list"
"nonempty_improper_list"
"nonempty_maybe_improper_list"
+ "nonempty_string"
"no_return"
"pos_integer"
"string"