aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/emacs/erlang-start.el
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-11-08 09:47:56 +0100
committerDan Gudmundsson <[email protected]>2016-11-08 09:47:56 +0100
commit755b3c2c41012a54c7177aa88d9fc98f342fa5ff (patch)
tree3ce634b5ecf6edd2337ce105c986a60371438482 /lib/tools/emacs/erlang-start.el
parentf294715ec476e2396a61b743c219312dafe6eed9 (diff)
parentcec4b8ac171686b53ff730c23d90ef25039e6791 (diff)
downloadotp-755b3c2c41012a54c7177aa88d9fc98f342fa5ff.tar.gz
otp-755b3c2c41012a54c7177aa88d9fc98f342fa5ff.tar.bz2
otp-755b3c2c41012a54c7177aa88d9fc98f342fa5ff.zip
Merge branch 'leoliu/tools/emacs-erldoc/PR-1197/OTP-14018' into maint
* leoliu/tools/emacs-erldoc/PR-1197/OTP-14018: New commands to ease looking up OTP documentation
Diffstat (limited to 'lib/tools/emacs/erlang-start.el')
-rw-r--r--lib/tools/emacs/erlang-start.el14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang-start.el b/lib/tools/emacs/erlang-start.el
index f9a6d24b2c..160057e179 100644
--- a/lib/tools/emacs/erlang-start.el
+++ b/lib/tools/emacs/erlang-start.el
@@ -78,9 +78,23 @@
(autoload 'erlang-find-tag-other-window "erlang"
"Like `find-tag-other-window'. Capable of retreiving Erlang modules.")
+;;
+;; Declare functions in "erlang-edoc.el".
+;;
+
(autoload 'erlang-edoc-mode "erlang-edoc" "Toggle Erlang-Edoc mode on or off." t)
;;
+;; Declare functions in "erldoc.el".
+;;
+
+(autoload 'erldoc-browse "erldoc" "\n\n(fn MFA)" t nil)
+(autoload 'erldoc-browse-topic "erldoc" "\n\n(fn TOPIC)" t nil)
+(autoload 'erldoc-apropos "erldoc" "\n\n(fn PATTERN)" t nil)
+(autoload 'erldoc-eldoc-function "erldoc" "\
+A function suitable for `eldoc-documentation-function'.\n\n(fn)" nil nil)
+
+;;
;; Associate files extensions ".erl" and ".hrl" with Erlang mode.
;;