---

yaml
---
r: 29881
b: refs/heads/incoming
c: 4e91f29
h: refs/heads/master
i:
  29879: 9b23a81
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: be4f9753e49b8feefe0283adf0c966166bb96f29
+refs/heads/incoming: 4e91f299a8344375385a68bc029613aeacdbd09b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/etc/emacs/README.md

@@ -29,20 +29,31 @@ it, and pressing `C-j`:
 Rust mode will automatically be associated with .rs and .rc files. To
 enable it explicitly, do `M-x rust-mode`.
 
-### package.el installation via Marmalade
+### package.el installation via Marmalade or MELPA
 
 It can be more convenient to use Emacs's package manager to handle
 installation for you if you use many elisp libraries. If you have
-package.el but haven't added Marmalade, the community package source,
+package.el but haven't added Marmalade or MELPA, the community package source,
 yet, add this to ~/.emacs.d/init.el:
 
+Using Marmalade:
+
 ```lisp
 (require 'package)
 (add-to-list 'package-archives
              '("marmalade" . "http://marmalade-repo.org/packages/"))
 (package-initialize)
 ```
 
+Using MELPA:
+
+```lisp
+(require 'package)
+(add-to-list 'package-archives
+             '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(package-initialize)
+```
+
 Then do this to load the package listing:
 
 * <kbd>M-x eval-buffer</kbd>
@@ -56,18 +67,6 @@ should upgrade in order to support installation from multiple sources.
 The ELPA archive is deprecated and no longer accepting new packages,
 so the version there (1.7.1) is very outdated.
 
-From there you can install rust-mode or any other modes by choosing
-them from a list:
-
-* <kbd>M-x package-list-packages</kbd>
-
-Now, to install packages, move your cursor to them and press i. This
-will mark the packages for installation. When you're done with
-marking, press x, and ELPA will install the packages for you (under
-~/.emacs.d/elpa/).
-
-* or using <kbd>M-x package-install rust-mode
-
 #### Important
 
 In order to have cm-mode properly initialized after compilation prior
@@ -85,3 +84,17 @@ your init file or if you are a melpa user install the `melpa` package.
   "initialize the package after compilation"
   (package-initialize))
 ```
+
+#### Install rust-mode
+
+From there you can install rust-mode or any other modes by choosing
+them from a list:
+
+* <kbd>M-x package-list-packages</kbd>
+
+Now, to install packages, move your cursor to them and press i. This
+will mark the packages for installation. When you're done with
+marking, press x, and ELPA will install the packages for you (under
+~/.emacs.d/elpa/).
+
+* or using <kbd>M-x package-install rust-mode

branches/incoming/src/etc/emacs/rust-mode.el

@@ -21,9 +21,6 @@
                             (c-populate-syntax-table table)
                             table))
 
-(add-to-list 'auto-mode-alist '("\\.rs$" . rust-mode))
-(add-to-list 'auto-mode-alist '("\\.rc$" . rust-mode))
-
 (defun make-rust-state ()
   (vector 'rust-token-base
           (list (vector 'top (- rust-indent-unit) nil nil nil))
@@ -300,6 +297,11 @@
 (define-key rust-mode-map "}" 'rust-electric-brace)
 (define-key rust-mode-map "{" 'rust-electric-brace)
 
+;;;###autoload
+(progn
+  (add-to-list 'auto-mode-alist '("\\.rs$" . rust-mode))
+  (add-to-list 'auto-mode-alist '("\\.rc$" . rust-mode)))
+
 (provide 'rust-mode)
 
 ;;; rust-mode.el ends here