patch 9.1.0986: filetype: 'jj' filetype is a bit imprecise
Commit:
https://github.com/vim/vim/commit/58c44e8833365e1a777330491c2799ae324ed893
Author: Gregory Anders <[email protected]>
Date: Fri Jan 3 10:35:35 2025 +0100
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 236763dbb..433ac1c4e 100644
--- 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 1adb4038b..4d7205f35 100644
--- 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 0b2d29e87..04848bcb3 100644
--- 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 66942b90c..59a916124 100644
--- 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 d446b6fd1..97c14887e 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tTeEp-004cCP-Qd%40256bit.org.
