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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e28cf025d98647bd85b8fa0a107cb896d8a4aa8..05b94dff1af2018adb6410b6136871e0307b3b2b 100644 (file)
--- 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 5f256a016caba0771a6f1386e9b44e038da7c053..9ca5761bae6e0526c21c1cdcb90b788c922f0602 100644 (file)
--- 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.