about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2014-04-02 23:50:20 +0200
committerAlex Crichton <alex@alexcrichton.com>2014-04-03 13:43:40 -0700
commit1a1c47b91824bae040ddc2d799e14365b5415762 (patch)
tree0209721e5e55bd6a5a668fa65f31dcda3612c159 /src
parent898669c4e203ae91e2048fb6c0f8591c867bccc6 (diff)
downloadrust-1a1c47b91824bae040ddc2d799e14365b5415762.tar.gz
rust-1a1c47b91824bae040ddc2d799e14365b5415762.zip
Update emacs mode to support new `#![inner(attribute)]` syntax.
Diffstat (limited to 'src')
-rw-r--r--src/etc/emacs/rust-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
index 3a99af3446c..5cee600c2c0 100644
--- a/src/etc/emacs/rust-mode.el
+++ b/src/etc/emacs/rust-mode.el
@@ -196,8 +196,8 @@
      ;; Special types
      (,(regexp-opt rust-special-types 'words) . font-lock-type-face)
 
-     ;; Attributes like `#[bar(baz)]`
-     (,(rust-re-grab (concat "#\\[" rust-re-ident "[^]]*\\]"))
+     ;; Attributes like `#[bar(baz)]` or `#![bar(baz)]`
+     (,(rust-re-grab (concat "#\\!?[" rust-re-ident "[^]]*\\]"))
       1 font-lock-preprocessor-face)
 
      ;; Syntax extension invocations like `foo!`, highlight including the !