# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1625310903 -7200
# Node ID d0625ed91013090e0faf6072ccf891175574d71a
# Parent  8b7f6f698a07e097ad51b7066776a704de77bfed
patch 8.2.3085: JSONC files are not recognized

Commit: https://github.com/vim/vim/commit/acbb4b5720fc27b8b07357b763ed4e5a944ae1da
Author: Izhak Jakov <izhakjakov>
Date:   Sat Jul 3 13:09:37 2021 +0200

    patch 8.2.3085: JSONC files are not recognized

    Problem:    JSONC files are not recognized.
    Solution:   Recognize .jsonc files. (Izhak Jakov, closes https://github.com/vim/vim/issues/8500)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -868,6 +868,9 @@ au BufNewFile,BufRead *.json-patch			set
 " Jupyter Notebook is also json
 au BufNewFile,BufRead *.ipynb				setf json
 
+" JSONC
+au BufNewFile,BufRead *.jsonc			setf jsonc
+
 " Kixtart
 au BufNewFile,BufRead *.kix			setf kix
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -260,6 +260,7 @@ let s:filename_checks = {
     \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'],
     \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file'],
     \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb'],
+    \ 'jsonc': ['file.jsonc'],
     \ 'jsp': ['file.jsp'],
     \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'],
     \ 'kivy': ['file.kv'],
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3085,
+/**/
     3084,
 /**/
     3083,