diff options
| author | Hans Bolinder <[email protected]> | 2016-11-29 12:04:18 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-11-29 12:04:18 +0100 |
| commit | 45fee41645692678a18c9c1a4fb85aa1e437b2fa (patch) | |
| tree | f5579cb021bfbf85cdd9d2a2bb2125f62c1fdc20 /lib/tools/emacs | |
| parent | db6f4adc01afb8efac35111870f4c9bf5cfcf270 (diff) | |
| parent | 0a1d0677805ade9cb10bd2ec00372a34db79d805 (diff) | |
| download | otp-45fee41645692678a18c9c1a4fb85aa1e437b2fa.tar.gz otp-45fee41645692678a18c9c1a4fb85aa1e437b2fa.tar.bz2 otp-45fee41645692678a18c9c1a4fb85aa1e437b2fa.zip | |
Merge branch 'leoliu/tools/fix_edoc_mode' into maint
* leoliu/tools/fix_edoc_mode:
Fix font-locking for @deprecated in erlang-edoc-mode
Diffstat (limited to 'lib/tools/emacs')
| -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))) |