From b405c790046fc6758bf4a90feb6a67c2411685a0 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 16 Aug 2025 17:51:40 +0200 Subject: [PATCH] runtime(vim): set 'comments' based on script type (legacy/Vim9) fixes: #18000 Signed-off-by: Christian Brabandt --- runtime/ftplugin/vim.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index 22b2614658..00b4332fa1 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -10,6 +10,7 @@ " 2025 Aug 06 by Vim Project (add gf maps #17881) " 2025 Aug 08 by Vim Project (add Vim script complete function #17871) " 2025 Aug 12 by Vim Project (improve vimgoto script #17970)) +" 2025 Aug 16 by Vim Project set com depending on Vim9 or legacy script " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -110,14 +111,14 @@ setlocal keywordprg=:VimKeywordPrg " Comments starts with # in Vim9 script. We have to guess which one to use. if "\n" .. getline(1, 32)->join("\n") =~# '\n\s*vim9\%[script]\>' setlocal commentstring=#\ %s + " Set 'comments' to format dashed lists in comments, for Vim9 script. + setlocal com=sO:#\ -,mO:#\ \ ,eO:##,:#\\\ ,:# else setlocal commentstring=\"%s + " Set 'comments' to format dashed lists in comments, for legacy Vim script. + setlocal com=sO:\"\ -,mO:\"\ \ ,eO:\"\",:\"\\\ ,:\" endif -" Set 'comments' to format dashed lists in comments, both in Vim9 and legacy -" script. -setlocal com=sO:#\ -,mO:#\ \ ,eO:##,:#\\\ ,:#,sO:\"\ -,mO:\"\ \ ,eO:\"\",:\"\\\ ,:\" - " set 'include' to recognize import commands setlocal include=\\v^\\s*import\\s*(autoload)?