diff options
| author | Dan Gudmundsson <[email protected]> | 2016-11-08 09:50:13 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-11-08 09:50:13 +0100 |
| commit | 0805ac891e3a048e0d7382dec84b8682ad9c6c9c (patch) | |
| tree | a3c9aa157be5c0c7dc4640d946e48b96f80ccbd7 /lib/tools/emacs/erlang.el | |
| parent | d6eeabe7a49587ee26851a0e6796cbeb78628fab (diff) | |
| parent | 755b3c2c41012a54c7177aa88d9fc98f342fa5ff (diff) | |
| download | otp-0805ac891e3a048e0d7382dec84b8682ad9c6c9c.tar.gz otp-0805ac891e3a048e0d7382dec84b8682ad9c6c9c.tar.bz2 otp-0805ac891e3a048e0d7382dec84b8682ad9c6c9c.zip | |
Merge branch 'maint'
* maint:
New commands to ease looking up OTP documentation
Diffstat (limited to 'lib/tools/emacs/erlang.el')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index 2bde21dbed..12ef00f6a8 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -1442,6 +1442,11 @@ Other commands: (erlang-skel-init) (when (fboundp 'tempo-use-tag-list) (tempo-use-tag-list 'erlang-tempo-tags)) + (when (and (fboundp 'add-function) (fboundp 'erldoc-eldoc-function)) + (or eldoc-documentation-function + (setq-local eldoc-documentation-function #'ignore)) + (add-function :before-until (local 'eldoc-documentation-function) + #'erldoc-eldoc-function)) (run-hooks 'erlang-mode-hook) (if (zerop (buffer-size)) (run-hooks 'erlang-new-file-hook))) |