Skip to content

Commit e8d4ae0

Browse files
zeertzjqbrammool
authored andcommitted
patch 9.0.1272: typo in pattern for filetype detection
Problem: Typo in pattern for filetype detection. Solution: Fix the typo. (closes #11924)
1 parent 1b438a8 commit e8d4ae0

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

runtime/filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ au BufNewFile,BufRead .prettierrc,.firebaserc,.stylelintrc setf json
10241024

10251025
" JSONC (JSON with comments)
10261026
au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc setf jsonc
1027-
au BufNewFile,BufRead .jshintc,.hintrc,.swrc,[jt]sconfig*.json setf jsonc
1027+
au BufNewFile,BufRead .jshintrc,.hintrc,.swrc,[jt]sconfig*.json setf jsonc
10281028

10291029
" JSON
10301030
au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ let s:filename_checks = {
295295
\ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
296296
\ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'],
297297
\ 'json5': ['file.json5'],
298-
\ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
298+
\ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
299299
\ 'jsonnet': ['file.jsonnet', 'file.libsonnet'],
300300
\ 'jsp': ['file.jsp'],
301301
\ 'julia': ['file.jl'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1272,
698700
/**/
699701
1271,
700702
/**/

0 commit comments

Comments
 (0)