Merge branch 'emacs24'

Emacs 24-only code is now master, for legacy check out emacs23. The commit log is going to have a lot of duplicates, sorry about that. Still, this way, many users can do a fast-forward merge.
mooz · Feb 17, 2013 · cdd25bb · cdd25bb
2 parents ef7de01 + 807010e
commit cdd25bb
Show file tree

Hide file tree

Showing 2 changed files with 700 additions and 1,063 deletions.
diff --git a/README.md b/README.md
@@ -22,10 +22,10 @@ In your emacs config:
 See <http://code.google.com/p/js2-mode/wiki/InstallationInstructions> for
 additional details.
 
-Emacs 24
-========
+Emacs 22 and 23
+===============
 
-The version from the [branch `emacs24`](https://github.com/mooz/js2-mode/tree/emacs24) is recommended.
+This version requires Emacs 24. For a backward compatible version, check out the branch [emacs23](https://github.com/mooz/js2-mode/tree/emacs23).
 
 Bugs
 ====