diff options
| author | Hans Bolinder <[email protected]> | 2016-11-29 12:11:03 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-11-29 12:11:03 +0100 |
| commit | 9f53c8b543488438551061218fb276bbe41c925f (patch) | |
| tree | bdce9ad53ef26d2cc788975c6d0fe5b06578dd01 | |
| parent | cdcb2376b37a218a2847086b3c56e05dc99b1e02 (diff) | |
| parent | 45fee41645692678a18c9c1a4fb85aa1e437b2fa (diff) | |
| download | otp-9f53c8b543488438551061218fb276bbe41c925f.tar.gz otp-9f53c8b543488438551061218fb276bbe41c925f.tar.bz2 otp-9f53c8b543488438551061218fb276bbe41c925f.zip | |
Merge branch 'maint'
* maint:
Fix font-locking for @deprecated in erlang-edoc-mode
| -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))) |