summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2022-08-09 04:00:08 +0300
committerDmitry Gutov <dgutov@yandex.ru>2022-08-09 04:44:01 +0300
commitd2080e4183e462331bdb90476395d1ad003de7bb (patch)
tree86c4b0b1fdba9cc5afa20e5f128aba43546d422b /lisp/files.el
parentd6ea4894d3b0bb7d2159bc36b9c5e2ead8afd5b2 (diff)
downloademacs-d2080e4183e462331bdb90476395d1ad003de7bb.tar.gz
emacs-d2080e4183e462331bdb90476395d1ad003de7bb.tar.bz2
emacs-d2080e4183e462331bdb90476395d1ad003de7bb.zip
Add separate tiny major mode for JSON
* lisp/progmodes/js.el (js-json-mode): New major mode. * lisp/files.el (auto-mode-alist): Use it for JSON (bug#56682). * lisp/progmodes/js.el (js--class-decl-matcher): Skip work if there are no frameworks enabled.
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el
index e258bf7bbed..05a924a363d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2950,7 +2950,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\|SQUASHFS\\)\\'" .
("\\.js[mx]?\\'" . javascript-mode)
;; https://en.wikipedia.org/wiki/.har
("\\.har\\'" . javascript-mode)
- ("\\.json\\'" . javascript-mode)
+ ("\\.json\\'" . js-json-mode)
("\\.[ds]?va?h?\\'" . verilog-mode)
("\\.by\\'" . bovine-grammar-mode)
("\\.wy\\'" . wisent-grammar-mode)