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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | lib/tools/emacs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile index 585425e5f1..e1b195ef97 100644 --- a/lib/tools/emacs/Makefile +++ b/lib/tools/emacs/Makefile @@ -43,6 +43,7 @@ EMACS_FILES= \ erlang_appwiz \ erlang-start \ erlang-eunit \ + erlang-edoc \ erlang-flymake \ erlang |