diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2021-05-06 18:46:35 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-06 18:46:35 +0200 |
| commit | 56318369750066718b880afa69e7ae3843d0410b (patch) | |
| tree | c611db1709d5d5d812e07b27784c55bb1c11cf4a | |
| parent | e3e598e82b79a2ab5ba5e312d54e65c940e2e809 (diff) | |
| download | vim-git-56318369750066718b880afa69e7ae3843d0410b.tar.gz | |
patch 8.2.2839: default redirection missing "ash" and "dash"v8.2.2839
Problem: Default redirection missing "ash" and "dash".
Solution: Recognize "ash" and "dash". (Natanael Copa, closes #8180)
| -rw-r--r-- | runtime/doc/options.txt | 6 | ||||
| -rw-r--r-- | src/option.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 84969b23f..efab64802 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6606,9 +6606,9 @@ A jump table for the options with a short description can be found at |Q_op|. 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 diff --git a/src/option.c b/src/option.c index 3c248c193..7c783757b 100644 --- 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 ) { diff --git a/src/version.c b/src/version.c index ed852ade8..36422c1d4 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2839, +/**/ 2838, /**/ 2837, |