* files.el (auto-mode-alist): Use js-mode for .json (Bug#8529).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b8389877a2bcfc98d3cc385ed92d1abe318af67..c83f8d5102ff28bfd15f57d491f0db2253ebffcb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-24  Chong Yidong  <cyd@stupidchicken.com>
 
+       * 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)

diff --git a/lisp/files.el b/lisp/files.el
index 8cd5699eb9ae71428932899f7f76014d557b24f8..72cfc89ef8c1109dff69536f8f6aad23ca61d20e 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2386,6 +2386,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.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.