From: bors <bors@rust-lang.org>
Date: Wed, 11 Dec 2013 16:21:21 +0000 (-0800)
Subject: auto merge of #10888 : chris-morgan/rust/2013-12-10-vim-updates, r=thestinger
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=f41b4e351b4fface2ad3c4b74912837c4059d56a;p=rust.git

auto merge of #10888 : chris-morgan/rust/2013-12-10-vim-updates, r=thestinger

### Fix up float highlighting in Vim.

This fixes a regression introduced in #10793.

Having a colorscheme which highlights Float the same as Number (I
believe most do), I hadn't noticed that having the special case of "5."
floats (which was one of the added features in #10793) last made it take
precedence, and so it was left to @thestinger to notice it.

The regression meant that in `5.0`, the `5.` was a `rustFloat` (linked
by default to `Float`) and the `0` was a `rustDecNumber` (linked by
default to `Number`), and for `5.0f32` the `5.` was a `rustFloat` and
the `0f32` was a second `rustFloat` (and thus appeared correctly, though
for the wrong reason).

### Vim keyword highlighting improvements.

- Removed the `log` keyword;
- Removed keyword duplicates;
- Highlighted `const` as `Error` rather than `StorageClass`; and
- Highlighted all the reserved keywords as `Error` rather than as
  `Keyword`.

(As usual, these highlightings can be overridden if desired.)
---

f41b4e351b4fface2ad3c4b74912837c4059d56a