From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 14 Aug 2009 23:40:20 +0000 (+0000)
Subject: * files.el (auto-mode-alist): Use js-mode for .js files.
X-Git-Tag: emacs-pretest-23.1.90~1857
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba2d8894872f43b53d3f1dd10e2e744e14e610ad;p=emacs.git

* files.el (auto-mode-alist): Use js-mode for .js files.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e28cf025d9..05b94dff1af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-08-14  Chong Yidong  <cyd@stupidchicken.com>
 
+	* files.el (auto-mode-alist): Use js-mode for .js files.
+
 	* progmodes/js2-mode.el: File removed.
 
 	* Makefile.in (ELCFILES): Add js.el, and remove js2-mode.el.
diff --git a/lisp/files.el b/lisp/files.el
index 5f256a016ca..9ca5761bae6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2221,7 +2221,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("\\.x[ms]l\\'" . xml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
-     ("\\.js\\'" . java-mode)		; javascript-mode would be better
+     ("\\.js\\'" . js-mode)		; javascript-mode would be better
      ("\\.[ds]?v\\'" . verilog-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.