From 7de8bdaeb8792dd7a2c6f57a2181d72a95707ef0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 7 Oct 2024 22:10:19 +0200
Subject: vim-patch:4f51f3a: runtime(spec): set comments and commentstring
 options

closes: vim/vim#15817

https://github.com/vim/vim/commit/4f51f3a5732725a25ff64f509506c9c81b1c96a5

Co-authored-by: Andreas Schneider <asn@cryptomilk.org>
---
 runtime/ftplugin/spec.vim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
index fa125be52c..dcf2908911 100644
--- a/runtime/ftplugin/spec.vim
+++ b/runtime/ftplugin/spec.vim
@@ -5,6 +5,7 @@
 " Last Change: 2015 Jun 01
 "  Update by Zdenek Dohnal, 2022 May 17
 "  2024 Sep 10 by Vim Project: add epoch support for spec changelog, #15537
+"  2024 Oct 07 by Vim Project: add comment support, #15817
 
 if exists("b:did_ftplugin")
 	finish
@@ -14,6 +15,11 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
+setlocal comments=b:#
+setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = "setlocal comments< commentstring<"
+
 if !exists("no_plugin_maps") && !exists("no_spec_maps")
 	if !hasmapto("<Plug>SpecChangelog")
 		map <buffer> <LocalLeader>c <Plug>SpecChangelog
@@ -216,4 +222,4 @@ let b:match_words =
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"
+let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words"
-- 
cgit 


From 0264870c0aa50fd4e34fb8a6b3c3c3cd88a22db7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Oct 2024 09:44:15 +0200
Subject: vim-patch:9.1.0769: filetype: MLIR files are not recognized

Problem:  filetype: MLIR files are not recognized
Solution: Detect '*.mlir' files as mlir filetype,
          include a mlir filetype plugin
          (Wu, Zhenyu)

closes: vim/vim#15826

https://github.com/vim/vim/commit/347d43bd33519ab537f77d1a8fa8ab8f9196bcb9

Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
---
 runtime/ftplugin/mlir.vim | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 runtime/ftplugin/mlir.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/mlir.vim b/runtime/ftplugin/mlir.vim
new file mode 100644
index 0000000000..c6a9dc341f
--- /dev/null
+++ b/runtime/ftplugin/mlir.vim
@@ -0,0 +1,10 @@
+" Vim filetype plugin file
+" Language:	MLIR
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setl comments=:///,://
+setl commentstring=//\ %s
+
+let b:undo_ftplugin = "setl commentstring< comments<"
-- 
cgit 


From b3cb0f6beacb69a4399b2e22ce3464602c6cd1bb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 13 Oct 2024 19:29:43 +0200
Subject: vim-patch:6e91853: runtime(gleam): add ftplugin for gleam files

fixes: vim/vim#15864
closes: vim/vim#15866

https://github.com/vim/vim/commit/6e918538b117c8c0b87a3d30300e8bbd073d652c

Co-authored-by: Trilowy <49493635+trilowy@users.noreply.github.com>
---
 runtime/ftplugin/gleam.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 runtime/ftplugin/gleam.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/gleam.vim b/runtime/ftplugin/gleam.vim
new file mode 100644
index 0000000000..9ed607c4b3
--- /dev/null
+++ b/runtime/ftplugin/gleam.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language:    Gleam
+" Maintainer:  Trilowy (https://github.com/trilowy)
+" Last Change: 2024 Oct 13
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=://,:///,:////
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setlocal comments< commentstring<"
+
+" vim: sw=2 sts=2 et
-- 
cgit 


From ea5b748f243883b9890e465d4abef598fe2b07fc Mon Sep 17 00:00:00 2001
From: xudyang1 <61672396+xudyang1@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:34:50 -0400
Subject: feat(man.vim): "q" always closes window #30819

---
 runtime/ftplugin/man.vim | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 37667477f3..5ea36c32ce 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -26,11 +26,7 @@ if !exists('g:no_plugin_maps') && !exists('g:no_man_maps')
   nnoremap <silent> <buffer> k             gk
   nnoremap <silent> <buffer> gO            :lua require'man'.show_toc()<CR>
   nnoremap <silent> <buffer> <2-LeftMouse> :Man<CR>
-  if get(g:, 'pager')
-    nnoremap <silent> <buffer> <nowait> q :lclose<CR><C-W>q
-  else
-    nnoremap <silent> <buffer> <nowait> q :lclose<CR><C-W>c
-  endif
+  nnoremap <silent> <buffer> <nowait> q :lclose<CR><C-W>q
 endif
 
 if get(g:, 'ft_man_folding_enable', 0)
-- 
cgit 


From 82b02ae2f2af439a8c678ed6b55a43121055f279 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 12 Oct 2024 11:23:31 +0200
Subject: fix(runtime): clean up one-off scripts

Problem: Some runtime files no longer spark joy.

Solution: Kondo the place up.

Still sparks _some_ joy (moved to new `runtime/scripts` folder):
* `macros/less.*`
* `mswin.vim`
* `tools/emoji_list.lua`

No longer sparks joy (removed):
* `macmap.vim` (gvimrc file; not useful in Nvim)
* `tools/check_colors.vim` (no longer useful with new default colorscheme and treesitter)
* `macros/editexisting.vim` (throws error on current Nvim)
* `macros/justify.vim` (obsolete shim for `packadd! justify`)
* `macros/matchit.vim` (same)
* `macros/shellmenu.vim` (same)
* `macros/swapmous.vim` (same)
---
 runtime/ftplugin/ada.vim      | 2 +-
 runtime/ftplugin/erlang.vim   | 2 +-
 runtime/ftplugin/plaintex.vim | 2 +-
 runtime/ftplugin/spec.vim     | 2 +-
 runtime/ftplugin/tex.vim      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/ada.vim b/runtime/ftplugin/ada.vim
index 688d912126..50e1388c80 100644
--- a/runtime/ftplugin/ada.vim
+++ b/runtime/ftplugin/ada.vim
@@ -103,7 +103,7 @@ endif
 if !exists ("b:match_words")  &&
   \ exists ("loaded_matchit")
    "
-   " The following lines enable the macros/matchit.vim plugin for
+   " The following lines enable the matchit.vim plugin for
    " Ada-specific extended matching with the % key.
    "
    let s:notend      = '\%(\<end\s\+\)\@<!'
diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim
index 5a3ab717d9..e82263d300 100644
--- a/runtime/ftplugin/erlang.vim
+++ b/runtime/ftplugin/erlang.vim
@@ -97,7 +97,7 @@ if !exists('*ErlangFoldText')
   endfunction
 endif
 
-" The following lines enable the macros/matchit.vim plugin for extended
+" The following lines enable the matchit.vim plugin for extended
 " matching with the % key.
 let b:match_ignorecase = 0
 let b:match_words =
diff --git a/runtime/ftplugin/plaintex.vim b/runtime/ftplugin/plaintex.vim
index 9e0e402680..17c1f5672f 100644
--- a/runtime/ftplugin/plaintex.vim
+++ b/runtime/ftplugin/plaintex.vim
@@ -22,7 +22,7 @@ let b:undo_ftplugin .= "| unlet! b:match_ignorecase b:match_skip b:match_words"
 let &l:define .= '\|\\new\(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
 	\ .	'\|fam\|insert\)'
 
-" The following lines enable the macros/matchit.vim plugin for
+" The following lines enable the matchit.vim plugin for
 " extended matching with the % key.
 " There is no default meaning for \(...\) etc., but many users define one.
 if exists("loaded_matchit")
diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
index dcf2908911..4aaef26a2e 100644
--- a/runtime/ftplugin/spec.vim
+++ b/runtime/ftplugin/spec.vim
@@ -210,7 +210,7 @@ if !exists("*s:ParseRpmVars")
     endfunction
 endif
 
-" The following lines, along with the macros/matchit.vim plugin,
+" The following lines, along with the matchit.vim plugin,
 " make it easy to navigate the different sections of a spec file
 " with the % key (thanks to Max Ischenko).
 
diff --git a/runtime/ftplugin/tex.vim b/runtime/ftplugin/tex.vim
index 0d68b51d46..7b58f67863 100644
--- a/runtime/ftplugin/tex.vim
+++ b/runtime/ftplugin/tex.vim
@@ -32,7 +32,7 @@ let &l:include .= '\|\\include{'
 " TeX file has \include{fname} (LaTeX only), strip everything except "fname".
 let &l:includeexpr = "substitute(v:fname, '^.\\{-}{\\|}.*', '', 'g')"
 
-" The following lines enable the macros/matchit.vim plugin for
+" The following lines enable the matchit.vim plugin for
 " extended matching with the % key.
 " ftplugin/plaintex.vim already defines b:match_skip and b:match_ignorecase
 " and matches \(, \), \[, \], \{, and \} .
-- 
cgit 


From a25ec00f8886c9b87e9423aedd498cec9419508b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 22 Oct 2024 00:18:16 +0200
Subject: vim-patch:421ed14: runtime(typst): add folding to typst ftplugin

closes: vim/vim#15897

https://github.com/vim/vim/commit/421ed14b8a0f50e0d2d9247dda49feb69352bd0d

Co-authored-by: Luca Saccarola <github.e41mv@aleeas.com>
---
 runtime/ftplugin/typst.vim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/typst.vim b/runtime/ftplugin/typst.vim
index 895fc688d9..3841e427f3 100644
--- a/runtime/ftplugin/typst.vim
+++ b/runtime/ftplugin/typst.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:    Typst
 " Maintainer:  Gregory Anders
-" Last Change: 2024 Oct 04
+" Last Change: 2024 Oct 21
 " Based on:    https://github.com/kaarmu/typst.vim
 
 if exists('b:did_ftplugin')
@@ -21,6 +21,12 @@ if get(g:, 'typst_conceal', 0)
   let b:undo_ftplugin .= ' cole<'
 endif
 
+if has("folding") && get(g:, 'typst_folding', 0)
+    setlocal foldexpr=typst#foldexpr()
+    setlocal foldmethod=expr
+    let b:undo_ftplugin .= "|setl foldexpr< foldmethod<"
+endif
+
 if !exists('current_compiler')
   compiler typst
   let b:undo_ftplugin ..= "| compiler make"
-- 
cgit 


From db46b58569bc518967b73bf7d6ed92f8f5548c90 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 2 Nov 2024 16:09:23 +0100
Subject: vim-patch:9.1.0826: filetype: sway files are not recognized

Problem:  filetype: sway files are not recognized
Solution: detect '*.sw' files as sway filetype, include
          a filetype plugin (Riley Bruins)

References:
 https://github.com/FuelLabs/sway.

Comments taken from their syntax documentation. File extension taken
from the same documentation/GitHub's own recognition of these file types

closes: vim/vim#15973

https://github.com/vim/vim/commit/84b5b1c660beb2f9e27de70687e41d39a023ae81

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 runtime/ftplugin/sway.vim | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 runtime/ftplugin/sway.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/sway.vim b/runtime/ftplugin/sway.vim
new file mode 100644
index 0000000000..35970b257c
--- /dev/null
+++ b/runtime/ftplugin/sway.vim
@@ -0,0 +1,15 @@
+" Vim filetype plugin
+" Language:	Sway
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2024 Nov 01
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl commentstring=//\ %s
+" From Rust comments
+setl comments=s0:/*!,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,://
+
+let b:undo_ftplugin = 'setl com< cms<'
-- 
cgit 


From fc8e786dae255b8ed63f57e4ae2cd85addbee7b9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 4 Nov 2024 20:05:00 +0100
Subject: vim-patch:19bc76c: runtime(cook): include cook filetype plugin

References:
https://github.com/cooklang/spec?tab=readme-ov-file#comments

closes: vim/vim#15989

https://github.com/vim/vim/commit/19bc76c929a9d3f87d4ea932ba5c540bcd6023ee

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 runtime/ftplugin/cook.vim | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 runtime/ftplugin/cook.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/cook.vim b/runtime/ftplugin/cook.vim
new file mode 100644
index 0000000000..3697803e74
--- /dev/null
+++ b/runtime/ftplugin/cook.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	Cooklang
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2024 Nov 03
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:-- commentstring=--\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
-- 
cgit 


From ba40a6dbe3a1c98a9f75e56c7cd08ecd522d27dd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 4 Nov 2024 20:03:10 +0100
Subject: vim-patch:9.1.0839: filetype: leo files are not recognized

Problem:  filetype: leo files are not recognized
Solution: detect '*.leo' files as leo filetype, include
          a filetype plugin (Riley Bruins)

References:
https://github.com/ProvableHQ/leo

closes: vim/vim#15988

https://github.com/vim/vim/commit/93f65a4ab8168c766e4d3794607762b52762ef82

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 runtime/ftplugin/leo.vim | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 runtime/ftplugin/leo.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/leo.vim b/runtime/ftplugin/leo.vim
new file mode 100644
index 0000000000..a009c02df4
--- /dev/null
+++ b/runtime/ftplugin/leo.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	Leo
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2024 Nov 03
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:// commentstring=//\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
-- 
cgit 


From 5ff9a9397eabad2b6656f05b9ec2c8dd7025a0c1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 9 Nov 2024 19:16:42 +0100
Subject: vim-patch:a14c457: runtime(dune): use :setl instead of :set in
 ftplugin

closes: vim/vim#11419

https://github.com/vim/vim/commit/a14c457cad99621db7950b78e7d257c300b7d897

Co-authored-by: Dani Dickstein <daniel.dickstein@gmail.com>
---
 runtime/ftplugin/dune.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/dune.vim b/runtime/ftplugin/dune.vim
index 6e20a8fabb..7608d53527 100644
--- a/runtime/ftplugin/dune.vim
+++ b/runtime/ftplugin/dune.vim
@@ -6,13 +6,14 @@
 "              2023 Aug 28 - Added undo_ftplugin (Vim Project)
 "              2018 Nov 03 - Added commentstring (Markus Mottl)
 "              2017 Sep 06 - Initial version (Etienne Millon)
+"              2024 Nov 09 - use setl instead of :set
 
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin=1
 
-set lisp
+setl lisp
 
 " Comment string
 setl commentstring=;\ %s
-- 
cgit 


From 096cb572af4b00ee2684d0c05b4689c4f4bef94e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 12 Nov 2024 21:54:06 +0100
Subject: vim-patch:5ca8f22: runtime(idris2): include filetype,indent+syntax
 plugins for (L)Idris2 + ipkg

closes: vim/vim#15993

https://github.com/vim/vim/commit/5ca8f223f03dbd85f5e06c8e1d500c65f311eaf1

Co-authored-by: Serhii Khoma <srghma@gmail.com>
Co-authored-by: Christian Clason <ch.clason+github@icloud.com>
---
 runtime/ftplugin/idris2.vim | 34 ++++++++++++++++++++++++++++++++++
 runtime/ftplugin/ipkg.vim   | 19 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 runtime/ftplugin/idris2.vim
 create mode 100644 runtime/ftplugin/ipkg.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/idris2.vim b/runtime/ftplugin/idris2.vim
new file mode 100644
index 0000000000..54e5acef90
--- /dev/null
+++ b/runtime/ftplugin/idris2.vim
@@ -0,0 +1,34 @@
+" Vim ftplugin file
+" Language:	   Idris 2
+" Last Change: 2024 Nov 05
+" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-vim), Serhii Khoma <srghma@gmail.com>
+" License:     Vim (see :h license)
+" Repository:  https://github.com/ShinKage/idris2-nvim
+"
+" Based on ftplugin/idris2.vim from https://github.com/edwinb/idris2-vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+setlocal shiftwidth=2
+setlocal tabstop=2
+
+" Set g:idris2#allow_tabchar = 1 to use tabs instead of spaces
+if exists('g:idris2#allow_tabchar') && g:idris2#allow_tabchar != 0
+  setlocal noexpandtab
+else
+  setlocal expandtab
+endif
+
+setlocal comments=s1:{-,mb:-,ex:-},:\|\|\|,:--
+setlocal commentstring=--\ %s
+
+" makes ? a part of a word, e.g. for named holes `vzipWith f [] [] = ?vzipWith_rhs_3`, uncomment if want to reenable
+" setlocal iskeyword+=?
+
+setlocal wildignore+=*.ibc
+
+let b:undo_ftplugin = "setlocal shiftwidth< tabstop< expandtab< comments< commentstring< iskeyword< wildignore<"
+
+let b:did_ftplugin = 1
diff --git a/runtime/ftplugin/ipkg.vim b/runtime/ftplugin/ipkg.vim
new file mode 100644
index 0000000000..70ae26ec17
--- /dev/null
+++ b/runtime/ftplugin/ipkg.vim
@@ -0,0 +1,19 @@
+" Vim ftplugin file
+" Language:    Ipkg
+" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-vim), Serhii Khoma <srghma@gmail.com>
+" Last Change: 2024 Nov 05
+" Author:      ShinKage
+" License:     Vim (see :h license)
+" Repository:  https://github.com/ShinKage/idris2-nvim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+setlocal comments=:--
+setlocal commentstring=--\ %s
+setlocal wildignore+=*.ibc
+
+let b:undo_ftplugin = "setlocal shiftwidth< tabstop< expandtab< comments< commentstring< iskeyword< wildignore<"
+
+let b:did_ftplugin = 1
-- 
cgit 


From c905f165072881128294e3a58f491e38bc4e70f8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 13 Nov 2024 20:26:51 +0100
Subject: vim-patch:8e013b1: runtime(racket): update Racket runtime files

This brings the included Racket runtime files to commit c41bc5a (indent
for[*]/lists with accumulator clause correctly, 2024-11-12) of
https://github.com/benknoble/vim-racket.

Note that not all files from that repository are included.

closes: vim/vim#16046

https://github.com/vim/vim/commit/8e013b14211ee236f4866e7281ad4366e0ab18cd

Co-authored-by: D. Ben Knoble <ben.knoble+github@gmail.com>
---
 runtime/ftplugin/racket.vim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/racket.vim b/runtime/ftplugin/racket.vim
index 7bfd87ddc3..52768d67f5 100644
--- a/runtime/ftplugin/racket.vim
+++ b/runtime/ftplugin/racket.vim
@@ -3,7 +3,7 @@
 " Maintainer:           D. Ben Knoble <ben.knoble+github@gmail.com>
 " Previous Maintainer:  Will Langstroth <will@langstroth.com>
 " URL:                  https://github.com/benknoble/vim-racket
-" Last Change:          2024 May 28
+" Last Change:          2024 Jun 01
 
 if exists("b:did_ftplugin")
   finish
@@ -16,19 +16,20 @@ set cpo&vim
 " quick hack to allow adding values
 setlocal iskeyword=@,!,#-',*-:,<-Z,a-z,~,_,94
 
+setlocal shiftwidth=2 softtabstop=2
+
 " Enable auto begin new comment line when continuing from an old comment line
 setlocal comments=:;;;;,:;;;,:;;,:;
 setlocal formatoptions+=r
 
-"setlocal commentstring=;;\ %s
-setlocal commentstring=#\|\ %s\ \|#
+setlocal commentstring=;;\ %s
 
 setlocal formatprg=raco\ fmt
 
 " Undo our settings when the filetype changes away from Racket
 " (this should be amended if settings/mappings are added above!)
 let b:undo_ftplugin =
-      \  "setlocal iskeyword< lispwords< lisp< comments< formatoptions< formatprg<"
+      \  "setlocal iskeyword< shiftwidth< softtabstop< comments< formatoptions< formatprg<"
       \. " | setlocal commentstring<"
 
 if !exists("no_plugin_maps") && !exists("no_racket_maps")
-- 
cgit 


From f0fd9acc4bcc4233a4bc661f23626abe496a3cee Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 15 Nov 2024 08:40:22 +0100
Subject: vim-patch:9.1.0865: filetype: org files are not recognized

Problem:  filetype: org files are not recognized
Solution: detect '*.org' files as 'org' filetype,
          include filetype and syntax plugin
          (Luca Saccarola)

closes: vim/vim#16054

https://github.com/vim/vim/commit/0684800c853ee5bd6e6736389b1a6ebe6a16a741

Co-authored-by: Luca Saccarola <github.e41mv@aleeas.com>
---
 runtime/ftplugin/org.vim | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 runtime/ftplugin/org.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/org.vim b/runtime/ftplugin/org.vim
new file mode 100644
index 0000000000..45a5e19d49
--- /dev/null
+++ b/runtime/ftplugin/org.vim
@@ -0,0 +1,37 @@
+" Vim filetype plugin file
+" Language:	Org
+" Maintainer:	Luca Saccarola <github.e41mv@aleeas.com>
+" Last Change:	2024 Nov 14
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= "|setl cms< com< fo< flp<"
+else
+    let b:undo_ftplugin = "setl cms< com< fo< flp<"
+endif
+
+setl commentstring=#\ %s
+setl comments=fb:*,fb:-,fb:+,b:#,b:\:
+
+setl formatoptions+=nql
+setl formatlistpat=^\\s*\\(\\(\\d\\|\\a\\)\\+[.)]\\|[+-]\\)\\s\\+
+
+function OrgFoldExpr()
+    let l:depth = match(getline(v:lnum), '\(^\*\+\)\@<=\( .*$\)\@=')
+    if l:depth > 0 && synIDattr(synID(v:lnum, 1, 1), 'name') =~# '\m^orgHeadline'
+        return ">" . l:depth
+    endif
+    return "="
+endfunction
+
+if has("folding") && get(g:, 'org_folding', 0)
+    setl foldexpr=OrgFoldExpr()
+    setl foldmethod=expr
+    let b:undo_ftplugin .= "|setl foldexpr< foldmethod<"
+endif
+
+" vim: ts=8 sts=2 sw=2 et
-- 
cgit 


From fbbb9d6f7bc8fd3ed309d195d723894572549cf8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 16 Nov 2024 08:42:12 +0800
Subject: vim-patch:9.1.0866: filetype: LLVM IR files are not recognized
 (#31228)

Problem:  filetype: LLVM IR files are not recognized
Solution: detect '*.ll' files either as lifelines or llvm filetype
          (Wu, Zhenyu)

closes: vim/vim#15824

https://github.com/vim/vim/commit/bc32bbddcfc2671158a4780838766ed2d1e14fa6

N/A patch:
vim-patch:7e4b861: runtime(filetype): remove duplicated *.org file pattern

Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
---
 runtime/ftplugin/llvm.vim | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 runtime/ftplugin/llvm.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/llvm.vim b/runtime/ftplugin/llvm.vim
new file mode 100644
index 0000000000..148b12f102
--- /dev/null
+++ b/runtime/ftplugin/llvm.vim
@@ -0,0 +1,12 @@
+" Vim filetype plugin file
+" Language:	LLVM IR
+" Last Change:	2024 Oct 22
+" Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setl comments=:;
+setl commentstring=;\ %s
+
+let b:undo_ftplugin = "setl commentstring< comments<"
-- 
cgit 


From 965dc81f818e50b5078d4b7efa5fbb8b771560f8 Mon Sep 17 00:00:00 2001
From: Yochem van Rosmalen <git@yochem.nl>
Date: Mon, 18 Nov 2024 00:33:34 +0100
Subject: fix(checkhealth): disable 'listchars' #31245

Problem:
'listchars' (in particular multispace) breaks visual heading due to
`Whitespace` highlight group.

Solution:
Disable 'list' (and thus all listchars) by default for `checkhealth`
files.

Fixes #31145
---
 runtime/ftplugin/checkhealth.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/checkhealth.vim b/runtime/ftplugin/checkhealth.vim
index 62a1970b4a..00f24a2912 100644
--- a/runtime/ftplugin/checkhealth.vim
+++ b/runtime/ftplugin/checkhealth.vim
@@ -8,11 +8,11 @@ endif
 
 runtime! ftplugin/help.vim
 
-setlocal wrap breakindent linebreak
+setlocal wrap breakindent linebreak nolist
 let &l:iskeyword='!-~,^*,^|,^",192-255'
 
 if exists("b:undo_ftplugin")
-  let b:undo_ftplugin .= "|setl wrap< bri< lbr< kp< isk<"
+  let b:undo_ftplugin .= "|setl wrap< bri< lbr< kp< isk< list<"
 else
-  let b:undo_ftplugin = "setl wrap< bri< lbr< kp< isk<"
+  let b:undo_ftplugin = "setl wrap< bri< lbr< kp< isk< list<"
 endif
-- 
cgit 


From c12be1249f5e44289acdfeaf0f059c7942593275 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 19 Nov 2024 08:41:02 +0100
Subject: vim-patch:9.1.0873: filetype: Vivado files are not recognized

Problem:  filetype: Vivado files are not recognized
Solution: detect '*.mss' files as 'mss' filetype
          (Wu, Zhenyu)

references:
https://docs.amd.com/r/2020.2-English/ug1400-vitis-embedded/Microprocessor-Software-Specification-MSS

closes: vim/vim#15907

https://github.com/vim/vim/commit/a87462a498a883e12ad7699b26bd28f4600b68c6

Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
---
 runtime/ftplugin/mss.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 runtime/ftplugin/mss.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/mss.vim b/runtime/ftplugin/mss.vim
new file mode 100644
index 0000000000..de2f8791ec
--- /dev/null
+++ b/runtime/ftplugin/mss.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language:	Vivado mss file
+" Last Change:	2024 Oct 22
+" Document:	https://docs.amd.com/r/2020.2-English/ug1400-vitis-embedded/Microprocessor-Software-Specification-MSS
+" Maintainer:	Wu, Zhenyu <wuzhenyu@ustc.edu>
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=b:#,fb:-
+setlocal commentstring=#\ %s
+
+let b:match_words = '\<BEGIN\>:\<END\>'
+let b:undo_ftplugin = "setl com< cms< | unlet b:match_words"
-- 
cgit