From b2c3e9c72ef12a5bc276dec78cdc8dfbd2f5a24b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 30 Aug 2023 18:16:30 +0200
Subject: [PATCH] vim-patch:9d8ef7cc4340

runtime: cleanup :Sman command via the undo_ftplugin mechanism (vim/vim#12967)

Regards to @dkearns as noticed in
https://github.com/vim/vim/commit/2ac708b548660b232a32c52d89bde3d8596646c0

https://github.com/vim/vim/commit/9d8ef7cc434076dfda62ca3d3101eaae52e316cd

Co-authored-by: Enno <Konfekt@users.noreply.github.com>
---
 runtime/ftplugin/gpg.vim       | 2 +-
 runtime/ftplugin/modconf.vim   | 2 +-
 runtime/ftplugin/muttrc.vim    | 2 +-
 runtime/ftplugin/readline.vim  | 2 +-
 runtime/ftplugin/sshconfig.vim | 2 +-
 runtime/ftplugin/sudoers.vim   | 2 +-
 runtime/ftplugin/systemd.vim   | 2 +-
 runtime/ftplugin/udevrules.vim | 2 +-
 runtime/ftplugin/zsh.vim       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim
index 9e00daed6a..2415555e09 100644
--- a/runtime/ftplugin/gpg.vim
+++ b/runtime/ftplugin/gpg.vim
@@ -27,7 +27,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim
index 09ad54b64a..d5eda5af21 100644
--- a/runtime/ftplugin/modconf.vim
+++ b/runtime/ftplugin/modconf.vim
@@ -28,7 +28,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim
index bd01367158..7a4eb7a8bb 100644
--- a/runtime/ftplugin/muttrc.vim
+++ b/runtime/ftplugin/muttrc.vim
@@ -30,7 +30,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim
index c81d0f2f65..a696da2701 100644
--- a/runtime/ftplugin/readline.vim
+++ b/runtime/ftplugin/readline.vim
@@ -42,7 +42,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim
index 214e4928a0..c9a5cfaa68 100644
--- a/runtime/ftplugin/sshconfig.vim
+++ b/runtime/ftplugin/sshconfig.vim
@@ -26,7 +26,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim
index 65cf2d8203..b4123620af 100644
--- a/runtime/ftplugin/sudoers.vim
+++ b/runtime/ftplugin/sudoers.vim
@@ -27,7 +27,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/systemd.vim b/runtime/ftplugin/systemd.vim
index c0bc6302f2..e60a5e4960 100644
--- a/runtime/ftplugin/systemd.vim
+++ b/runtime/ftplugin/systemd.vim
@@ -30,7 +30,7 @@ if has('unix') && executable('less')
     if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
       let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
     else
-      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
     endif
   endif
 endif
diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim
index bde9c5dfa0..83fb728a54 100644
--- a/runtime/ftplugin/udevrules.vim
+++ b/runtime/ftplugin/udevrules.vim
@@ -27,7 +27,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim
index 0ca8077305..ed75d04003 100644
--- a/runtime/ftplugin/zsh.vim
+++ b/runtime/ftplugin/zsh.vim
@@ -30,7 +30,7 @@ if executable('zsh') && &shell !~# '/\%(nologin\|false\)$'
     compiler zsh
   endif
   setlocal keywordprg=:RunHelp
-  let b:undo_ftplugin .= 'keywordprg<'
+  let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer RunHelp'
 endif
 
 let b:match_words = '\<if\>:\<elif\>:\<else\>:\<fi\>'