summaryrefslogtreecommitdiff
path: root/rust-mode.el
diff options
context:
space:
mode:
authorTom Jakubowski <tom@crystae.net>2014-06-17 05:25:30 -0700
committerTom Jakubowski <tom@crystae.net>2014-06-17 16:38:19 -0700
commita8fad0f6dd12d8c6a9bcb7af95d6a2e62a06389c (patch)
tree98a135ef256e684fb8a7fe424dba7d5f4f9d0ffb /rust-mode.el
parente2cd79b239299d14020394c9aac6cf82f6a3d158 (diff)
downloadrust-mode-a8fad0f6dd12d8c6a9bcb7af95d6a2e62a06389c.tar.gz
emacs: Don't overwrite font lock for attributes
This addresses the font lock regression introduced by the earlier pull request #14818 - attributes are no longer be highligted inside of comments and strings. Also add some font lock test infrastructure and some tests for attribute font locking.
Diffstat (limited to 'rust-mode.el')
-rw-r--r--rust-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/rust-mode.el b/rust-mode.el
index 67f4951..beb2e65 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -214,7 +214,7 @@
;; Attributes like `#[bar(baz)]` or `#![bar(baz)]` or `#[bar = "baz"]`
(,(rust-re-grab (concat "#\\!?\\[" rust-re-ident "[^]]*\\]"))
- 1 font-lock-preprocessor-face t)
+ 1 font-lock-preprocessor-face keep)
;; Syntax extension invocations like `foo!`, highlight including the !
(,(concat (rust-re-grab (concat rust-re-ident "!")) "[({[:space:][]")