runtime(misc): use :hor :term to ensure new term window is split horizontally
Commit: https://github.com/vim/vim/commit/714671de3538266233d3411e0e375dba7d83005c Author: phanium <91544758+pha...@users.noreply.github.com> Date: Wed Jul 23 21:01:40 2025 +0200 runtime(misc): use :hor :term to ensure new term window is split horizontally Problem: :term splits new window above in vim, but in nvim it change the buffer for current window Solution: :hor term to ensure consistent splitting for Vim and Neovim closes: #17822 Signed-off-by: phanium <91544758+pha...@users.noreply.github.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim index bb4e0c9a1..82ba10e67 100644 --- a/runtime/ftplugin/gpg.vim +++ b/runtime/ftplugin/gpg.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file " Language: gpg(1) configuration file +" Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -17,7 +18,7 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 GpgKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'gpg' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'gpg' setlocal iskeyword+=- setlocal keywordprg=:GpgKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer GpgKeywordPrg' diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim index 68ce69a44..584355253 100644 --- a/runtime/ftplugin/modconf.vim +++ b/runtime/ftplugin/modconf.vim @@ -2,7 +2,7 @@ " Language: modules.conf(5) configuration file " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> -" Latest Revision: 2024-09-20 (remove erroneous endif) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -19,7 +19,7 @@ setlocal formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 ModconfKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'modprobe.d' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'modprobe.d' setlocal iskeyword+=- setlocal keywordprg=:ModconfKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ModconfKeywordPrg' diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim index 7df61580b..84dfd63fc 100644 --- a/runtime/ftplugin/muttrc.vim +++ b/runtime/ftplugin/muttrc.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file " Language: mutt RC File +" Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -20,7 +21,7 @@ let &l:include = '^\s*source\>' if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 MuttrcKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'muttrc' + \ silent exe 'hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'muttrc' setlocal iskeyword+=- setlocal keywordprg=:MuttrcKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer MuttrcKeywordPrg' diff --git a/runtime/ftplugin/ps1.vim b/runtime/ftplugin/ps1.vim index e09bbf86d..f1fe78df4 100644 --- a/runtime/ftplugin/ps1.vim +++ b/runtime/ftplugin/ps1.vim @@ -5,6 +5,7 @@ " 2024 Jan 14 by Vim Project (browsefilter) " 2024 May 23 by Riley Bruins <ribr...@gmail.com> ('commentstring') " 2024 Sep 19 by Konfekt (simplify keywordprg #15696) +" 2025 Jul 22 by phanium (use :hor term #17822) " Only do this when not done yet for this buffer if exists("b:did_ftplugin") | finish | endif @@ -51,7 +52,7 @@ endif if exists('s:pwsh_cmd') if exists(':terminal') == 2 - command! -buffer -nargs=1 GetHelp silent exe 'term ' . s:pwsh_cmd . ' -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command Get-Help -Full "<args>"' . (executable('less') ? ' | less' : '') + command! -buffer -nargs=1 GetHelp silent exe 'hor term ' . s:pwsh_cmd . ' -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command Get-Help -Full "<args>"' . (executable('less') ? ' | less' : '') else command! -buffer -nargs=1 GetHelp echo system(s:pwsh_cmd . ' -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command Get-Help -Full <args>') endif diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim index 77fab2a61..d0b6c2d65 100644 --- a/runtime/ftplugin/readline.vim +++ b/runtime/ftplugin/readline.vim @@ -3,6 +3,7 @@ " Maintainer: Doug Kearns <dougkea...@gmail.com> " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> " Last Change: 2024 Sep 19 (simplify keywordprg #15696) +" 2024 Jul 22 by Vim project (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -36,7 +37,7 @@ endif if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 ReadlineKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . '3 readline' + \ silent exe 'hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . '3 readline' setlocal iskeyword+=- setlocal keywordprg=:ReadlineKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ReadlineKeywordPrg' diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index 0038ee7dd..18cd219cd 100644 --- a/runtime/ftplugin/sh.vim +++ b/runtime/ftplugin/sh.vim @@ -7,6 +7,7 @@ " Last Change: 2024 Sep 19 by Vim Project (compiler shellcheck) " 2024 Dec 29 by Vim Project (improve setting shellcheck compiler) " 2025 Mar 09 by Vim Project (set b:match_skip) +" 2025 Jul 22 by phanium (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -53,7 +54,7 @@ let s:is_kornshell = get(b:, "is_kornshell", get(g:, "is_kornshell", 0)) if s:is_bash if exists(':terminal') == 2 - command! -buffer -nargs=1 ShKeywordPrg silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""' + command! -buffer -nargs=1 ShKeywordPrg silent exe ':hor term bash -c "help "<args>" 2>/dev/null || man "<args>""' else command! -buffer -nargs=1 ShKeywordPrg echo system('bash -c "help <args>" 2>/dev/null || MANPAGER= man "<args>"') endif diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim index 1cc4e609b..8a7b07830 100644 --- a/runtime/ftplugin/sshconfig.vim +++ b/runtime/ftplugin/sshconfig.vim @@ -2,7 +2,7 @@ " Language: OpenSSH client configuration file " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -17,7 +17,7 @@ let b:undo_ftplugin = 'setlocal com< cms< fo<' if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 SshconfigKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '$', '\') . ''' --hilite-search" man ' . 'ssh_config' + \ silent exe 'hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '$', '\') . ''' --hilite-search" man ' . 'ssh_config' setlocal iskeyword+=- setlocal keywordprg=:SshconfigKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SshconfigKeywordPrg' diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim index e87fedaa0..32c08b19a 100644 --- a/runtime/ftplugin/sudoers.vim +++ b/runtime/ftplugin/sudoers.vim @@ -2,7 +2,7 @@ " Language: sudoers(5) configuration files " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -18,7 +18,7 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 SudoersKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape(' ' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'sudoers' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape(' ' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'sudoers' setlocal iskeyword+=- setlocal keywordprg=:SudoersKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SudoersKeywordPrg' diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim index e6c7f113c..48f36e3db 100644 --- a/runtime/ftplugin/udevrules.vim +++ b/runtime/ftplugin/udevrules.vim @@ -2,7 +2,7 @@ " Language: udev(8) rules file " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull <n...@bitwi.se> -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -18,7 +18,7 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 UdevrulesKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'udev' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . ' ', '\') . ''' --hilite-search" man ' . 'udev' setlocal iskeyword+=- setlocal keywordprg=:UdevrulesKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer UdevrulesKeywordPrg' diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim index 5d4f4fe25..65e9f377b 100644 --- a/runtime/ftplugin/zsh.vim +++ b/runtime/ftplugin/zsh.vim @@ -5,6 +5,8 @@ " Latest Revision: 2024 Sep 19 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-zsh +" Last Change: +" 2025 Jul 23 by Vim Project (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -20,7 +22,7 @@ let b:undo_ftplugin = "setl com< cms< fo< " if executable('zsh') && &shell !~# '/\%(nologin\|false\)$' if exists(':terminal') == 2 - command! -buffer -nargs=1 ZshKeywordPrg silent exe ':term zsh -c "autoload -Uz run-help; run-help <args>"' + command! -buffer -nargs=1 ZshKeywordPrg silent exe ':hor term zsh -c "autoload -Uz run-help; run-help <args>"' else command! -buffer -nargs=1 ZshKeywordPrg echo system('MANPAGER= zsh -c "autoload -Uz run-help; run-help <args> 2>/dev/null"') endif -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1ueevf-006A11-LS%40256bit.org.
