diff options
| author | bors <bors@rust-lang.org> | 2014-01-23 05:56:30 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-23 05:56:30 -0800 |
| commit | 657e3530225410d167d7f1ee827f15bc69cd965e (patch) | |
| tree | fb0680ede9a60ad3eac546d1ff516799590307fb /src | |
| parent | 7cabd4032053f61d4697169d08ca3713a507a90a (diff) | |
| parent | a2dab3c46e986b2ac63e06b67fc119a5a694723c (diff) | |
| download | rust-657e3530225410d167d7f1ee827f15bc69cd965e.tar.gz rust-657e3530225410d167d7f1ee827f15bc69cd965e.zip | |
auto merge of #11739 : thestinger/rust/rm-old-ext, r=alexcrichton
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang | 2 | ||||
| -rw-r--r-- | src/etc/gedit/share/mime/packages/rust.xml | 1 | ||||
| -rw-r--r-- | src/etc/kate/rust.xml | 2 | ||||
| -rw-r--r-- | src/etc/vim/ftdetect/rust.vim | 2 |
4 files changed, 3 insertions, 4 deletions
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 b8841ebe568..43700c02b75 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 @@ -5,7 +5,7 @@ <language id="rust" _name="Rust" version="2.0" _section="Sources"> <metadata> <property name="mimetypes">text/x-rust</property> - <property name="globs">*.rs;*.rc</property> + <property name="globs">*.rs</property> <property name="line-comment-start">//</property> <property name="block-comment-start">/*</property> <property name="block-comment-end">*/</property> diff --git a/src/etc/gedit/share/mime/packages/rust.xml b/src/etc/gedit/share/mime/packages/rust.xml index d75cffe9600..ede1c14907c 100644 --- a/src/etc/gedit/share/mime/packages/rust.xml +++ b/src/etc/gedit/share/mime/packages/rust.xml @@ -2,6 +2,5 @@ <mime-type type="text/x-rust"> <comment>Rust Source</comment> <glob pattern="*.rs"/> - <glob pattern="*.rc"/> </mime-type> </mime-info> diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index db479e468d5..c1c5215ac0f 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -7,7 +7,7 @@ <!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*"> <!ENTITY rustIntSuf "([iu](8|16|32|64)?)?"> ]> -<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15"> +<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15"> <highlighting> <list name="fn"> <item> fn </item> diff --git a/src/etc/vim/ftdetect/rust.vim b/src/etc/vim/ftdetect/rust.vim index 10b616277c8..bf685d43243 100644 --- a/src/etc/vim/ftdetect/rust.vim +++ b/src/etc/vim/ftdetect/rust.vim @@ -1 +1 @@ -au BufRead,BufNewFile *.rs,*.rc set filetype=rust +au BufRead,BufNewFile *.rs set filetype=rust |