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/readline.vim | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'runtime/ftplugin/readline.vim') diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim index f5934ce2c0..77fab2a611 100644 --- a/runtime/ftplugin/readline.vim +++ b/runtime/ftplugin/readline.vim @@ -2,7 +2,7 @@ " Language: readline(3) configuration file " Maintainer: Doug Kearns " Previous Maintainer: Nikolai Weibull -" Last Change: 2023 Aug 22 +" Last Change: 2024 Sep 19 (simplify keywordprg #15696) if exists("b:did_ftplugin") finish @@ -34,20 +34,12 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:undo_ftplugin ..= " | unlet! b:browsefilter" endif -if has('unix') && executable('less') - if !has('gui_running') - command -buffer -nargs=1 ReadlineKeywordPrg - \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '\b'' --hilite-search" man ' . '3 readline' | - \ redraw! - elseif has('terminal') - command -buffer -nargs=1 ReadlineKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . '3 readline' - endif - if exists(':ReadlineKeywordPrg') == 2 - setlocal iskeyword+=- - setlocal keywordprg=:ReadlineKeywordPrg - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ReadlineKeywordPrg' - endif +if has('unix') && executable('less') && exists(':terminal') == 2 + command -buffer -nargs=1 ReadlineKeywordPrg + \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . '3 readline' + setlocal iskeyword+=- + setlocal keywordprg=:ReadlineKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ReadlineKeywordPrg' endif let &cpo = s:cpo_save -- cgit