Commit: patch 9.1.0464: no whitespace padding in commentstring option in ftplugins

6 views
Skip to first unread message

Christian Brabandt

unread,
Jun 3, 2024, 3:00:32 PM6/3/24
to vim...@googlegroups.com
patch 9.1.0464: no whitespace padding in commentstring option in ftplugins

Commit: https://github.com/vim/vim/commit/0a0830624a260660c7fa692ecb7e6e5de09114ba
Author: Riley Bruins <rib...@hotmail.com>
Date: Mon Jun 3 20:40:45 2024 +0200

patch 9.1.0464: no whitespace padding in commentstring option in ftplugins

Problem: no whitespace padding in commentstring option in ftplugins
Solution: Change default to include whitespace padding, update
existing filetype plugins with the new default value
(Riley Bruins)

closes: #14843

Signed-off-by: Riley Bruins <rib...@hotmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index dbc04868f..91c3284af 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -179,6 +179,7 @@ runtime/ftplugin/kotlin.vim @udalov
runtime/ftplugin/less.vim @genoma
runtime/ftplugin/liquid.vim @tpope
runtime/ftplugin/lua.vim @dkearns
+runtime/ftplugin/lc.vim @ribru17
runtime/ftplugin/lynx.vim @dkearns
runtime/ftplugin/m3build.vim @dkearns
runtime/ftplugin/m3quake.vim @dkearns
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e28244f11..bc7f68713 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1909,13 +1909,14 @@ A jump table for the options with a short description can be found at |Q_op|.
insert a space.

*'commentstring'* *'cms'* *E537*
-'commentstring' 'cms' string (default "/*%s*/")
+'commentstring' 'cms' string (default "/* %s */")
local to buffer
{not available when compiled without the |+folding|
feature}
A template for a comment. The "%s" in the value is replaced with the
- comment text. Currently only used to add markers for folding, see
- |fold-marker|. Also used by comment plugins |comment-install|.
+ comment text, and should be padded with a space when possible.
+ Currently used to add markers for folding, see |fold-marker| also
+ commonly used by commenting plugins (e.g. |comment-install|).

*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
'compatible' 'cp' boolean (default on, off when a |vimrc| or |gvimrc|
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index 3473d796f..3fe8b2dad 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -41565,6 +41565,8 @@ Changed~
-------
- use 'smoothscroll' logic for CTRL-F and CTRL-B for pagewise scrolling
- use 'smoothscroll' logic for CTRL-D and CTRL-U for half-pagewise scrolling
+- the default for 'commentstring' contains whitespace padding to have
+ automatic comments look nicer |comment-install|

*added-9.2*
Added ~
diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim
index c16e7b032..d4bb6fe77 100644
--- a/runtime/ftplugin/abaqus.vim
+++ b/runtime/ftplugin/abaqus.vim
@@ -3,6 +3,7 @@
" Maintainer: Carl Osterwisch <cost...@gmail.com>
" Last Change: 2022 Oct 08
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin") | finish | endif
@@ -27,7 +28,7 @@ setlocal isfname-=,

" Define format of comment lines (see 'formatoptions' for uses)
setlocal comments=:**
-setlocal commentstring=**%s
+setlocal commentstring=**\ %s

" Definitions start with a * and assign a NAME, NSET, or ELSET
" Used in [d ^wd and other commands
diff --git a/runtime/ftplugin/arduino.vim b/runtime/ftplugin/arduino.vim
index dae3dd83d..60b11dab1 100644
--- a/runtime/ftplugin/arduino.vim
+++ b/runtime/ftplugin/arduino.vim
@@ -3,6 +3,7 @@
" Maintainer: The Vim Project <https://github.com/vim/vim>
" Ken Takata <https://github.com/k-takata>
" Last Change: 2024 Apr 12
+" 2024 Jun 02 by Riley Bruins <rib...@gmail.com> ('commentstring')
"
" Most of the part was copied from c.vim.

@@ -32,7 +33,7 @@ setlocal fo-=t fo+=croql

" These options have the right value as default, but the user may have
" overruled that.
-setlocal commentstring& define& include&
+setlocal commentstring=/*\ %s\ */ define& include&

" Set completion with CTRL-X CTRL-O to autoloaded function.
if exists('&ofu')
diff --git a/runtime/ftplugin/asm.vim b/runtime/ftplugin/asm.vim
index 0ae161039..4482b90d0 100644
--- a/runtime/ftplugin/asm.vim
+++ b/runtime/ftplugin/asm.vim
@@ -4,13 +4,14 @@
" Last Change: 2020 May 23
" 2023 Aug 28 by Vim Project (undo_ftplugin)
" 2024 Apr 09 by Vim Project (add Matchit support)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1

setl include=^\s*%\s*include
setl comments=:;,s1:/*,mb:*,ex:*/,://
-setl commentstring=;%s
+setl commentstring=;\ %s

let b:undo_ftplugin = "setl commentstring< comments< include<"

diff --git a/runtime/ftplugin/astro.vim b/runtime/ftplugin/astro.vim
index 0b0e03447..5d35ba962 100644
--- a/runtime/ftplugin/astro.vim
+++ b/runtime/ftplugin/astro.vim
@@ -2,6 +2,7 @@
" Language: Astro
" Maintainer: Romain Lafourcade <romainla...@gmail.com>
" Last Change: 2024 Apr 21
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -25,17 +26,17 @@ function! s:AstroComments() abort
\ || s:IdentifyScope('^\s*<script', '^\s*<\/script>')
" ECMAScript comments
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
- setlocal commentstring=//%s
+ setlocal commentstring=//\ %s

elseif s:IdentifyScope('^\s*<style', '^\s*<\/style>')
" CSS comments
setlocal comments=s1:/*,mb:*,ex:*/
- setlocal commentstring=/*%s*/
+ setlocal commentstring=/*\ %s\ */

else
" HTML comments
setlocal comments=s:<!--,m:\ \ \ \ ,e:-->
- setlocal commentstring=<!--%s-->
+ setlocal commentstring=<!--\ %s\ -->
endif
endfunction

diff --git a/runtime/ftplugin/bitbake.vim b/runtime/ftplugin/bitbake.vim
index 99fe33462..4d50a7feb 100644
--- a/runtime/ftplugin/bitbake.vim
+++ b/runtime/ftplugin/bitbake.vim
@@ -3,13 +3,14 @@
" Maintainer: Gregory Anders <gr...@gpanders.com>
" Repository: https://github.com/openembedded/bitbake
" Latest Revision: 2022-07-23
+" 2024-05-23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1

-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal comments=:#
setlocal suffixesadd=.bb,.bbclass

diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index e2eebc549..378d58065 100644
--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@@ -2,6 +2,7 @@
" Language: C
" Maintainer: The Vim Project <https://github.com/vim/vim>
" Last Change: 2023 Aug 22
+" 2024 Jun 02 by Riley Bruins <rib...@gmail.com> ('commentstring')
" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
@@ -24,7 +25,7 @@ setlocal fo-=t fo+=croql

" These options have the right value as default, but the user may have
" overruled that.
-setlocal commentstring& define& include&
+setlocal commentstring=/*\ %s\ */ define& include&

" Set completion with CTRL-X CTRL-O to autoloaded function.
if exists('&ofu')
diff --git a/runtime/ftplugin/calendar.vim b/runtime/ftplugin/calendar.vim
index f454ba1dc..c4e683acf 100644
--- a/runtime/ftplugin/calendar.vim
+++ b/runtime/ftplugin/calendar.vim
@@ -2,6 +2,7 @@
" Language: calendar(1) input file
" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
" Latest Revision: 2008-07-09
+" 2024-06-02 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -13,7 +14,7 @@ set cpo&vim

let b:undo_ftplugin = "setl com< cms< inc< fo<"

-setlocal comments=s1:/*,mb:*,ex:*/ commentstring& include&
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*\ %s\ */ include&
setlocal formatoptions-=t formatoptions+=croql

let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/cgdbrc.vim b/runtime/ftplugin/cgdbrc.vim
index 46cf135c5..99f9702d2 100644
--- a/runtime/ftplugin/cgdbrc.vim
+++ b/runtime/ftplugin/cgdbrc.vim
@@ -3,6 +3,7 @@
" Maintainer: Wu, Zhenyu <wuzh...@ustc.edu>
" Documentation: https://cgdb.github.io/docs/Configuring-CGDB.html
" Latest Revision: 2024-04-09
+" 2024-05-23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
@@ -14,7 +15,7 @@ set cpoptions&vim

let b:undo_ftplugin = 'setl com< cms<'

-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal comments=:#

let &cpoptions = s:save_cpoptions
diff --git a/runtime/ftplugin/csh.vim b/runtime/ftplugin/csh.vim
index a22bee327..74666b968 100644
--- a/runtime/ftplugin/csh.vim
+++ b/runtime/ftplugin/csh.vim
@@ -4,6 +4,7 @@
" Previous Maintainer: Dan Sharp
" Contributor: Johannes Zellner <joha...@zellner.org>
" Last Change: 2024 Jan 14
+" 2024 May 23 by Riley Bruins ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -14,7 +15,7 @@ let s:save_cpo = &cpo
set cpo-=C

setlocal comments=:#
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal formatoptions-=t
setlocal formatoptions+=crql

diff --git a/runtime/ftplugin/css.vim b/runtime/ftplugin/css.vim
index ece2def4e..778a9e12d 100644
--- a/runtime/ftplugin/css.vim
+++ b/runtime/ftplugin/css.vim
@@ -3,6 +3,7 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
" Last Change: 2020 Dec 21
+" 2024 Jun 02 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -14,7 +15,7 @@ set cpo&vim

let b:undo_ftplugin = "setl com< cms< inc< fo< ofu< isk<"

-setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*\ %s\ */
setlocal formatoptions-=t formatoptions+=croql
setlocal omnifunc=csscomplete#CompleteCSS
setlocal iskeyword+=-
diff --git a/runtime/ftplugin/desktop.vim b/runtime/ftplugin/desktop.vim
index bd6fd7097..d15afd24b 100644
--- a/runtime/ftplugin/desktop.vim
+++ b/runtime/ftplugin/desktop.vim
@@ -2,6 +2,7 @@
" Language: XDG desktop entry
" Maintainer: Eisuke Kawashima ( e.kawaschima+vim AT gmail.com )
" Last Change: 2022-07-26
+" 2024-05-24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
@@ -9,5 +10,5 @@ endif
let b:did_ftplugin = v:true

setl comments=:#
-setl commentstring=#%s
+setl commentstring=#\ %s
let b:undo_ftplugin = 'setl com< cms<'
diff --git a/runtime/ftplugin/dtd.vim b/runtime/ftplugin/dtd.vim
index bea8c5c18..f97014814 100644
--- a/runtime/ftplugin/dtd.vim
+++ b/runtime/ftplugin/dtd.vim
@@ -6,6 +6,7 @@
" Former maintainer: Dan Sharp
" Last Change: 2009 Jan 20
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -15,7 +16,7 @@ let b:did_ftplugin = 1
let s:save_cpo = &cpo
set cpo-=C

-setlocal commentstring=<!--%s-->
+setlocal commentstring=<!--\ %s\ -->
setlocal comments=s:<!--,m:\ \ \ \ \ ,e:-->

setlocal formatoptions-=t
diff --git a/runtime/ftplugin/dtrace.vim b/runtime/ftplugin/dtrace.vim
index 9288097f7..a276b310a 100644
--- a/runtime/ftplugin/dtrace.vim
+++ b/runtime/ftplugin/dtrace.vim
@@ -1,6 +1,7 @@
" Language: D script as described in "Solaris Dynamic Tracing Guide",
" http://docs.sun.com/app/docs/doc/817-6223
" Last Change: 2008/03/20
+" 2024/05/23 by Riley Bruins <rib...@gmail.com ('commentstring')
" Version: 1.2
" Maintainer: Nicolas Weber <nicola...@gmx.de>

@@ -26,8 +27,8 @@ setlocal fo-=t fo+=croql
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/

" dtrace uses /* */ comments. Set this explicitly, just in case the user
-" changed this (/*%s*/ is the default)
-setlocal commentstring=/*%s*/
+" changed this (/*\ %s\ */ is the default)
+setlocal commentstring=/*\ %s\ */

setlocal iskeyword+=@,$

diff --git a/runtime/ftplugin/dts.vim b/runtime/ftplugin/dts.vim
index 42e38338b..346ff9470 100644
--- a/runtime/ftplugin/dts.vim
+++ b/runtime/ftplugin/dts.vim
@@ -2,6 +2,7 @@
" Language: dts/dtsi (device tree files)
" Maintainer: Wu, Zhenyu <wuzh...@ustc.edu>
" Latest Revision: 2024 Apr 12
+" 2024 Jun 02 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
@@ -12,5 +13,5 @@ let b:undo_ftplugin = 'setl inc< cms< com<'

setlocal include=^\%(#include\\|/include/\)
" same as C
-setlocal commentstring&
+setlocal commentstring=/*\ %s\ */
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://
diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim
index 1cb57f4c8..5a3ab717d 100644
--- a/runtime/ftplugin/erlang.vim
+++ b/runtime/ftplugin/erlang.vim
@@ -6,7 +6,8 @@
" Eduardo Lopez (http://github.com/tapichu)
" Arvid Bjurklint (http://github.com/slarwise)
" Paweł Zacharek (http://github.com/subc2)
-" Last Update: 2023-Dec-20
+" Riley Bruins (http://github.com/ribru17) ('commentstring')
+" Last Update: 2024 May 23
" License: Vim license
" URL: https://github.com/vim-erlang/vim-erlang-runtime

@@ -27,7 +28,7 @@ if get(g:, 'erlang_folding', 0)
endif

setlocal comments=:%%%,:%%,:%
-setlocal commentstring=%%s
+setlocal commentstring=%\ %s

setlocal formatoptions+=ro

diff --git a/runtime/ftplugin/eruby.vim b/runtime/ftplugin/eruby.vim
index b5c4665d2..b3e074aa2 100644
--- a/runtime/ftplugin/eruby.vim
+++ b/runtime/ftplugin/eruby.vim
@@ -5,6 +5,7 @@
" Release Coordinator: Doug Kearns <dougk...@gmail.com>
" Last Change: 2022 May 15
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -125,7 +126,7 @@ if exists("loaded_matchit")
endif

" TODO: comments=
-setlocal commentstring=<%#%s%>
+setlocal commentstring=<%#\ %s\ %>

let b:undo_ftplugin = "setl cms< " .
\ " | unlet! b:browsefilter b:match_words | " . b:undo_ftplugin
diff --git a/runtime/ftplugin/fennel.vim b/runtime/ftplugin/fennel.vim
index 93cf36672..2a9623faf 100644
--- a/runtime/ftplugin/fennel.vim
+++ b/runtime/ftplugin/fennel.vim
@@ -2,13 +2,14 @@
" Language: Fennel
" Maintainer: Gregory Anders <greg[NOSPAM]@gpanders.com>
" Last Update: 2023 Jun 9
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
endif
let b:did_ftplugin = 1

-setlocal commentstring=;%s
+setlocal commentstring=;\ %s
setlocal comments=:;;,:;
setlocal formatoptions-=t
setlocal suffixesadd=.fnl
diff --git a/runtime/ftplugin/fish.vim b/runtime/ftplugin/fish.vim
index f06ad3a0b..55d7ea8dd 100644
--- a/runtime/ftplugin/fish.vim
+++ b/runtime/ftplugin/fish.vim
@@ -4,6 +4,7 @@
" Repository: https://github.com/nickeb96/fish.vim
" Last Change: February 1, 2023
" 2023 Aug 28 by Vim Project (undo_ftplugin)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -12,7 +13,7 @@ let b:did_ftplugin = 1

setlocal iskeyword=@,48-57,_,192-255,-,.
setlocal comments=:#
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal formatoptions+=crjq

let b:undo_ftplugin = "setl cms< com< fo< isk<"
diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim
index 3c325818d..19a4c1e62 100644
--- a/runtime/ftplugin/fortran.vim
+++ b/runtime/ftplugin/fortran.vim
@@ -11,6 +11,7 @@
" Doug Kearns, and Fritz Reese.
" Last Change: 2023 Dec 22
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do these settings when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -89,7 +90,7 @@ else
endif

" Set commentstring for foldmethod=marker
-setlocal cms=!%s
+setlocal cms=!\ %s

" Tabs are not a good idea in Fortran so the default is to expand tabs
if !exists("fortran_have_tabs")
diff --git a/runtime/ftplugin/fstab.vim b/runtime/ftplugin/fstab.vim
index 99805322c..0e7ffda49 100644
--- a/runtime/ftplugin/fstab.vim
+++ b/runtime/ftplugin/fstab.vim
@@ -3,6 +3,7 @@
" Maintainer: Radu Dineiu <radu....@gmail.com>
" URL: https://raw.github.com/rid9/vim-fstab/master/ftplugin/fstab.vim
" Last Change: 2021 Jan 02
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
" Version: 1.0
"
" Credits:
@@ -13,7 +14,7 @@ if exists("b:did_ftplugin")
endif
let b:did_ftplugin = 1

-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
let b:undo_ftplugin = "setlocal commentstring<"

" vim: ts=8 ft=vim
diff --git a/runtime/ftplugin/gdb.vim b/runtime/ftplugin/gdb.vim
index 7c10633be..af88a04d5 100644
--- a/runtime/ftplugin/gdb.vim
+++ b/runtime/ftplugin/gdb.vim
@@ -3,11 +3,12 @@
" Maintainer: Michaël Peeters <NOSPA...@noekeon.org>
" Last Changed: 2017-10-26
" 2024-04-10: - add Matchit support (by Vim Project)
+" 2024-04-23: - add space to commentstring (by Riley Bruins) ('commentstring')

if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1

-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal include=^\s*source

" Undo the stuff we changed.
diff --git a/runtime/ftplugin/groovy.vim b/runtime/ftplugin/groovy.vim
index cc7d6e35e..a2e2b2f93 100644
--- a/runtime/ftplugin/groovy.vim
+++ b/runtime/ftplugin/groovy.vim
@@ -2,6 +2,7 @@
" Language: groovy
" Maintainer: Justin M. Keyes <just...@gmail.com>
" Last Change: 2016 May 22
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
@@ -13,7 +14,7 @@ set cpo-=C

let b:undo_ftplugin = 'setlocal commentstring<'

-setlocal commentstring=//%s
+setlocal commentstring=//\ %s

let &cpo = s:cpo_save
unlet s:cpo_save
diff --git a/runtime/ftplugin/hamster.vim b/runtime/ftplugin/hamster.vim
index 5446e7228..904f267fd 100644
--- a/runtime/ftplugin/hamster.vim
+++ b/runtime/ftplugin/hamster.vim
@@ -3,6 +3,7 @@
" Version: 2.0.6.0
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
" Last Change: 2021 Jan 19
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -31,7 +32,7 @@ if &tw == 0
endif

" Comments start with a double quote
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s

" Move around functions.
noremap <silent><buffer> [[ :call search('^\s*sub\>', "bW")<CR>
diff --git a/runtime/ftplugin/html.vim b/runtime/ftplugin/html.vim
index 3aa60a873..5495f859d 100644
--- a/runtime/ftplugin/html.vim
+++ b/runtime/ftplugin/html.vim
@@ -3,6 +3,7 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Previous Maintainer: Dan Sharp
" Last Change: 2024 Jan 14
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -13,7 +14,7 @@ let s:save_cpo = &cpo
set cpo-=C

setlocal matchpairs+=<:>
-setlocal commentstring=<!--%s-->
+setlocal commentstring=<!--\ %s\ -->
setlocal comments=s:<!--,m:\ \ \ \ ,e:-->

let b:undo_ftplugin = "setlocal comments< commentstring< matchpairs<"
diff --git a/runtime/ftplugin/indent.vim b/runtime/ftplugin/indent.vim
index 64a650ad7..32208d38d 100644
--- a/runtime/ftplugin/indent.vim
+++ b/runtime/ftplugin/indent.vim
@@ -3,6 +3,7 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
" Latest Revision: 2008-07-09
+" 2024-06-02 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -14,7 +15,7 @@ set cpo&vim

let b:undo_ftplugin = "setl com< cms< fo<"

-setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*\ %s\ */
setlocal formatoptions-=t formatoptions+=croql

let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/initex.vim b/runtime/ftplugin/initex.vim
index 0ee3e8d89..71049df6b 100644
--- a/runtime/ftplugin/initex.vim
+++ b/runtime/ftplugin/initex.vim
@@ -3,6 +3,7 @@
" Maintainer: Benji Fisher, Ph.D. <be...@member.AMS.org>
" Version: 1.0
" Last Change: Wed 19 Apr 2006
+" Last Change: Thu 23 May 2024 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer.
if exists("b:did_ftplugin")
@@ -23,7 +24,7 @@ setlocal com=sO:%\ -,mO:%\ \ ,eO:%%,:%

" Set 'commentstring' to recognize the % comment character:
" (Thanks to Ajit Thakkar.)
-setlocal cms=%%s
+setlocal cms=%\ %s

" Allow "[d" to be used to find a macro definition:
let &l:define='\\([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
diff --git a/runtime/ftplugin/java.vim b/runtime/ftplugin/java.vim
index fa2b61075..eee7ef015 100644
--- a/runtime/ftplugin/java.vim
+++ b/runtime/ftplugin/java.vim
@@ -5,6 +5,7 @@
" Repository: https://github.com/zzzyxwvut/java-vim.git
" Last Change: 2024 Apr 18
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -61,7 +62,7 @@ setlocal formatoptions-=t formatoptions+=croql
" Set 'comments' to format dashed lists in comments. Behaves just like C.
setlocal comments& comments^=sO:*\ -,mO:*\ \ ,exO:*/

-setlocal commentstring=//%s
+setlocal commentstring=//\ %s

" Change the :browse e filter to primarily show Java-related files.
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
diff --git a/runtime/ftplugin/javascript.vim b/runtime/ftplugin/javascript.vim
index 263395490..455b794cf 100644
--- a/runtime/ftplugin/javascript.vim
+++ b/runtime/ftplugin/javascript.vim
@@ -3,6 +3,7 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Contributor: Romain Lafourcade <romainla...@gmail.com>
" Last Change: 2024 Jan 14
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -24,7 +25,7 @@ endif
" Set 'comments' to format dashed lists in comments.
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://

-setlocal commentstring=//%s
+setlocal commentstring=//\ %s

" Change the :browse e filter to primarily show JavaScript-related files.
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
diff --git a/runtime/ftplugin/jq.vim b/runtime/ftplugin/jq.vim
index 88958e80d..d25883640 100644
--- a/runtime/ftplugin/jq.vim
+++ b/runtime/ftplugin/jq.vim
@@ -2,6 +2,7 @@
" Language: jq
" Maintainer: Vito <vito...@gmail.com>
" Last Change: 2024 Apr 29
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
" Upstream: https://github.com/vito-c/jq.vim

if exists('b:did_ftplugin')
@@ -10,7 +11,7 @@ endif
let b:did_ftplugin = 1

setlocal include=^\s*\%(import\\|include\)
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
compiler jq

let b:undo_ftplugin = 'setl commentstring< include<'
diff --git a/runtime/ftplugin/jsonc.vim b/runtime/ftplugin/jsonc.vim
index e47a75f57..ec3268492 100644
--- a/runtime/ftplugin/jsonc.vim
+++ b/runtime/ftplugin/jsonc.vim
@@ -5,6 +5,7 @@
" https://github.com/kevinoid/vim-jsonc
" License: MIT
" Last Change: 2021 Nov 22
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

runtime! ftplugin/json.vim

@@ -15,7 +16,7 @@ else
endif

" Set comment (formatting) related options. {{{1
-setlocal commentstring=//%s comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://

" Let Vim know how to disable the plug-in.
let b:undo_ftplugin = 'setlocal commentstring< comments<'
diff --git a/runtime/ftplugin/lc.vim b/runtime/ftplugin/lc.vim
new file mode 100644
index 000000000..e818f1aec
--- /dev/null
+++ b/runtime/ftplugin/lc.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language: Elsa
+" Maintainer: Riley Bruins <rib...@gmail.com>
+" Last Change: 2024 May 25
+
+if exists('b:did_ftplugin')
+ finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:-- commentstring=--\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
diff --git a/runtime/ftplugin/ld.vim b/runtime/ftplugin/ld.vim
index 1ab80d533..9cc70bd94 100644
--- a/runtime/ftplugin/ld.vim
+++ b/runtime/ftplugin/ld.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: ld(1) script
" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
-" Latest Revision: 2008-07-09
+" Latest Revision: 2008 Jul 09
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -13,7 +14,7 @@ set cpo&vim

let b:undo_ftplugin = "setl com< cms< inc< fo<"

-setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*%s*/ include=^\s*INCLUDE
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*\ %s\ */ include=^\s*INCLUDE
setlocal formatoptions-=t formatoptions+=croql

let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/liquid.vim b/runtime/ftplugin/liquid.vim
index f24ec4cbb..dbd8abe45 100644
--- a/runtime/ftplugin/liquid.vim
+++ b/runtime/ftplugin/liquid.vim
@@ -2,6 +2,7 @@
" Language: Liquid
" Maintainer: Tim Pope <vimN...@tpope.org>
" Last Change: 2022 Mar 15
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
@@ -56,6 +57,6 @@ if exists('loaded_matchit')
let b:match_words .= '\<\%(if\w*\|unless\|case\)\>:\<\%(elsif\|else\|when\)\>:\<end\%(if\w*\|unless\|case\)\>,\<\%(for\|tablerow\)\>:\%({%\s*\)\@<=empty\>:\<end\%(for\|tablerow\)\>,\<\(capture\|comment\|highlight\)\>:\<end \>'
endif

-setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %}
+setlocal commentstring={%\ comment\ %}\ %s\ {%\ endcomment\ %}

let b:undo_ftplugin .= 'setl cms< | unlet! b:browsefilter b:match_words'
diff --git a/runtime/ftplugin/lisp.vim b/runtime/ftplugin/lisp.vim
index db3ac9663..fe3c6fe99 100644
--- a/runtime/ftplugin/lisp.vim
+++ b/runtime/ftplugin/lisp.vim
@@ -5,6 +5,7 @@
" Original author: Dorai Sitaram <ds...@gte.com>
" Original URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
" Last Change: Mar 10, 2021
+" May 23, 2024 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -19,6 +20,6 @@ setl define=^\s*(def\k*
setl formatoptions-=t
setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
setl lisp
-setl commentstring=;%s
+setl commentstring=;\ %s

let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
diff --git a/runtime/ftplugin/markdown.vim b/runtime/ftplugin/markdown.vim
index 022dd0d60..d4ee5ac24 100644
--- a/runtime/ftplugin/markdown.vim
+++ b/runtime/ftplugin/markdown.vim
@@ -2,6 +2,7 @@
" Language: Markdown
" Maintainer: Tim Pope <https://github.com/tpope/vim-markdown>
" Last Change: 2023 Dec 28
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -12,7 +13,7 @@ runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
let s:keepcpo= &cpo
set cpo&vim

-setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=<!--%s-->
+setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=<!--\ %s\ -->
setlocal formatoptions+=tcqln formatoptions-=r formatoptions-=o
setlocal formatlistpat=^\s*\d\+\.\s\+\\|^\s*[-*+]\s\+\\|^\[^\ze[^\]]\+\]:\&^.\{4\}

diff --git a/runtime/ftplugin/mma.vim b/runtime/ftplugin/mma.vim
index ce4cee18a..91a8111bc 100644
--- a/runtime/ftplugin/mma.vim
+++ b/runtime/ftplugin/mma.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Mathematica
" Maintainer: Ian Ford <ia...@wolfram.com>
-" Last Change: 22 January 2019
+" Last Change: 2019 Jan 22
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -13,4 +14,4 @@ let b:did_ftplugin = 1

let b:undo_ftplugin = "setlocal commentstring<"

-setlocal commentstring=\(*%s*\)
+setlocal commentstring=\(*\ %s\ *\)
diff --git a/runtime/ftplugin/modula2.vim b/runtime/ftplugin/modula2.vim
index 9c1acc276..306688da0 100644
--- a/runtime/ftplugin/modula2.vim
+++ b/runtime/ftplugin/modula2.vim
@@ -2,6 +2,7 @@
" Language: Modula-2
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Last Change: 2024 Jan 14
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -17,7 +18,7 @@ if s:dialect ==# "r10"
setlocal comments=s:(*,m:\ ,e:*),:!
setlocal commentstring=!\ %s
else
- setlocal commentstring=(*%s*)
+ setlocal commentstring=(*\ %s\ *)
setlocal comments=s:(*,m:\ ,e:*)
endif
setlocal formatoptions-=t formatoptions+=croql
diff --git a/runtime/ftplugin/modula3.vim b/runtime/ftplugin/modula3.vim
index 45dd7ca01..f899d1d10 100644
--- a/runtime/ftplugin/modula3.vim
+++ b/runtime/ftplugin/modula3.vim
@@ -2,6 +2,7 @@
" Language: Modula-3
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Last Change: 2024 Jan 14
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -12,7 +13,7 @@ let s:cpo_save = &cpo
set cpo&vim

setlocal comments=s0:(*,mb:\ ,ex:*)
-setlocal commentstring=(*%s*)
+setlocal commentstring=(*\ %s\ *)
setlocal formatoptions-=t formatoptions+=croql
setlocal suffixesadd+=.m3
setlocal formatprg=m3pp
diff --git a/runtime/ftplugin/nroff.vim b/runtime/ftplugin/nroff.vim
index cf62d02da..ed0b32f5f 100644
--- a/runtime/ftplugin/nroff.vim
+++ b/runtime/ftplugin/nroff.vim
@@ -2,15 +2,15 @@
" Language: roff(7)
" Maintainer: Aman Verma
" Homepage: https://github.com/a-vrma/vim-nroff-ftplugin
-" Previous Maintainer: Chris Spiegel <cspi...@gmail.com>
-" Last Change: 2020 Nov 21
+" Previous Maintainer: Chris Spiegel <cspi...@gmail.com>
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1

-setlocal commentstring=.\\"%s
+setlocal commentstring=.\\"\ %s
setlocal comments=:.\\"
setlocal sections+=Sh

diff --git a/runtime/ftplugin/obse.vim b/runtime/ftplugin/obse.vim
index 6d865f05e..bf5076f41 100644
--- a/runtime/ftplugin/obse.vim
+++ b/runtime/ftplugin/obse.vim
@@ -2,8 +2,9 @@
" Language: Oblivion Language (obl)
" Original Creator: Kat <katis...@gmail.com>
" Maintainer: Kat <katis...@gmail.com>
-" Created: August 08, 2021
-" Last Change: 13 November 2022
+" Created: 2021 Aug 08
+" Last Change: 2022 Nov 13
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -20,7 +21,7 @@ noremap <script> <buffer> <silent> ]] <nop>
noremap <script> <buffer> <silent> [] <nop>
noremap <script> <buffer> <silent> ][ <nop>

-setlocal commentstring=;%s
+setlocal commentstring=;\ %s
setlocal comments=:;

function s:NextSection(type, backwards, visual)
diff --git a/runtime/ftplugin/ocaml.vim b/runtime/ftplugin/ocaml.vim
index 20172c9b3..8b88d8d00 100644
--- a/runtime/ftplugin/ocaml.vim
+++ b/runtime/ftplugin/ocaml.vim
@@ -5,12 +5,14 @@
" Pierre Vittet <pierre...@pvittet.com>
" Stefano Zacchiroli <za...@bononia.it>
" Vincent Aravantinos <firstna...@imag.fr>
+" Riley Bruins <rib...@gmail.com> ('commentstring')
" URL: https://github.com/ocaml/vim-ocaml
" Last Change:
" 2013 Oct 27 - Added commentstring (MM)
" 2013 Jul 26 - load default compiler settings (MM)
" 2013 Jul 24 - removed superfluous efm-setting (MM)
" 2013 Jul 22 - applied fixes supplied by Hirotaka Hamada (MM)
+" 2024 May 23 - added space in commentstring (RB)

if exists("b:did_ftplugin")
finish
@@ -40,7 +42,7 @@ set cpo&vim
" Comment string
setlocal comments=sr:(*\ ,mb:\ ,ex:*)
setlocal comments^=sr:(**,mb:\ \ ,ex:*)
-setlocal commentstring=(*%s*)
+setlocal commentstring=(*\ %s\ *)

" Add mappings, unless the user didn't want this.
if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
diff --git a/runtime/ftplugin/odin.vim b/runtime/ftplugin/odin.vim
index 9d94a5780..c0ad262f6 100644
--- a/runtime/ftplugin/odin.vim
+++ b/runtime/ftplugin/odin.vim
@@ -1,10 +1,11 @@
vim9script

# Vim filetype plugin file
-# Language: Odin
-# Maintainer: Maxim Kim <hab...@gmail.com>
-# Website: https://github.com/habamax/vim-odin
-# Last Change: 2024-01-15
+# Language: Odin
+# Maintainer: Maxim Kim <hab...@gmail.com>
+# Website: https://github.com/habamax/vim-odin
+# Last Change: 2024 Jan 15
+# 2024-May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -16,5 +17,5 @@ b:undo_ftplugin = 'setlocal commentstring<'
\ .. '| setlocal suffixesadd<'

setlocal suffixesadd=.odin
-setlocal commentstring=//%s
+setlocal commentstring=//\ %s
setlocal comments=s1:/*,mb:*,ex:*/,://
diff --git a/runtime/ftplugin/openvpn.vim b/runtime/ftplugin/openvpn.vim
index 56c0f25b3..9cd7b7ad1 100644
--- a/runtime/ftplugin/openvpn.vim
+++ b/runtime/ftplugin/openvpn.vim
@@ -2,6 +2,7 @@
" Language: OpenVPN
" Maintainer: ObserverOfTime <chrono...@disroot.org>
" Last Change: 2022 Oct 16
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists('b:did_ftplugin')
finish
@@ -9,6 +10,6 @@ endif
let b:did_ftplugin = 1

setlocal iskeyword+=-,.,/
-setlocal comments=:#,:; commentstring=#%s
+setlocal comments=:#,:; commentstring=#\ %s

let b:undo_ftplugin = 'setl isk< com< cms<'
diff --git a/runtime/ftplugin/pascal.vim b/runtime/ftplugin/pascal.vim
index 9abd7dd38..7c800c4fb 100644
--- a/runtime/ftplugin/pascal.vim
+++ b/runtime/ftplugin/pascal.vim
@@ -3,6 +3,7 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Previous Maintainer: Dan Sharp
" Last Change: 2024 Jan 14
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -11,7 +12,7 @@ let s:cpo_save = &cpo
set cpo&vim

set comments=s:(*,m:\ ,e:*),s:{,m:\ ,e:}
-set commentstring={%s}
+set commentstring={\ %s\ }

if exists("pascal_delphi")
set comments+=:///
diff --git a/runtime/ftplugin/pdf.vim b/runtime/ftplugin/pdf.vim
index 1ed99117d..96c77c870 100644
--- a/runtime/ftplugin/pdf.vim
+++ b/runtime/ftplugin/pdf.vim
@@ -2,13 +2,14 @@
" Language: PDF
" Maintainer: Tim Pope <vimN...@tpope.info>
" Last Change: 2007 Dec 16
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1

-setlocal commentstring=%%s
+setlocal commentstring=%\ %s
setlocal comments=:%
let b:undo_ftplugin = "setlocal cms< com< | unlet! b:match_words"

diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index 8c6a80eb4..03368a7af 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -8,6 +8,7 @@
" 2023 Sep 07 by Vim Project (safety check: don't execute perl
" from current directory)
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -22,7 +23,7 @@ setlocal formatoptions+=crqol
setlocal keywordprg=perldoc\ -f

setlocal comments=:#
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s

" Provided by Ned Konz <ned at bike-nomad dot com>
"---------------------------------------------
diff --git a/runtime/ftplugin/php.vim b/runtime/ftplugin/php.vim
index f03f14512..e124961ba 100644
--- a/runtime/ftplugin/php.vim
+++ b/runtime/ftplugin/php.vim
@@ -3,6 +3,7 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Previous Maintainer: Dan Sharp
" Last Change: 2024 Jan 14
+" Last Change: 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -44,7 +45,7 @@ if exists("b:match_skip")
endif

setlocal comments=s1:/*,mb:*,ex:*/,://,:#
-setlocal commentstring=/*%s*/
+setlocal commentstring=/*\ %s\ */
setlocal formatoptions+=l formatoptions-=t

if get(g:, "php_autocomment", 1)
diff --git a/runtime/ftplugin/ps1.vim b/runtime/ftplugin/ps1.vim
index d6ab01016..9d698f242 100644
--- a/runtime/ftplugin/ps1.vim
+++ b/runtime/ftplugin/ps1.vim
@@ -3,6 +3,7 @@
" URL: https://github.com/PProvost/vim-ps1
" Last Change: 2021 Apr 02
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin") | finish | endif
@@ -14,7 +15,7 @@ let s:cpo_save = &cpo
set cpo&vim

setlocal tw=0
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal formatoptions=tcqro
" Enable autocompletion of hyphenated PowerShell commands,
" e.g. Get-Content or Get-ADUser
diff --git a/runtime/ftplugin/ps1xml.vim b/runtime/ftplugin/ps1xml.vim
index 17bb181f3..0052de19c 100644
--- a/runtime/ftplugin/ps1xml.vim
+++ b/runtime/ftplugin/ps1xml.vim
@@ -3,6 +3,7 @@
" URL: https://github.com/PProvost/vim-ps1
" Last Change: 2021 Apr 02
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin") | finish | endif
@@ -14,7 +15,7 @@ let s:cpo_save = &cpo
set cpo&vim

setlocal tw=0
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal formatoptions=tcqro

" Change the browse dialog on Win32 and GTK to show mainly PowerShell-related files
diff --git a/runtime/ftplugin/qml.vim b/runtime/ftplugin/qml.vim
index aa05c11bf..53df11c6b 100644
--- a/runtime/ftplugin/qml.vim
+++ b/runtime/ftplugin/qml.vim
@@ -3,6 +3,7 @@
" Maintainer: Chase Knowlden <haroldk...@gmail.com>
" Last Change: 2023 Aug 16
" 2023 Aug 23 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists( 'b:did_ftplugin' )
finish
@@ -28,7 +29,7 @@ endif

" Set 'comments' to format dashed lists in comments.
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
-setlocal commentstring=//%s
+setlocal commentstring=//\ %s

setlocal formatoptions-=t
setlocal formatoptions+=croql
diff --git a/runtime/ftplugin/racket.vim b/runtime/ftplugin/racket.vim
index 84f542214..7bfd87ddc 100644
--- a/runtime/ftplugin/racket.vim
+++ b/runtime/ftplugin/racket.vim
@@ -3,8 +3,7 @@
" Maintainer: D. Ben Knoble <ben.knob...@gmail.com>
" Previous Maintainer: Will Langstroth <wi...@langstroth.com>
" URL: https://github.com/benknoble/vim-racket
-" Last Change: 2022 Aug 29
-" 2024 Jan 14 by Vim Project (browsefilter)
+" Last Change: 2024 May 28

if exists("b:did_ftplugin")
finish
@@ -21,7 +20,7 @@ setlocal iskeyword=@,!,#-',*-:,<-Z,a-z,~,_,94
setlocal comments=:;;;;,:;;;,:;;,:;
setlocal formatoptions+=r

-"setlocal commentstring=;;%s
+"setlocal commentstring=;;\ %s
setlocal commentstring=#\|\ %s\ \|#

setlocal formatprg=raco\ fmt
diff --git a/runtime/ftplugin/raku.vim b/runtime/ftplugin/raku.vim
index 941222bd3..f57427e32 100644
--- a/runtime/ftplugin/raku.vim
+++ b/runtime/ftplugin/raku.vim
@@ -1,10 +1,11 @@
" Vim filetype plugin file
-" Language: Raku
-" Maintainer: vim-perl <vim-...@googlegroups.com>
-" Homepage: https://github.com/Raku/vim-raku
+" Language: Raku
+" Maintainer: vim-perl <vim-...@googlegroups.com>
+" Homepage: https://github.com/Raku/vim-raku
" Bugs/requests: https://github.com/Raku/vim-raku/issues
-" Last Change: 2021-04-16
-" Contributors: Hinrik Örn Sigurðsson <hinri...@gmail.com>
+" Last Change: 2021 Apr 16
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
+" Contributors: Hinrik Örn Sigurðsson <hinri...@gmail.com>
"
" Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>

@@ -21,7 +22,7 @@ setlocal formatoptions+=crqol
setlocal keywordprg=p6doc

setlocal comments=:#\|,:#=,:#
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s

" Provided by Ned Konz <ned at bike-nomad dot com>
"---------------------------------------------
diff --git a/runtime/ftplugin/rust.vim b/runtime/ftplugin/rust.vim
index fb15b444d..c2bcdd34b 100644
--- a/runtime/ftplugin/rust.vim
+++ b/runtime/ftplugin/rust.vim
@@ -1,7 +1,8 @@
-" Language: Rust
-" Description: Vim ftplugin for Rust
-" Maintainer: Chris Morgan <m...@chrismorgan.info>
-" Last Change: 2024-03-17
+" Language: Rust
+" Description: Vim ftplugin for Rust
+" Maintainer: Chris Morgan <m...@chrismorgan.info>
+" Last Change: 2024 Mar 17
+" 2024 May 23 by Riley Bruins <rib...@gmail.com ('commentstring')
" For bugs, patches and license go to https://github.com/rust-lang/rust.vim

if exists("b:did_ftplugin")
@@ -36,7 +37,7 @@ if get(g:, 'rust_bang_comment_leader', 0)
else
setlocal comments=s0:/*!,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,://
endif
-setlocal commentstring=//%s
+setlocal commentstring=//\ %s
setlocal formatoptions-=t formatoptions+=croqnl
" j was only added in 7.3.541, so stop complaints about its nonexistence
silent! setlocal formatoptions+=j
diff --git a/runtime/ftplugin/scdoc.vim b/runtime/ftplugin/scdoc.vim
index 552c865ba..8225e437a 100644
--- a/runtime/ftplugin/scdoc.vim
+++ b/runtime/ftplugin/scdoc.vim
@@ -1,7 +1,8 @@
" scdoc filetype plugin
-" Maintainer: Gregory Anders <con...@gpanders.com>
-" Last Updated: 2022-05-09
-" Upstream: https://github.com/gpanders/vim-scdoc
+" Maintainer: Gregory Anders <con...@gpanders.com>
+" Last Updated: 2022 May 09
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
+" Upstream: https://github.com/gpanders/vim-scdoc

" Only do this when not done yet for this buffer
if exists('b:did_ftplugin')
@@ -12,7 +13,7 @@ endif
let b:did_ftplugin = 1

setlocal comments=b:;
-setlocal commentstring=;%s
+setlocal commentstring=;\ %s
setlocal formatoptions+=t
setlocal noexpandtab
setlocal shiftwidth=0
diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim
index 04655bc13..03f625b56 100644
--- a/runtime/ftplugin/scheme.vim
+++ b/runtime/ftplugin/scheme.vim
@@ -1,11 +1,12 @@
" Vim filetype plugin file
-" Language: Scheme (R7RS)
-" Last Change: 2019-11-19
-" Author: Evan Hanson <ev...@foldling.org>
-" Maintainer: Evan Hanson <ev...@foldling.org>
+" Language: Scheme (R7RS)
+" Last Change: 2019 Nov 19
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
+" Author: Evan Hanson <ev...@foldling.org>
+" Maintainer: Evan Hanson <ev...@foldling.org>
" Previous Maintainer: Sergey Khorev <sergey...@gmail.com>
-" Repository: https://git.foldling.org/vim-scheme.git
-" URL: https://foldling.org/vim/ftplugin/scheme.vim
+" Repository: https://git.foldling.org/vim-scheme.git
+" URL: https://foldling.org/vim/ftplugin/scheme.vim

if exists('b:did_ftplugin')
finish
@@ -16,7 +17,7 @@ set cpo&vim

setl lisp
setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,mb:\|,ex:\|#
-setl commentstring=;%s
+setl commentstring=;\ %s
setl define=^\s*(def\k*
setl iskeyword=33,35-39,42-43,45-58,60-90,94,95,97-122,126

diff --git a/runtime/ftplugin/tcl.vim b/runtime/ftplugin/tcl.vim
index fa900096c..214d9c256 100644
--- a/runtime/ftplugin/tcl.vim
+++ b/runtime/ftplugin/tcl.vim
@@ -3,6 +3,7 @@
" Maintainer: Robert L Hicks <sig...@gmail.com>
" Latest Revision: 2009-05-01
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -15,7 +16,7 @@ let s:cpo_save = &cpo
set cpo-=C

setlocal comments=:#
-setlocal commentstring=#%s
+setlocal commentstring=#\ %s
setlocal formatoptions+=croql

" Change the browse dialog on Windows to show mainly Tcl-related files
diff --git a/runtime/ftplugin/typescript.vim b/runtime/ftplugin/typescript.vim
index 680521df3..fb5f4e135 100644
--- a/runtime/ftplugin/typescript.vim
+++ b/runtime/ftplugin/typescript.vim
@@ -2,6 +2,7 @@
" Language: TypeScript
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Last Change: 2024 Jan 14
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -18,7 +19,7 @@ setlocal formatoptions-=t formatoptions+=croql
" Set 'comments' to format dashed lists in comments.
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://

-setlocal commentstring=//%s
+setlocal commentstring=//\ %s

setlocal suffixesadd+=.ts,.d.ts,.tsx,.js,.jsx,.cjs,.mjs

diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index 67f360bf3..11c05d192 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -2,6 +2,7 @@
" Language: Vim
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Last Change: 2024 Apr 13
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
@@ -51,7 +52,7 @@ setlocal keywordprg=:help

" Comments starts with # in Vim9 script. We have to guess which one to use.
if "
" .. getline(1, 32)->join("
") =~# '
\s*vim9\%[script]\>'
- setlocal commentstring=#%s
+ setlocal commentstring=#\ %s
else
setlocal commentstring=\"%s
endif
diff --git a/runtime/ftplugin/wat.vim b/runtime/ftplugin/wat.vim
index 35d2d6a32..ad1140bbb 100644
--- a/runtime/ftplugin/wat.vim
+++ b/runtime/ftplugin/wat.vim
@@ -2,6 +2,7 @@
" Language: WebAssembly
" Maintainer: rhysd <lin9...@yahoo.co.jp>
" Last Change: Nov 14, 2023
+" May 24, 2024 by Riley Bruins <rib...@gmail.com> ('commentstring')
" For bugs, patches and license go to https://github.com/rhysd/vim-wasm

if exists("b:did_ftplugin")
@@ -10,7 +11,7 @@ endif
let b:did_ftplugin = 1

setlocal comments=s:(;,e:;),:;;
-setlocal commentstring=(;%s;)
+setlocal commentstring=(;\ %s\ ;)
setlocal formatoptions-=t
setlocal iskeyword+=$,.,/

diff --git a/runtime/ftplugin/xdefaults.vim b/runtime/ftplugin/xdefaults.vim
index c1aff7017..26c7516f8 100644
--- a/runtime/ftplugin/xdefaults.vim
+++ b/runtime/ftplugin/xdefaults.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
-" Language: X resources files like ~/.Xdefaults (xrdb)
-" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
-" Latest Revision: 2008-07-09
+" Language: X resources files like ~/.Xdefaults (xrdb)
+" Previous Maintainer: Nikolai Weibull <n...@bitwi.se>
+" Latest Revision: 2008 Jul 09
+" 2024 Jun 03 by Riley Bruins <rib...@gmail.com> ('commentstring')

if exists("b:did_ftplugin")
finish
@@ -13,7 +14,7 @@ set cpo&vim

let b:undo_ftplugin = "setl com< cms< inc< fo<"

-setlocal comments=s1:/*,mb:*,ex:*/,:! commentstring& inc&
+setlocal comments=s1:/*,mb:*,ex:*/,:! commentstring=!\ %s inc&
setlocal formatoptions-=t formatoptions+=croql

let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/xml.vim b/runtime/ftplugin/xml.vim
index b81c3980d..83c528eff 100644
--- a/runtime/ftplugin/xml.vim
+++ b/runtime/ftplugin/xml.vim
@@ -3,6 +3,7 @@
" Maintainer: Christian Brabandt <c...@256bit.org>
" Last Changed: Dec 07th, 2018
" 2024 Jan 14 by Vim Project (browsefilter)
+" 2024 May 23 by Riley Bruins <rib...@gmail.com> ('commentstring')
" Repository: https://github.com/chrisbra/vim-xml-ftplugin
" Previous Maintainer: Dan Sharp
" URL: http://dwsharp.users.sourceforge.net/vim/ftplugin
@@ -15,7 +16,7 @@ let b:did_ftplugin = 1
let s:save_cpo = &cpo
set cpo&vim

-setlocal commentstring=<!--%s-->
+setlocal commentstring=<!--\ %s\ -->
" Remove the middlepart from the comments section, as this causes problems:
" https://groups.google.com/d/msg/vim_dev/x4GT-nqa0Kg/jvtRnEbtAnMJ
setlocal comments=s:<!--,e:-->
diff --git a/runtime/syntax/lc.vim b/runtime/syntax/lc.vim
index a33452938..1991c1b58 100644
--- a/runtime/syntax/lc.vim
+++ b/runtime/syntax/lc.vim
@@ -2,6 +2,7 @@
" Language: Elsa
" Maintainer: Miles Glapa-Grossklag <mi...@glapa-grossklag.com>
" Last Change: 2023-01-29
+" 2024 May 25 by Riley Bruins <rib...@gmail.com> (move 'commentstring' to ftplugin)

if exists('b:current_syntax')
finish
@@ -13,7 +14,6 @@ syntax match elsaKeyword " :"
highlight link elsaKeyword Keyword

" Comments
-setlocal commentstring=--%s
syntax match elsaComment " --.*$"
highlight link elsaComment Comment

diff --git a/runtime/syntax/mma.vim b/runtime/syntax/mma.vim
index d2f22e9be..802cbe553 100644
--- a/runtime/syntax/mma.vim
+++ b/runtime/syntax/mma.vim
@@ -2,6 +2,7 @@
" Language: Mathematica
" Maintainer: steve layland <lay...@wolfram.com>
" Last Change: 2012 Feb 03 by Thilo Six
+" 2024 May 24 by Riley Bruins <rib...@gmail.com> (remove 'commentstring')
" Source: http://members.wri.com/layland/vim/syntax/mma.vim
" http://vim.sourceforge.net/scripts/script.php?script_id=1273
" Id: $Id: mma.vim,v 1.4 2006/04/14 20:40:38 vimboss Exp $
@@ -248,7 +249,6 @@ syntax match mmaBoring "[(){}]" contained
"syntax region mmaRegion start="(\*\+[^<]*<!--[^>]*\*\+)" end="--> \*)" containedin=ALLBUT,@mmaStrings transparent fold keepend

" show fold text
-set commentstring='(*%s*)'
"set foldtext=MmaFoldText()

"function MmaFoldText()
diff --git a/src/optiondefs.h b/src/optiondefs.h
index 33e31656a..50472e3f6 100644
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -629,7 +629,7 @@ static struct vimoption options[] =
{"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT,
#ifdef FEAT_FOLDING
(char_u *)&p_cms, PV_CMS, did_set_commentstring, NULL,
- {(char_u *)"/*%s*/", (char_u *)0L}
+ {(char_u *)"/* %s */", (char_u *)0L}
#else
(char_u *)NULL, PV_NONE, NULL, NULL,
{(char_u *)0L, (char_u *)0L}
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index a195bcaea..8cca2b932 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -76,7 +76,7 @@ let test_values = {
\ 'clipboard': [['', 'unnamed', 'autoselect,unnamed', 'html', 'exclude:vimdisplay'], ['xxx', '\ze*', 'exclude:\%(']],
\ 'colorcolumn': [['', '8', '+2'], ['xxx']],
\ 'comments': [['', 'b:#'], ['xxx']],
- \ 'commentstring': [['', '/*%s*/'], ['xxx']],
+ \ 'commentstring': [['', '/*\ %s\ */'], ['xxx']],
\ 'complete': [['', 'w,b'], ['xxx']],
\ 'concealcursor': [['', 'n', 'nvic'], ['xxx']],
\ 'completeopt': [['', 'menu', 'menu,longest'], ['xxx', 'menu,,,longest,']],
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 871d427bf..dedc4a243 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -8,7 +8,73 @@ func PrepIndent(arg)
return [a:arg] + repeat([" ".a:arg], 5)
endfu

-func Test_address_fold()
+func Test_address_fold_new_default_commentstring()
+ " Test with the new commentstring defaults, that includes padding after v9.1.464
+ new
+ call setline(1, ['int FuncName() {/* {{{ */', 1, 2, 3, 4, 5, '}/* }}} */',
+ \ 'after fold 1', 'after fold 2', 'after fold 3'])
+ setl fen fdm=marker
+ " The next commands should all copy the same part of the buffer,
+ " regardless of the addressing type, since the part to be copied
+ " is folded away
+ :1y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ :.y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ :.+y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ :.,.y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ :sil .1,.y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ " use silent to make E493 go away
+ :sil .+,.y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ :,y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+ :,+y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */','after fold 1'], getreg(0,1,1))
+ " using .+3 as second address should c opy the whole folded line + the next 3
+ " lines
+ :.,+3y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */',
+ \ 'after fold 1', 'after fold 2' , 'after fold 3'], getreg(0,1,1))
+ :sil .,-2y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3', '4', '5', '}/* }}} */'], getreg(0,1,1))
+
+ " now test again with folding disabled
+ set nofoldenable
+ :1y
+ call assert_equal(['int FuncName() {/* {{{ */'], getreg(0,1,1))
+ :.y
+ call assert_equal(['int FuncName() {/* {{{ */'], getreg(0,1,1))
+ :.+y
+ call assert_equal(['1'], getreg(0,1,1) )
+ :.,.y
+ call assert_equal(['int FuncName() {/* {{{ */'], getreg(0,1,1))
+ " use silent to make E493 go away
+ :sil .1,.y
+ call assert_equal(['int FuncName() {/* {{{ */', '1'], getreg(0,1,1))
+ " use silent to make E493 go away
+ :sil .+,.y
+ call assert_equal(['int FuncName() {/* {{{ */', '1'], getreg(0,1,1))
+ :,y
+ call assert_equal(['int FuncName() {/* {{{ */'], getreg(0,1,1))
+ :,+y
+ call assert_equal(['int FuncName() {/* {{{ */', '1'], getreg(0,1,1))
+ " using .+3 as second address should c opy the whole folded line + the next 3
+ " lines
+ :.,+3y
+ call assert_equal(['int FuncName() {/* {{{ */', '1', '2', '3'], getreg(0,1,1))
+ :7
+ :sil .,-2y
+ call assert_equal(['4', '5', '}/* }}} */'], getreg(0,1,1))
+
+ quit!
+endfunc
+
+func Test_address_fold_old_default_commentstring()
+ " Test with the old commentstring defaults, before v9.1.464
new
call setline(1, ['int FuncName() {/*{{{*/', 1, 2, 3, 4, 5, '}/*}}}*/',
\ 'after fold 1', 'after fold 2', 'after fold 3'])
@@ -719,7 +785,7 @@ func Test_fold_create_marker_in_C()
call append(0, content)
call cursor(c + 1, 1)
norm! zfG
- call assert_equal(content[c] . (c < 4 ? '{{{' : '/*{{{*/'), getline(c + 1))
+ call assert_equal(content[c] . (c < 4 ? '{{{' : '/* {{{ */'), getline(c + 1))
endfor

set fdm& fdl&
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 09ae42c16..83594d202 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -402,17 +402,17 @@ func Test_normal08_fold()
" First fold
norm! V4jzf
" check that folds have been created
- call assert_equal(['50/*{{{*/', '51', '52', '53', '54/*}}}*/'], getline(50,54))
+ call assert_equal(['50/* {{{ */', '51', '52', '53', '54/* }}} */'], getline(50,54))
" Second fold
46
norm! V10jzf
" check that folds have been created
- call assert_equal('46/*{{{*/', getline(46))
- call assert_equal('60/*}}}*/', getline(60))
+ call assert_equal('46/* {{{ */', getline(46))
+ call assert_equal('60/* }}} */', getline(60))
norm! k
call assert_equal('45', getline('.'))
norm! j
- call assert_equal('46/*{{{*/', getline('.'))
+ call assert_equal('46/* {{{ */', getline('.'))
norm! j
call assert_equal('61', getline('.'))
norm! k
@@ -421,12 +421,12 @@ func Test_normal08_fold()
norm! k
call assert_equal('45', getline('.'))
norm! j
- call assert_equal('46/*{{{*/', getline('.'))
+ call assert_equal('46/* {{{ */', getline('.'))
norm! j
call assert_equal('47', getline('.'))
norm! k
norm! zcVzO
- call assert_equal('46/*{{{*/', getline('.'))
+ call assert_equal('46/* {{{ */', getline('.'))
norm! j
call assert_equal('47', getline('.'))
norm! j
@@ -434,7 +434,7 @@ func Test_normal08_fold()
norm! j
call assert_equal('49', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
call assert_equal('51', getline('.'))
" delete folds
@@ -1383,14 +1383,14 @@ func Test_normal18_z_fold()
" First fold
norm! 4zF
" check that folds have been created
- call assert_equal(['50/*{{{*/', '51', '52', '53/*}}}*/'], getline(50,53))
+ call assert_equal(['50/* {{{ */', '51', '52', '53/* }}} */'], getline(50,53))

" Test for zd
51
norm! 2zF
call assert_equal(2, foldlevel('.'))
norm! kzd
- call assert_equal(['50', '51/*{{{*/', '52/*}}}*/', '53'], getline(50,53))
+ call assert_equal(['50', '51/* {{{ */', '52/* }}} */', '53'], getline(50,53))
norm! j
call assert_equal(1, foldlevel('.'))

@@ -1409,7 +1409,7 @@ func Test_normal18_z_fold()
norm! 2zF
90
norm! 4zF
- call assert_equal(['85/*{{{*/', '86/*{{{*/', '87/*}}}*/', '88/*}}}*/', '89', '90/*{{{*/', '91', '92', '93/*}}}*/'], getline(85,93))
+ call assert_equal(['85/* {{{ */', '86/* {{{ */', '87/* }}} */', '88/* }}} */', '89', '90/* {{{ */', '91', '92', '93/* }}} */'], getline(85,93))
norm! zE
call assert_equal(['85', '86', '87', '88', '89', '90', '91', '92', '93'], getline(85,93))

@@ -1421,9 +1421,9 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('49', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
call assert_equal(0, &foldenable)
@@ -1433,7 +1433,7 @@ func Test_normal18_z_fold()
norm! zN
call assert_equal('49', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
call assert_equal(1, &foldenable)
@@ -1454,9 +1454,9 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('49', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
50
@@ -1464,7 +1464,7 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('49', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
call assert_equal('52', getline('.'))

@@ -1473,14 +1473,14 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))
49
norm! za
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
set nofoldenable
@@ -1494,11 +1494,11 @@ func Test_normal18_z_fold()
norm! 2k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))

@@ -1510,11 +1510,11 @@ func Test_normal18_z_fold()
norm! 2k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))

@@ -1526,7 +1526,7 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1546,7 +1546,7 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))
set nofoldenable
@@ -1555,7 +1555,7 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1565,7 +1565,7 @@ func Test_normal18_z_fold()
norm! zCk
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1576,7 +1576,7 @@ func Test_normal18_z_fold()
norm! zx
call assert_equal(1, &foldenable)
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1588,17 +1588,17 @@ func Test_normal18_z_fold()
norm! 3k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
norm! j
call assert_equal('53', getline('.'))
norm! j
- call assert_equal('54/*}}}*/', getline('.'))
+ call assert_equal('54/* }}} */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1610,15 +1610,15 @@ func Test_normal18_z_fold()
call assert_equal(1, &foldenable)
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
norm! j
call assert_equal('53', getline('.'))
norm! j
- call assert_equal('54/*}}}*/', getline('.'))
+ call assert_equal('54/* }}} */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1631,7 +1631,7 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1648,7 +1648,7 @@ func Test_normal18_z_fold()
norm! k
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1667,7 +1667,7 @@ func Test_normal18_z_fold()
call assert_equal(0, &foldlevel)
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
call assert_equal('55', getline('.'))

@@ -1685,11 +1685,11 @@ func Test_normal18_z_fold()
call assert_equal(2, &foldlevel)
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))

@@ -1705,24 +1705,24 @@ func Test_normal18_z_fold()
call assert_equal(2, &foldlevel)
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
- call append(50, ['a /*{{{*/', 'b /*}}}*/'])
+ call append(50, ['a /* {{{ */', 'b /* }}} */'])
48
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('a /*{{{*/', getline('.'))
+ call assert_equal('a /* {{{ */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))
48
@@ -1731,15 +1731,15 @@ func Test_normal18_z_fold()
call assert_equal(3, &foldlevel)
call assert_equal('48', getline('.'))
norm! j
- call assert_equal('49/*{{{*/', getline('.'))
+ call assert_equal('49/* {{{ */', getline('.'))
norm! j
- call assert_equal('50/*{{{*/', getline('.'))
+ call assert_equal('50/* {{{ */', getline('.'))
norm! j
- call assert_equal('a /*{{{*/', getline('.'))
+ call assert_equal('a /* {{{ */', getline('.'))
norm! j
- call assert_equal('b /*}}}*/', getline('.'))
+ call assert_equal('b /* }}} */', getline('.'))
norm! j
- call assert_equal('51/*}}}*/', getline('.'))
+ call assert_equal('51/* }}} */', getline('.'))
norm! j
call assert_equal('52', getline('.'))

diff --git a/src/version.c b/src/version.c
index ea1071e6c..4b1bcf1ba 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 */
+/**/
+ 464,
/**/
463,
/**/
Reply all
Reply to author
Forward
0 new messages