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 #8180)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 84969b2..efab648 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6606,9 +6606,9 @@
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 3c248c1..7c78375 100644
--- a/src/option.c
+++ b/src/option.c
@@ -910,7 +910,7 @@
}
}
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 @@
|| 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 @@
|| 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 ed852ad..36422c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2839,
+/**/
2838,
/**/
2837,