From: Leo Liu <sdl.web@gmail.com>
Date: Wed, 25 Apr 2012 14:47:33 +0000 (+0800)
Subject: * lisp/files.el (auto-mode-alist): Use javascript-mode instead.
X-Git-Tag: emacs-24.2.90~471^2~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5055880d396c98f9bacfd4d19aa4a9ae85d3a87c;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 533c1775ea9..cad73c2e2e7 100644
--- 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 d757e1a277c..703b443765d 100644
--- 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.