procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Chong Yidong 2011-04-23 20:24:30 -04:00
parent 4ef177aa26
commit c8d173eb1e
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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)

1
lisp/files.el
View file

@ -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.