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>
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 236763d..433ac1c 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -203,7 +203,7 @@
runtime/ftplugin/javacc.vim @ribru17
runtime/ftplugin/javascript.vim @dkearns
runtime/ftplugin/javascriptreact.vim @dkearns
-runtime/ftplugin/jj.vim @gpanders
+runtime/ftplugin/jjdescription.vim @gpanders
runtime/ftplugin/json.vim @dbarnett
runtime/ftplugin/json5.vim @dkearns
runtime/ftplugin/jsonc.vim @izhakjakov
@@ -506,7 +506,7 @@
runtime/syntax/java.vim @zzzyxwvut
runtime/syntax/javascript.vim @fleiner
runtime/syntax/jinja.vim @gpanders
-runtime/syntax/jj.vim @gpanders
+runtime/syntax/jjdescription.vim @gpanders
runtime/syntax/json.vim @vito-c
runtime/syntax/jsonc.vim @izhakjakov
runtime/syntax/julia.vim @carlobaldassi
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 1adb403..4d7205f 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1244,7 +1244,7 @@
au BufNewFile,BufRead *.jinja setf jinja
" Jujutsu
-au BufNewFile,BufRead *.jjdescription setf jj
+au BufNewFile,BufRead *.jjdescription setf jjdescription
" Jovial
au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial
diff --git a/runtime/ftplugin/jj.vim b/runtime/ftplugin/jjdescription.vim
similarity index 100%
rename from runtime/ftplugin/jj.vim
rename to runtime/ftplugin/jjdescription.vim
diff --git a/runtime/syntax/jj.vim b/runtime/syntax/jjdescription.vim
similarity index 94%
rename from runtime/syntax/jj.vim
rename to runtime/syntax/jjdescription.vim
index 0b2d29e..04848bc 100644
--- a/runtime/syntax/jj.vim
+++ b/runtime/syntax/jjdescription.vim
@@ -21,4 +21,4 @@
hi def link jjRemoved Removed
hi def link jjChanged Changed
-let b:current_syntax = 'jj'
+let b:current_syntax = 'jjdescription'
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 66942b9..59a9161 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -391,7 +391,7 @@
jess: ['file.clp'],
jgraph: ['file.jgr'],
jinja: ['file.jinja'],
- jj: ['file.jjdescription'],
+ jjdescription: ['file.jjdescription'],
jovial: ['file.jov', 'file.j73', 'file.jovial'],
jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
jq: ['file.jq'],
diff --git a/src/version.c b/src/version.c
index d446b6f..97c1488 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 986,
+/**/
985,
/**/
984,