commit 6582e230a0f6592287b1123c5fc3807d6fed997e
author Kevin Locke <kevin@kevinlocke.name> Fri Jun 25 21:54:25 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Jun 25 21:54:25 2021 +0200
tree ca430707fc6c532faa2c2707d4ca71c5a9509387
parent 22480d147fe83cb31316d2dabc5c5f249477af15

patch 8.2.3049: JSON patch file not recognized

Problem:    JSON patch file not recognized.
Solution:   Recognize json-patch as json. (Kevin Locke, closes #8450)

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0b670ac..5c9c975 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -257,7 +257,7 @@
     \ 'jgraph': ['file.jgr'],
     \ '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.webmanifest', 'Pipfile.lock', 'file.ipynb'],
+    \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb'],
     \ 'jsp': ['file.jsp'],
     \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'],
     \ 'kivy': ['file.kv'],

src/version.c

diff --git a/src/version.c b/src/version.c
index 4cef712..36a3970 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3049,
+/**/
     3048,
 /**/
     3047,