aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-02-08 12:08:52 +0100
committerDan Gudmundsson <[email protected]>2017-02-08 12:08:52 +0100
commitfc4b84d9d2fd96280a5c4d7bb84fe1592e46fd0b (patch)
treec1cf24846e0a0c4eecb264350df1ed6ef40041a3
parent835f29dd5bf75a25138ac723ea8644c0b4fce80c (diff)
parentd8f3e9c4760020b25ac279de283361459ae66a8d (diff)
downloadotp-fc4b84d9d2fd96280a5c4d7bb84fe1592e46fd0b.tar.gz
otp-fc4b84d9d2fd96280a5c4d7bb84fe1592e46fd0b.tar.bz2
otp-fc4b84d9d2fd96280a5c4d7bb84fe1592e46fd0b.zip
Merge branch 'maint'
* maint: [tools] Update erlang-edoc.el to include @param and @returns
-rw-r--r--lib/tools/emacs/erlang-edoc.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/tools/emacs/erlang-edoc.el b/lib/tools/emacs/erlang-edoc.el
index 2801aa8ae7..241590b850 100644
--- a/lib/tools/emacs/erlang-edoc.el
+++ b/lib/tools/emacs/erlang-edoc.el
@@ -36,7 +36,7 @@
"Tags that can be used anywhere within a module.")
(defvar erlang-edoc-overview-tags
- '("author" "copyright" "reference" "see" "since" "title" "version")
+ '("author" "copyright" "doc" "reference" "see" "since" "title" "version")
"Tags that can be used in an overview file.")
(defvar erlang-edoc-module-tags
@@ -45,8 +45,8 @@
"Tags that can be used before a module declaration.")
(defvar erlang-edoc-function-tags
- '("deprecated" "doc" "equiv" "hidden" "private" "see" "since" "spec"
- "throws" "type")
+ '("deprecated" "doc" "equiv" "hidden" "param" "private" "returns"
+ "see" "since" "spec" "throws" "type")
"Tags that can be used before a function definition.")
(defvar erlang-edoc-predefined-macros