diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-04-23 20:24:30 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-04-23 20:24:30 -0400 |
| commit | c8d173eb1e2475af9d972efafb684f57f18c8374 (patch) | |
| tree | e10eff4135d90e3fc0390d2dcae33c75e6a6285a | |
| parent | 4ef177aa26537bdbbe9d60cc87b973435390c271 (diff) | |
| download | emacs-c8d173eb1e2475af9d972efafb684f57f18c8374.tar.gz emacs-c8d173eb1e2475af9d972efafb684f57f18c8374.tar.bz2 emacs-c8d173eb1e2475af9d972efafb684f57f18c8374.zip | |
* files.el (auto-mode-alist): Use js-mode for .json (Bug#8529).
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4b8389877a2..c83f8d5102f 100644 --- 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 8cd5699eb9a..72cfc89ef8c 100644 --- 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. |