aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-02-20 10:50:32 +0100
committerLukas Larsson <[email protected]>2014-02-20 10:50:32 +0100
commit22f6c2e3d24d00931aa9ff9a54817f6a7a61fe3d (patch)
treef7669d5d810c4491f4752ffdf37a31e5fc29055f
parentb1bb2f339698ac5abdc6f821025c1c638e9a772f (diff)
parentcea7cd72e0274d4ea3eb4b15ae5c922e8b4fd781 (diff)
downloadotp-22f6c2e3d24d00931aa9ff9a54817f6a7a61fe3d.tar.gz
otp-22f6c2e3d24d00931aa9ff9a54817f6a7a61fe3d.tar.bz2
otp-22f6c2e3d24d00931aa9ff9a54817f6a7a61fe3d.zip
Merge branch 'lukas/tools/fix_maps_in_emacs_mode/OTP-11616'
* lukas/tools/fix_maps_in_emacs_mode/OTP-11616: tools: Update emacs mode with map highlights
-rw-r--r--lib/tools/emacs/erlang.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 3a868f1300..f007f780eb 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -664,6 +664,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"is_function"
"is_integer"
"is_list"
+ "is_map"
"is_number"
"is_pid"
"is_port"
@@ -715,7 +716,8 @@ resulting regexp is surrounded by \\_< and \\_>."
"pos_integer"
"string"
"term"
- "timeout")
+ "timeout"
+ "map")
"Erlang type specs types"))
(eval-and-compile
@@ -772,6 +774,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"is_function"
"is_integer"
"is_list"
+ "is_map"
"is_number"
"is_pid"
"is_port"
@@ -791,6 +794,7 @@ resulting regexp is surrounded by \\_< and \\_>."
"list_to_tuple"
"load_module"
"make_ref"
+ "map_size"
"max"
"min"
"module_loaded"