diff options
author | Dan Gudmundsson <[email protected]> | 2016-10-07 10:04:56 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2016-10-07 10:04:56 +0200 |
commit | 672c14dc0ed9e681856932c58b26d08f3d449e71 (patch) | |
tree | 1750c85999e0bf7946d7d3b49e18d441f356f8ec /lib/tools/emacs/erlang-start.el | |
parent | e9bb2e8797931efefac711d1b6d0de9571024c4d (diff) | |
parent | 668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47 (diff) | |
download | otp-672c14dc0ed9e681856932c58b26d08f3d449e71.tar.gz otp-672c14dc0ed9e681856932c58b26d08f3d449e71.tar.bz2 otp-672c14dc0ed9e681856932c58b26d08f3d449e71.zip |
Merge branch 'maint'
* maint:
New file erlang-edoc.el to support EDoc in erlang-mode
Allow reusing mnesia select continuations
Fix guard test for chardata
Diffstat (limited to 'lib/tools/emacs/erlang-start.el')
-rw-r--r-- | lib/tools/emacs/erlang-start.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang-start.el b/lib/tools/emacs/erlang-start.el index 76e0575e68..f9a6d24b2c 100644 --- a/lib/tools/emacs/erlang-start.el +++ b/lib/tools/emacs/erlang-start.el @@ -78,6 +78,7 @@ (autoload 'erlang-find-tag-other-window "erlang" "Like `find-tag-other-window'. Capable of retreiving Erlang modules.") +(autoload 'erlang-edoc-mode "erlang-edoc" "Toggle Erlang-Edoc mode on or off." t) ;; ;; Associate files extensions ".erl" and ".hrl" with Erlang mode. |