From b0cf3b4e2ddaacc952c1683375965c9ff2e0d51e Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sat, 31 Jan 2015 20:27:07 +0100
Subject: [PATCH] Add JSON custom filetype

Closes #384.
---
 data/Makefile.am              |  1 +
 data/filetype_extensions.conf |  3 ++-
 data/filetypes.JSON.conf      | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 data/filetypes.JSON.conf

diff --git a/data/Makefile.am b/data/Makefile.am
index 593794ec5..f3fbb199f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -41,6 +41,7 @@ filetypes = \
 	filetypes.html \
 	filetypes.java \
 	filetypes.javascript \
+	filetypes.JSON.conf \
 	filetypes.latex \
 	filetypes.lisp \
 	filetypes.lua \
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index ec5131e1f..4f3fba07e 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -38,6 +38,7 @@ Haxe=*.hx;
 HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl;
 Java=*.java;*.jsp;
 Javascript=*.js;
+JSON=*.json;
 LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;*.aux;*.bib;
 Lisp=*.lisp;
 Lua=*.lua;
@@ -73,5 +74,5 @@ None=*;
 Programming=Clojure;CUDA;Cython;Genie;Scala;
 Script=Graphviz;
 Markup=
-Misc=
+Misc=JSON;
 None=
diff --git a/data/filetypes.JSON.conf b/data/filetypes.JSON.conf
new file mode 100644
index 000000000..ea3888694
--- /dev/null
+++ b/data/filetypes.JSON.conf
@@ -0,0 +1,14 @@
+[styling=C]
+
+[keywords]
+primary=true false null
+
+[settings]
+lexer_filetype=Javascript
+extension=json
+mime_type=application/json
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
-- 
2.11.4.GIT