aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-02-08 12:06:50 +0100
committerGitHub <[email protected]>2017-02-08 12:06:50 +0100
commitd8f3e9c4760020b25ac279de283361459ae66a8d (patch)
tree7e09baeab038fcbecf3e9c3520658117970db724 /lib
parentc41a6e8a377534158b4fcaf07c5b260d80221dbd (diff)
parentd169327079c5e177d97f4fb949b1629f7095c07b (diff)
downloadotp-d8f3e9c4760020b25ac279de283361459ae66a8d.tar.gz
otp-d8f3e9c4760020b25ac279de283361459ae66a8d.tar.bz2
otp-d8f3e9c4760020b25ac279de283361459ae66a8d.zip
Merge pull request #1282 from leoliu/maint
[tools] Update erlang-edoc.el to include param and returns OTP-14217
Diffstat (limited to 'lib')
-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