about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-05-06 10:44:06 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-06 10:49:35 -0700
commit948526134b6e8a4308381f7c4ef4ebf49efdfb1c (patch)
tree41e02e80a5a1bd48f83324418b9cdc5fc7303910
parentc600dc0f535b4afc7722bda4154e35f948e3f6b2 (diff)
downloadrust-948526134b6e8a4308381f7c4ef4ebf49efdfb1c.tar.gz
rust-948526134b6e8a4308381f7c4ef4ebf49efdfb1c.zip
etc: Add box as a keyword to editor configs
This keyword is about to be used much more often than it was a few weeks ago,
it's time to tell editors about the new keyword.
-rw-r--r--src/doc/rust.md2
-rw-r--r--src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang1
-rw-r--r--src/etc/kate/rust.xml1
-rw-r--r--src/etc/vim/syntax/rust.vim2
4 files changed, 4 insertions, 2 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md
index 12d2911f529..45465a6a21c 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -204,7 +204,7 @@ The keywords are the following strings:
 
 ~~~~ {.notrust .keyword}
 as
-break
+box break
 crate
 else enum extern
 false fn for
diff --git a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang
index 7ffa35b94e4..7c9780456cf 100644
--- a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang
+++ b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang
@@ -38,6 +38,7 @@
 		<keyword>as</keyword>
 		<keyword>assert</keyword>
 		<keyword>break</keyword>
+		<keyword>box</keyword>
 		<keyword>const</keyword>
 		<keyword>continue</keyword>
 		<keyword>crate</keyword>
diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml
index 367d2738ab3..c28107fe9fa 100644
--- a/src/etc/kate/rust.xml
+++ b/src/etc/kate/rust.xml
@@ -18,6 +18,7 @@
 	<list name="keywords">
 		<item> as </item>
 		<item> break </item>
+		<item> box </item>
 		<item> continue </item>
 		<item> crate </item>
 		<item> do </item>
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index f937fd8caa6..765096933d1 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -18,7 +18,7 @@ syn keyword   rustOperator    as
 
 syn match     rustAssert      "\<assert\(\w\)*!" contained
 syn match     rustFail        "\<fail\(\w\)*!" contained
-syn keyword   rustKeyword     break continue
+syn keyword   rustKeyword     break box continue
 syn keyword   rustKeyword     extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite
 syn keyword   rustKeyword     for in if impl let
 syn keyword   rustKeyword     loop once priv pub