Mercurial > vim

changeset 31879:f13d7423396c v9.0.1272

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1272: typo in pattern for filetype detection Commit: https://github.com/vim/vim/commit/e8d4ae0d1153ecb45ebf48030be60640e8800540 Author: zeertzjq <zeertzjq@outlook.com> Date: Wed Feb 1 15:31:23 2023 +0000 patch 9.0.1272: typo in pattern for filetype detection Problem: Typo in pattern for filetype detection. Solution: Fix the typo. (closes https://github.com/vim/vim/issues/11924)
author Bram Moolenaar <Bram@vim.org>
date Wed, 01 Feb 2023 16:45:04 +0100
parents 13d1ba119f07
children 2902f885b9dc
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1024,7 +1024,7 @@ au BufNewFile,BufRead .prettierrc,.fireb
 
 " JSONC (JSON with comments)
 au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc 	setf jsonc
-au BufNewFile,BufRead .jshintc,.hintrc,.swrc,[jt]sconfig*.json 	setf jsonc
+au BufNewFile,BufRead .jshintrc,.hintrc,.swrc,[jt]sconfig*.json	setf jsonc
 
 " JSON
 au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -295,7 +295,7 @@ let s:filename_checks = {
     \ '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'],
+    \ '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'],
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1272,
+/**/
     1271,
 /**/
     1270,