diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
| commit | 69b928b12d9206d00879c08e46143f599f9dc34e (patch) | |
| tree | fde8905a6ca71c797725a33895321c67e81c3645 /lib/tools/emacs/erlang-edoc.el | |
| parent | 4b97d656a9e1774fd4ff984014f085ad661a4fdb (diff) | |
| parent | 1923315e618bea9fb23fc3237541f95a0accc266 (diff) | |
| download | otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.gz otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.bz2 otp-69b928b12d9206d00879c08e46143f599f9dc34e.zip | |
Merge branch 'master' into sverker/enif_select
Diffstat (limited to 'lib/tools/emacs/erlang-edoc.el')
| -rw-r--r-- | lib/tools/emacs/erlang-edoc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang-edoc.el b/lib/tools/emacs/erlang-edoc.el index 034036ad04..2801aa8ae7 100644 --- a/lib/tools/emacs/erlang-edoc.el +++ b/lib/tools/emacs/erlang-edoc.el @@ -78,7 +78,7 @@ '(("^%+\\s-*\\(@\\w+\\)\\_>" 1 'erlang-edoc-tag prepend) ("^%+\\s-*" ("{\\(@\\w+\\)\\_>" nil nil (1 'erlang-edoc-macro prepend))) ("^%+\\s-*" ("\\(?:@@\\)*\\(@[@{}]\\)" nil nil (1 'escape-glyph prepend))) - ("^%+\\s-*@\\(deprecated\\)\\_>" 1 font-lock-warning-face prepend) + ("^%+\\s-*\\(@deprecated\\)\\_>" 1 font-lock-warning-face prepend) ;; http://www.erlang.org/doc/apps/edoc/chapter.html#Wiki_notation ("^%+\\s-*" ("[^`]`\\([^`]?\\|[^`].*?[^']\\)'" (forward-char -1) nil (1 'erlang-edoc-verbatim prepend))) |