diff options
| -rw-r--r-- | .dir-locals.el | 5 | ||||
| -rw-r--r-- | .gitattributes | 22 | ||||
| -rw-r--r-- | Makefile | 2 |
3 files changed, 18 insertions, 11 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index d0e62208e..fb5afe7b9 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -83,6 +83,11 @@ (flycheck-checker . yaml-yamllint))))) + (json-mode + . ((eval . (progn + (setq-local js-indent-level 2) + (flycheck-checker . json-python-json))))) + (python-mode . ((eval . (progn diff --git a/.gitattributes b/.gitattributes index f391c2342..8e16c6561 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,12 @@ -searx/static/themes/oscar/css/bootstrap.min.css -diff -searx/static/themes/oscar/js/bootstrap.min.js -diff -searx/static/themes/oscar/css/logicodev.min.css -diff -searx/static/themes/oscar/css/leaflet.min.css -diff -searx/static/themes/oscar/css/pointhi.min.css -diff -searx/static/themes/oscar/js/searx.min.js -diff -searx/static/themes/simple/css/searx.min.css -diff -searx/static/themes/simple/css/searx-rtl.min.css -diff -searx/static/themes/simple/js/searx.min.js -diff -searx/static/themes/simple/js/searx.min.js.map -diff +*.gif -diff +*.png -diff +*.min.css -diff +*.min.js -diff +*.css.map -diff +*.js.map -diff +*.eot -diff +*.svg -diff +*.ttf -diff +*.woff -diff +*.woff2 -diff +messages.mo -diff @@ -82,7 +82,7 @@ MANAGE += py.build py.clean MANAGE += pyenv pyenv.install pyenv.uninstall MANAGE += pypi.upload pypi.upload.test MANAGE += test.yamllint test.pylint test.pep8 test.unit test.coverage test.robot test.clean -MANAGE += themes.all themes.oscar themes.simple themes.bootstrap pygments.less +MANAGE += themes.all themes.oscar themes.simple pygments.less PHONY += $(MANAGE) |