From: Christian Brabandt Date: Mon, 13 Apr 2026 13:48:28 +0000 (+0200) Subject: Revert "runtime(jjdescription): allow to configure summary width" X-Git-Tag: v9.2.0341~2 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=86dcb1878cdbd0a8af61664b14f034398e319026;p=thirdparty%2Fvim.git Revert "runtime(jjdescription): allow to configure summary width" This reverts commit 86ae6858ababe1f80476368c617dc1812df5b781. related: #19905 Signed-off-by: Christian Brabandt --- diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 461f801ccc..2c978ebc9a 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 9.2. Last change: 2026 Apr 11 +*filetype.txt* For Vim version 9.2. Last change: 2026 Apr 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -806,14 +806,6 @@ To enable the recognition of Markdown comments each time after removing re-source "javaformat.vim" for Vim versions greater than `8.2.1397`: > runtime autoload/javaformat.vim < -JUJUTSU DESCRIPTION *ft-jjdescription-plugin* - -The length of the first line of the commit message used for syntax -highlighting can be configured via `g:jjcommit_summary_length`, and will -fallback to `g:gitcommit_summary_length`. The default is 50. Example: > - - let g:jjcommit_summary_length = 70 -< JSON-FORMAT *ft-json-plugin* JSON filetype can be extended to use 'formatexpr' and "json.FormatExpr()" @@ -824,7 +816,7 @@ Add following lines to $HOME/.vim/ftplugin/json.vim: > vim9script import autoload 'dist/json.vim' setl formatexpr=json.FormatExpr() -< + LUA *ft-lua-plugin* *g:lua_folding* You can enable folding of Lua functions using |fold-expr| by: > diff --git a/runtime/doc/tags b/runtime/doc/tags index 1e0720b21a..66f3731614 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -7601,7 +7601,6 @@ ft-inform-syntax syntax.txt /*ft-inform-syntax* ft-java-plugin filetype.txt /*ft-java-plugin* ft-java-syntax syntax.txt /*ft-java-syntax* ft-javascript-omni insert.txt /*ft-javascript-omni* -ft-jjdescription-plugin filetype.txt /*ft-jjdescription-plugin* ft-jq-syntax syntax.txt /*ft-jq-syntax* ft-json-plugin filetype.txt /*ft-json-plugin* ft-json-syntax syntax.txt /*ft-json-syntax* diff --git a/runtime/syntax/jjdescription.vim b/runtime/syntax/jjdescription.vim index dcdcb39914..f7b76ba260 100644 --- a/runtime/syntax/jjdescription.vim +++ b/runtime/syntax/jjdescription.vim @@ -5,7 +5,6 @@ " 2025 Apr 17 by Vim Project (don't require space to start comments, #17130) " 2026 Apr 09 by Vim Project (anchor status regex to beginning of line, #19879) " 2026 Apr 09 by Vim Project (detect renames of files, #19879) -" 2026 Apr 11 by Vim Project (configure summary length, #19905) if exists('b:current_syntax') finish @@ -21,21 +20,10 @@ syn region jjComment start="^JJ:" end="$" contains=jjAdded,jjRemoved,jjChanged,j syn include @jjCommitDiff syntax/diff.vim syn region jjCommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@jjCommitDiff -if get(g:, 'jjcommit_summary_length', get(g:, 'gitcommit_summary_length', 0)) < 0 - syn match jjdescriptionSummary "^.*$" contained containedin=jjcommitFirstLine nextgroup=jjcommitOverflow contains=@Spell -elseif get(g:, 'jjcommit_summary_length', get(g:, 'gitcommit_summary_length', 1)) > 0 - exe 'syn match jjdescriptionSummary "^.*\%<' . (get(g:, 'jjcommit_summary_length', get(:g, 'gitcommit_summary_length', 50) + 1) . 'v." contained containedin=jjcommitFirstLine nextgroup=jjcommitOverflow contains=@Spell' -endif -syn match jjcommitOverflow ".*" contained contains=@Spell -syn match jjcommitBlank "^.\+" contained contains=@Spell -syn match jjcommitFirstLine "\%^.*" nextgroup=jjcommitBlank,jjComment skipnl - -hi def link jjcommitSummary Keyword -hi def link jjComment Comment -hi def link jjAdded Added -hi def link jjRemove Removed -hi def link jjChange Changed -hi def link jjRenamed Changed -hi def link jjcommitBlank Error +hi def link jjComment Comment +hi def link jjAdded Added +hi def link jjRemoved Removed +hi def link jjChanged Changed +hi def link jjRenamed Changed let b:current_syntax = 'jjdescription'