To: vim_dev@googlegroups.com Subject: Patch 8.2.3049 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3049 Problem: JSON patch file not recognized. Solution: Recognize json-patch as json. (Kevin Locke, closes #8450) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.3048/runtime/filetype.vim 2021-06-13 17:03:02.022872843 +0200 --- runtime/filetype.vim 2021-06-25 21:48:36.225555521 +0200 *************** *** 855,860 **** --- 855,863 ---- " JSON au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json + " JSON Patch (RFC 6902) + au BufNewFile,BufRead *.json-patch setf json + " Jupyter Notebook is also json au BufNewFile,BufRead *.ipynb setf json *** ../vim-8.2.3048/src/testdir/test_filetype.vim 2021-06-13 17:03:02.022872843 +0200 --- src/testdir/test_filetype.vim 2021-06-25 21:48:36.225555521 +0200 *************** *** 257,263 **** \ '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'], \ 'jsp': ['file.jsp'], \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'], \ 'kivy': ['file.kv'], --- 257,263 ---- \ '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.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb'], \ 'jsp': ['file.jsp'], \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'], \ 'kivy': ['file.kv'], *** ../vim-8.2.3048/src/version.c 2021-06-25 21:31:03.379070659 +0200 --- src/version.c 2021-06-25 21:50:32.577336797 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3049, /**/ -- hundred-and-one symptoms of being an internet addict: 32. You don't know what sex three of your closest friends are, because they have neutral nicknames and you never bothered to ask. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///