Mercurial > vim
changeset 24600:cb4cb3ff5736 v8.2.2839
patch 8.2.2839: default redirection missing "ash" and "dash"
Commit: https://github.com/vim/vim/commit/56318369750066718b880afa69e7ae3843d0410b
Author: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu May 6 18:46:35 2021 +0200
patch 8.2.2839: default redirection missing "ash" and "dash"
Problem: Default redirection missing "ash" and "dash".
Solution: Recognize "ash" and "dash". (Natanael Copa, closes https://github.com/vim/vim/issues/8180)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 06 May 2021 19:00:04 +0200 |
| parents | 8eda31c9b9e2 |
| children | 244ecababf00 |
| files | runtime/doc/options.txt src/option.c src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6606,9 +6606,9 @@ A jump table for the options with a shor in a file and echoed to the screen. If the 'shell' option is "csh" or "tcsh" after initializations, the default becomes "|& tee". If the 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta", - "bash" or "fish" the default becomes "2>&1| tee". This means that - stderr is also included. Before using the 'shell' option a path is - removed, thus "/bin/sh" uses "sh". + "bash", "fish", "ash" or "dash" the default becomes "2>&1| tee". This + means that stderr is also included. Before using the 'shell' option a + path is removed, thus "/bin/sh" uses "sh". The initialization of this option is done after reading the ".vimrc" and the other initializations, so that when the 'shell' option is set there, the 'shellpipe' option changes automatically, unless it was
--- a/src/option.c +++ b/src/option.c @@ -910,7 +910,7 @@ set_init_3(void) } } else - // Always use bourne shell style redirection if we reach this + // Always use POSIX shell style redirection if we reach this if ( fnamecmp(p, "sh") == 0 || fnamecmp(p, "ksh") == 0 || fnamecmp(p, "mksh") == 0 @@ -919,6 +919,8 @@ set_init_3(void) || fnamecmp(p, "zsh-beta") == 0 || fnamecmp(p, "bash") == 0 || fnamecmp(p, "fish") == 0 + || fnamecmp(p, "ash") == 0 + || fnamecmp(p, "dash") == 0 # ifdef MSWIN || fnamecmp(p, "cmd") == 0 || fnamecmp(p, "sh.exe") == 0 @@ -929,6 +931,7 @@ set_init_3(void) || fnamecmp(p, "zsh-beta.exe") == 0 || fnamecmp(p, "bash.exe") == 0 || fnamecmp(p, "cmd.exe") == 0 + || fnamecmp(p, "dash.exe") == 0 # endif ) {