diff options
| author | Ivan Shapovalov <intelfx@intelfx.name> | 2024-07-06 16:56:02 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-06 16:57:18 +0200 |
| commit | 84ca1388d8d9a9858f37a5c0586527589cbdadda (patch) | |
| tree | 7a449b8c637bb7f3d38a0d830da7e9be799c9b23 | |
| parent | f21ca6d1f105489d07422299e8746fbe8ea7bb8a (diff) | |
runtime(man): honor cmd modifiers before `g:ft_man_open_mode`
Give priority to (placement) command modifiers, specifically
`:vertical`, `:horizontal` and `:tab`, ahead of `g:ft_man_open_mode`,
so that if the user says e.g. `:vert Man`, Vim does the expected thing.
closes: #15117
Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/autoload/dist/man.vim | 7 | ||||
| -rw-r--r-- | runtime/ftplugin/man.vim | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/runtime/autoload/dist/man.vim b/runtime/autoload/dist/man.vim index 708e1062b4..d9dbaf47d4 100644 --- a/runtime/autoload/dist/man.vim +++ b/runtime/autoload/dist/man.vim @@ -4,6 +4,7 @@ " Maintainer: SungHyun Nam <goweol@gmail.com> " Autoload Split: Bram Moolenaar " Last Change: 2024 Jan 17 (make it work on AIX, see #13847) +" 2024 Jul 06 (honor command modifiers, #15117) let s:cpo_save = &cpo set cpo-=C @@ -165,7 +166,9 @@ func dist#man#GetPage(cmdmods, ...) endwhile endif if &filetype != "man" - if exists("g:ft_man_open_mode") + if a:cmdmods =~ '\<\(tab\|vertical\|horizontal\)\>' + let open_cmd = a:cmdmods . ' split' + elseif exists("g:ft_man_open_mode") if g:ft_man_open_mode == 'vert' let open_cmd = 'vsplit' elseif g:ft_man_open_mode == 'tab' @@ -174,7 +177,7 @@ func dist#man#GetPage(cmdmods, ...) let open_cmd = 'split' endif else - let open_cmd = a:cmdmods . ' split' + let open_cmd = 'split' endif endif endif diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 87484bf691..f0723ef7bf 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -4,6 +4,7 @@ " Maintainer: SungHyun Nam <goweol@gmail.com> " Autoload Split: Bram Moolenaar " Last Change: 2024 Jun 06 (disabled the q mapping, #8210) +" 2024 Jul 06 (use nnoremap, #15130) " To make the ":Man" command available before editing a manual page, source " this script from your startup vimrc file. |