# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1250293220 0
# Node ID a1d28970bfc5ae6fb8d1a03ec56ba7576e55f181
# Parent  5565b37343b9f6f727c312f5c25fc8f4e79faee0
* files.el (auto-mode-alist): Use js-mode for .js files.

diff -r 5565b37343b9 -r a1d28970bfc5 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 14 23:03:50 2009 +0000
+++ b/lisp/ChangeLog	Fri Aug 14 23:40:20 2009 +0000
@@ -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 -r 5565b37343b9 -r a1d28970bfc5 lisp/files.el
--- a/lisp/files.el	Fri Aug 14 23:03:50 2009 +0000
+++ b/lisp/files.el	Fri Aug 14 23:40:20 2009 +0000
@@ -2221,7 +2221,7 @@
      ("\\.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.