From b40b22f426899d58c32bd7cb788464dc535b1eb9 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Thu, 19 Sep 2024 19:46:50 +0200 Subject: vim-patch:f86568f: runtime(misc): simplify keywordprg in various ftplugins closes: vim/vim#15696 https://github.com/vim/vim/commit/f86568f91848ece0c5da2178881b3ed858dae799 Co-authored-by: Konfekt --- runtime/ftplugin/muttrc.vim | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'runtime/ftplugin/muttrc.vim') diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim index c9f6df31d0..7df61580bf 100644 --- a/runtime/ftplugin/muttrc.vim +++ b/runtime/ftplugin/muttrc.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: mutt RC File " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2023-10-07 +" Latest Revision: 2024-09-19 (simplify keywordprg #15696) if exists("b:did_ftplugin") finish @@ -18,20 +18,12 @@ setlocal formatoptions-=t formatoptions+=croql let &l:include = '^\s*source\>' -if has('unix') && executable('less') - if !has('gui_running') - command -buffer -nargs=1 MuttrcKeywordPrg - \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '\b'' --hilite-search" man ' . 'muttrc' | - \ redraw! - elseif has('terminal') - command -buffer -nargs=1 MuttrcKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . 'muttrc' - endif - if exists(':MuttrcKeywordPrg') == 2 - setlocal iskeyword+=- - setlocal keywordprg=:MuttrcKeywordPrg - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer MuttrcKeywordPrg' - endif +if has('unix') && executable('less') && exists(':terminal') == 2 + command -buffer -nargs=1 MuttrcKeywordPrg + \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . 'muttrc' + setlocal iskeyword+=- + setlocal keywordprg=:MuttrcKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer MuttrcKeywordPrg' endif let &cpo = s:cpo_save -- cgit