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.

diff --cc README.md
Simple merge

diff --cc js2-mode.el
index d23d8a18c31ee61c68a462838a95979fcc4261d9,0b5947f18a5736a619067537fc25a1cd2ec4a5c5..cf0402c2798c1dcdff3dc89e2da857ecda4adf4e
--- 1/js2-mode.el
--- 2/js2-mode.el
+++ b/js2-mode.el
@@@ -209,22 -219,6 +219,7 @@@ Similar to `c-basic-offset'.
    :type 'integer)
  (js2-mark-safe-local 'js2-basic-offset 'integerp)
  
- ;; TODO(stevey):  move this code into a separate minor mode.
- (defcustom js2-mirror-mode nil
-   "Non-nil to insert closing brackets, parens, etc. automatically."
-   :group 'js2-mode
-   :type 'boolean)
- 
- (make-obsolete-variable 'js2-mirror-mode 'electric-pair-mode "1.0")
- 
- (defcustom js2-auto-indent-p nil
-   "Automatic indentation with punctuation characters.
- If non-nil, the current line is indented when certain punctuations
- are inserted."
-   :group 'js2-mode
-   :type 'boolean)
- 
 +(make-obsolete-variable 'js2-auto-indent-p 'electric-indent-mode "1.0")
  
  (defcustom js2-bounce-indent-p nil
    "Non-nil to have indent-line function choose among alternatives.