From 2f5b8a009280eba995aecf67d1e8d99b7c72c51c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 4 Jun 2024 09:39:28 +0200
Subject: vim-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: vim/vim#14843

https://github.com/vim/vim/commit/0a0830624a260660c7fa692ecb7e6e5de09114ba

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 runtime/ftplugin/rust.vim | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'runtime/ftplugin/rust.vim')

diff --git a/runtime/ftplugin/rust.vim b/runtime/ftplugin/rust.vim
index fb15b444d0..c2bcdd34bc 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 <me@chrismorgan.info>
-" Last Change:  2024-03-17
+" Language:	Rust
+" Description:	Vim ftplugin for Rust
+" Maintainer:	Chris Morgan <me@chrismorgan.info>
+" Last Change:	2024 Mar 17
+"		2024 May 23 by Riley Bruins <ribru17@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
-- 
cgit 


From 88085c2e80a7e3ac29aabb6b5420377eed99b8b6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 5 Oct 2024 17:41:54 +0200
Subject: vim-patch:7c3f9af: runtime(misc): unset compiler in various ftplugins

just to foster best practices

closes: vim/vim#15798

https://github.com/vim/vim/commit/7c3f9af0ed5dd7035f8a3fbb2f0bf965a453e359

Co-authored-by: Konfekt <Konfekt@users.noreply.github.com>
---
 runtime/ftplugin/rust.vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/ftplugin/rust.vim')

diff --git a/runtime/ftplugin/rust.vim b/runtime/ftplugin/rust.vim
index c2bcdd34bc..3e2741f919 100644
--- a/runtime/ftplugin/rust.vim
+++ b/runtime/ftplugin/rust.vim
@@ -148,6 +148,7 @@ endif
 " Cleanup {{{1
 
 let b:undo_ftplugin = "
+            \ compiler make |
             \ setlocal formatoptions< comments< commentstring< include< includeexpr< suffixesadd<
             \|if exists('b:rust_set_style')
                 \|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
-- 
cgit