From b6b12ea7c3f2a5ac18d92efc5e4ef814971dfdef Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 26 Aug 2021 02:50:30 -0700 Subject: fix(man.vim): filetype=man is too eager #15489 Problem: "set filetype=man" assumes the user wants :Man features, this does extra stuff like renaming the buffer as "man://". Solution: - old entrypoint was ":set filetype=man", but this is too presumptuous #15487 - make the entrypoints more explicit: 1. when the ":Man" command is run 2. when a "man://" buffer is opened - remove the tricky b:man_sect checks in ftplugin/man.vim and syntax/man.vim - MANPAGER is supported via ":Man!", as documented. fixes #15487 --- runtime/ftplugin/man.vim | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'runtime/ftplugin/man.vim') diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 5d3e00d033..fce12012b5 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -6,14 +6,6 @@ if exists('b:did_ftplugin') || &filetype !=# 'man' endif let b:did_ftplugin = 1 -let s:pager = !exists('b:man_sect') - -if s:pager - call man#init_pager() -endif - -setlocal noswapfile buftype=nofile bufhidden=hide -setlocal nomodified readonly nomodifiable setlocal noexpandtab tabstop=8 softtabstop=8 shiftwidth=8 setlocal wrap breakindent linebreak @@ -32,11 +24,7 @@ if !exists('g:no_plugin_maps') && !exists('g:no_man_maps') nnoremap k gk nnoremap gO :call man#show_toc() nnoremap <2-LeftMouse> :Man - if s:pager - nnoremap q :lclose:q - else - nnoremap q :lclosec - endif + nnoremap q :lclosec endif if get(g:, 'ft_man_folding_enable', 0) -- cgit