Patch 9.0.1272

4 views
Skip to first unread message

Bram Moolenaar

unread,
Feb 1, 2023, 10:32:02 AM2/1/23
to vim...@googlegroups.com

Patch 9.0.1272
Problem: Typo in pattern for filetype detection.
Solution: Fix the typo. (closes #11924)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.1271/runtime/filetype.vim 2023-01-31 18:57:08.964117745 +0000
--- runtime/filetype.vim 2023-02-01 15:29:35.707434722 +0000
***************
*** 1024,1030 ****

" JSONC (JSON with comments)
au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc setf jsonc
! au BufNewFile,BufRead .jshintc,.hintrc,.swrc,[jt]sconfig*.json setf jsonc

" JSON
au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json
--- 1024,1030 ----

" JSONC (JSON with comments)
au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc setf jsonc
! au BufNewFile,BufRead .jshintrc,.hintrc,.swrc,[jt]sconfig*.json setf jsonc

" JSON
au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json
*** ../vim-9.0.1271/src/testdir/test_filetype.vim 2023-01-31 18:57:08.964117745 +0000
--- src/testdir/test_filetype.vim 2023-02-01 15:29:35.711434727 +0000
***************
*** 295,301 ****
\ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
\ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'],
\ 'json5': ['file.json5'],
! \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
\ 'jsonnet': ['file.jsonnet', 'file.libsonnet'],
\ 'jsp': ['file.jsp'],
\ 'julia': ['file.jl'],
--- 295,301 ----
\ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
\ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'],
\ 'json5': ['file.json5'],
! \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
\ 'jsonnet': ['file.jsonnet', 'file.libsonnet'],
\ 'jsp': ['file.jsp'],
\ 'julia': ['file.jl'],
*** ../vim-9.0.1271/src/version.c 2023-02-01 13:11:11.718991141 +0000
--- src/version.c 2023-02-01 15:30:44.279507963 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1272,
/**/

--
hundred-and-one symptoms of being an internet addict:
90. Instead of calling you to dinner, your spouse sends e-mail.

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages