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

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

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim
index 9e00daed6a54d12495fc759ee39705307d9b8728..2415555e09c3fd9d37462e296bb6b10e9e1549ce 100644 (file)
--- 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 09ad54b64ab25a7c5f7f675f1ef4b141f5a01f21..d5eda5af218c5914942805e2dc53645404f8a399 100644 (file)
--- 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 bd01367158da4807c4fd9468e433b5bf0658cd14..7a4eb7a8bb959abb49e4f5ed533d2a85ce7492d9 100644 (file)
--- 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 c81d0f2f65dadf5f24111bf5abd91450a6f8b3af..a696da2701cb7a96d53434186232d07cc596b208 100644 (file)
--- 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 214e4928a0c126aec782bd559eb25704dc45af00..c9a5cfaa689a72e496dc6b86156d87bb9c773088 100644 (file)
--- 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 65cf2d82039be58f307d8766d38b9d378dd2bf3d..b4123620af7f7900ab7760778288b8afc85a6c98 100644 (file)
--- 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 c0bc6302f28c29daf5b2bb31a9ef15df2bc0d45a..e60a5e496051358ec1f11bb78953a75aa308e17c 100644 (file)
--- 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 bde9c5dfa0d9459049f8b2fe7ce541ef6f1d67f0..83fb728a54dc9c7d03275f578ab8045290906eb0 100644 (file)
--- 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 0ca8077305a0ba41205db1289144a968a71c1f41..ed75d040036e41187f4cb9dc464016bf37a2bf40 100644 (file)
--- 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\>'