diff options
| author | bors <bors@rust-lang.org> | 2013-02-25 20:24:40 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-25 20:24:40 -0800 |
| commit | 40ffaeaea8f434d59f5dffbe8fc7be958a625e03 (patch) | |
| tree | 445f150a090d9084a7025c3286350a5a140702b9 | |
| parent | 9616b3d11ed947d6bf284bbc088ffc047824203f (diff) | |
| parent | 4bf94a7b30eeebd820a341890f05e5b709a6d2f2 (diff) | |
| download | rust-40ffaeaea8f434d59f5dffbe8fc7be958a625e03.tar.gz rust-40ffaeaea8f434d59f5dffbe8fc7be958a625e03.zip | |
auto merge of #5103 : dbaupp/rust/emacs-mode-update, r=graydon
Copy the keyword list from rust.vim, and add `self` so that it is highlighted (being liberal with the correct categories). I'm not quite willing to dive in to clean up the emacs code yet, but at least this gets a (more) modern syntax highlighting list.
| -rw-r--r-- | src/etc/emacs/rust-mode.el | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el index 5fbd2ab67c2..5a6acbaddda 100644 --- a/src/etc/emacs/rust-mode.el +++ b/src/etc/emacs/rust-mode.el @@ -66,22 +66,17 @@ "trait" "struct" "fn" "enum" "impl")) (puthash word 'def table)) - (dolist (word '("again" "assert" - "break" - "copy" - "do" "drop" - "else" "export" "extern" - "fail" "for" - "if" "use" - "let" "log" "loop" - "move" "new" - "pure" "pub" "priv" - "ref" "return" "static" - "unchecked" "unsafe" - "while")) + (dolist (word '("as" "break" + "copy" "do" "drop" "else" + "extern" "for" "if" "let" "log" + "loop" "once" "priv" "pub" "pure" + "ref" "return" "static" "unsafe" "use" + "while" "while" + "assert" + "mut")) (puthash word t table)) (puthash "match" 'alt table) - (dolist (word '("true" "false")) (puthash word 'atom table)) + (dolist (word '("self" "true" "false")) (puthash word 'atom table)) table)) ;; FIXME type-context keywords |