Skip to content

Commit 58c44e8

Browse files
gpanderschrisbra
authored andcommitted
patch 9.1.0986: filetype: 'jj' filetype is a bit imprecise
Problem: filetype: 'jj' filetype is a bit imprecise Solution: rename 'jj' filetype to 'jjdescription' (Gregory Anders) closes: #16364 Signed-off-by: Gregory Anders <greg@gpanders.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent bde76da commit 58c44e8

6 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ runtime/ftplugin/java.vim @zzzyxwvut
203203
runtime/ftplugin/javacc.vim @ribru17
204204
runtime/ftplugin/javascript.vim @dkearns
205205
runtime/ftplugin/javascriptreact.vim @dkearns
206-
runtime/ftplugin/jj.vim @gpanders
206+
runtime/ftplugin/jjdescription.vim @gpanders
207207
runtime/ftplugin/json.vim @dbarnett
208208
runtime/ftplugin/json5.vim @dkearns
209209
runtime/ftplugin/jsonc.vim @izhakjakov
@@ -506,7 +506,7 @@ runtime/syntax/jargon.vim @h3xx
506506
runtime/syntax/java.vim @zzzyxwvut
507507
runtime/syntax/javascript.vim @fleiner
508508
runtime/syntax/jinja.vim @gpanders
509-
runtime/syntax/jj.vim @gpanders
509+
runtime/syntax/jjdescription.vim @gpanders
510510
runtime/syntax/json.vim @vito-c
511511
runtime/syntax/jsonc.vim @izhakjakov
512512
runtime/syntax/julia.vim @carlobaldassi

runtime/filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ au BufNewFile,BufRead *.jgr setf jgraph
12441244
au BufNewFile,BufRead *.jinja setf jinja
12451245

12461246
" Jujutsu
1247-
au BufNewFile,BufRead *.jjdescription setf jj
1247+
au BufNewFile,BufRead *.jjdescription setf jjdescription
12481248

12491249
" Jovial
12501250
au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ hi def link jjAdded Added
2121
hi def link jjRemoved Removed
2222
hi def link jjChanged Changed
2323

24-
let b:current_syntax = 'jj'
24+
let b:current_syntax = 'jjdescription'

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ def s:GetFilenameChecks(): dict<list<string>>
391391
jess: ['file.clp'],
392392
jgraph: ['file.jgr'],
393393
jinja: ['file.jinja'],
394-
jj: ['file.jjdescription'],
394+
jjdescription: ['file.jjdescription'],
395395
jovial: ['file.jov', 'file.j73', 'file.jovial'],
396396
jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
397397
jq: ['file.jq'],

src/version.c

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

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
986,
707709
/**/
708710
985,
709711
/**/

0 commit comments

Comments
 (0)