diff options
| author | bors <bors@rust-lang.org> | 2013-12-14 19:41:42 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-14 19:41:42 -0800 |
| commit | 8f6df87c1d876895a7e313728b43d9710ae682bb (patch) | |
| tree | 105c5e8b4107d8b114bd01a292790c3f7ad824b0 /src | |
| parent | ca54ad8592087dfe7d2b422f35d75f3932c1991b (diff) | |
| parent | d7c949368c0df7a17a87e0597e4948c533ecac43 (diff) | |
| download | rust-8f6df87c1d876895a7e313728b43d9710ae682bb.tar.gz rust-8f6df87c1d876895a7e313728b43d9710ae682bb.zip | |
auto merge of #10968 : MicahChalmer/rust/emacs-proc-keyword, r=metajack
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/emacs/rust-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el index 66cc3c3d472..f30cfaf8d15 100644 --- a/src/etc/emacs/rust-mode.el +++ b/src/etc/emacs/rust-mode.el @@ -134,7 +134,7 @@ "if" "impl" "in" "let" "loop" "match" "mod" "mut" - "priv" "pub" + "priv" "proc" "pub" "ref" "return" "self" "static" "struct" "super" "true" "trait" "type" |