[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108030: * lisp/files.el (auto-mode-alist): Use javascript-mode instead.

[Leo Liu]

------------------------------------------------------------
revno: 108030
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2012-04-25 22:47:33 +0800
message:
  * lisp/files.el (auto-mode-alist): Use javascript-mode instead.
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-25 10:28:29 +0000
+++ b/lisp/ChangeLog    2012-04-25 14:47:33 +0000
@@ -1,3 +1,7 @@
+2012-04-25  Leo Liu  <address@hidden>
+
+       * files.el (auto-mode-alist): Use javascript-mode instead.
+
 2012-04-25  Alex Harsanyi  <address@hidden>
 
        Sync with soap-client repository.  Support SOAP simpleType.  (Bug#10331)

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-04-18 06:24:13 +0000
+++ b/lisp/files.el     2012-04-25 14:47:33 +0000
@@ -2340,8 +2340,8 @@
      ("\\.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.