* lisp/files.el (auto-mode-alist): Use javascript-mode instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 533c1775ea9339d3fd07f6a0d7b589a5d714ec41..cad73c2e2e7f8393f0fe827683ada8b07784b664 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-25  Leo Liu  <sdl.web@gmail.com>
+
+       * files.el (auto-mode-alist): Use javascript-mode instead.
+
 2012-04-25  Alex Harsanyi  <AlexHarsanyi@gmail.com>
 
        Sync with soap-client repository.  Support SOAP simpleType.  (Bug#10331)

diff --git a/lisp/files.el b/lisp/files.el
index d757e1a277cb987ff53d85fb7b326bd5b4a67d25..703b443765d1b838ff2cc80eb6b4d88ca98ab4c2 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2340,8 +2340,8 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.dbk\\'" . xml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
-     ("\\.js\\'" . js-mode)            ; javascript-mode would be better
-     ("\\.json\\'" . js-mode)
+     ("\\.js\\'" . javascript-mode)
+     ("\\.json\\'" . javascript-mode)
      ("\\.[ds]?vh?\\'" . verilog-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.