Merge branch 'smie'

Update the indentation / syntax matching engine, bring the font-lock
keyword list up to date and update URLs to point to the new repo.

* smie: (35 commits)
  Highlight modules, records, protocols, impls as types
  Highlight private macros as function names, too
  Add a history section & link to the original author.
  Update one more URL in the README
  Update README with a working screenshot
  Update README for new setup instructions.
  Reorganize everything: Autoloads, requires, reindent elixir-mode.el
  Update README a bit
  Set tab widths for elixir files to the basic offset.
  Remove more outdated keywords, add some new ones.
  Update font-lock keywords for newest elixir.
  Indent if <cond>, do: <statement> correctly.
  Delurk old tokenizer helper function
  Have the lexer recognize parens, too
  Fix indentation of -> some more
  Use SMIE in elixir-mode by default.
  Upcase confusion in lookaround lexer.
  Try and be a bit smarter about highlighting some keywords
  Make tokenizer smarter w.r.t match statements
  Downcase literal strings read from the buffer
  ...

Author: antifuchs

README.markdown

@@ -1,6 +1,6 @@
-# elixir-mode -- Emacs major mode for [Elixir](https://github.com/josevalim/elixir)
+# elixir-mode -- Emacs major mode for [Elixir](http://elixir-lang.org/)
 
-![elixir-mode](https://img.skitch.com/20111112-tyhx1d5wqus29rx644f46ciu5c.png)
+![elixir-mode](http://cl.ly/image/0I3h1h1v2740/Screen%20Shot%202013-04-06%20at%205.40.05%20PM.png)
 
 ## Installation
 
@@ -9,26 +9,28 @@ Simply add to your load path and require the mode to install.
 In your shell...
 
 ```shell
-% git clone git://github.com/secondplanet/elixir-mode ~/.emacs.d/elixir-mode
+% git clone git://github.com/elixir/emacs-elixir ~/.emacs.d/emacs-elixir
 % $EDITOR ~/.emacs
 ```
 In the editor...
 
 ```lisp
-(add-to-list 'load-path "~/.emacs.d/elixir-mode")
-(require 'elixir-mode)
+(add-to-list 'load-path "~/.emacs.d/emacs-elixir)
+(require 'elixir-mode-setup)
+(elixir-mode-setup)
 ```
 
 Save and reload with `M-x load-file` `~/.emacs`.
 
 ## Usage
 
-Any file that matches the glob `*.ex[s]` is automatically opened in
-Elixir mode, but you can change this functionality easily.
+Any file that matches the glob `*.ex[s]` or `*.elixir` is
+automatically opened in Elixir mode, but you can change this
+functionality easily.
 
 ```lisp
-;; Highlights *.elixir as well
-(add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
+;; Highlights *.elixir2 as well
+(add-to-list 'auto-mode-alist '("\\.elixir2\\'" . elixir-mode))
 ```
 
 ### Commands
@@ -119,11 +121,23 @@ There are no keyboard shortcuts included by default.
 
 This is still very alpha software; there are probably several
 bugs. Right now the indentation implementation needs some work, and
-the operator and atom font-locking doesn't appear to be working
-correctly.
+the IEX mode appears entirely untested.
 
 ## Notes
 
-This is my first Emacs mode, so please excuse some of the messy bits
-in the implementation. To help me out I had a look at and borrowed a
-bit of code from io-mode, ruby-mode, and coffee-mode.
+If you want to use `ruby-end-mode` for a more comfortable editing
+experience, you can add the following to your `elixir-mode-hook`:
+
+```lisp
+(add-to-list 'elixir-mode-hook
+             (defun auto-activate-ruby-end-mode-for-elixir-mode ()
+               (set (make-variable-buffer-local 'ruby-end-expand-keywords-before-re)
+                    "\\(?:^\\|\\s-+\\)\\(?:do\\)")
+               (set (make-variable-buffer-local 'ruby-end-check-statement-modifiers) nil)
+               (ruby-end-mode +1)))
+```
+
+## History
+
+This mode is based on the
+[Emacs mode by secondplanet](https://github.com/secondplanet/elixir-mode).

elixir-mode-setup.el

@@ -0,0 +1,35 @@
+;;; elixir-mode-setup.el --- Load and initialize major mode for Elixir files
+
+(defconst elixir-mode-version "1.1.0"
+  "Elixir mode version number.")
+(defconst elixir-mode-date "2013-04-06"
+  "Elixir mode version date (bumped infrequently).")
+
+(defun elixir-mode-setup ()
+  (add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
+  (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
+  (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode)))
+
+
+;;;### (autoloads (elixir-mode) "elixir-mode" "elixir-mode.el" (20832
+;;;;;;  47531))
+;;; Generated autoloads from elixir-mode.el
+
+(defvar elixir-mode-hook nil)
+
+(defvar elixir-mode-map (make-keymap) "\
+Elixir mode keymap.")
+
+(autoload 'elixir-mode "elixir-mode" "\
+Major mode for editing Elixir files.
+
+\(fn)" t nil)
+
+;;;***
+
+(provide 'elixir-mode-setup)
+;; Local Variables:
+;; no-byte-compile: t
+;; coding: utf-8
+;; End:
+;;; elixir-mode-setup.el ends here