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 236763dbbcf51aa0a83c2f7f17b8f8132ae085c0..433ac1c4e7c4f76517ed3f56078b2e5090c0287b 100644 (file)
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -203,7 +203,7 @@ runtime/ftplugin/java.vim           @zzzyxwvut
 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/jargon.vim           @h3xx
 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 1adb4038b42292571ef5b568d75737c167953b10..4d7205f35752e5216769acf8ca7ef33089bf9581 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1244,7 +1244,7 @@ au BufNewFile,BufRead *.jgr                       setf jgraph
 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 0b2d29e87891012eff20a83c329c155f7138a5cb..04848bcb3bb4cb04254bab7a938a7c4a92230b34 100644 (file)
--- a/runtime/syntax/jj.vim
+++ b/runtime/syntax/jjdescription.vim
@@ -21,4 +21,4 @@ hi def link jjAdded Added
 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 66942b90cd184e4e2d1080c51c4f5c3ed043928f..59a916124cfb1febf6af8f9d27c5a9cebc356a72 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -391,7 +391,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     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 d446b6fd1c2379f44670b569f714c341e3d47669..97c14887ed3772906201dced75c22e1ee0fbf075 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    986,
 /**/
     985,
 /**/