[Emacs-diffs] /srv/bzr/emacs/trunk r103982: * files.el (auto-mode-alist): Use js-mode for .json (Bug#8529).

[Chong Yidong]

------------------------------------------------------------
revno: 103982
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-04-23 20:24:30 -0400
message:
  * files.el (auto-mode-alist): Use js-mode for .json (Bug#8529).
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-24 00:15:26 +0000
+++ b/lisp/ChangeLog    2011-04-24 00:24:30 +0000
@@ -1,5 +1,7 @@
 2011-04-24  Chong Yidong  <address@hidden>
 
+       * files.el (auto-mode-alist): Use js-mode for .json (Bug#8529).
+
        * apropos.el (apropos-label-face): Avoid variable-pitch face.
        (apropos-accumulator): Doc fix.
        (apropos-function, apropos-macro, apropos-command)

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2011-04-19 13:44:55 +0000
+++ b/lisp/files.el     2011-04-24 00:24:30 +0000
@@ -2386,6 +2386,7 @@
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
      ("\\.js\\'" . js-mode)            ; javascript-mode would be better
+     ("\\.json\\'" . js-mode)
      ("\\.[ds]?vh?\\'" . verilog-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.