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 84969b23f654c1fde6dbcfc905cc8eb2a7e98693..efab64802e5c9551bef73c74d30557114cdba9f6 100644 (file)
--- 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 3c248c19319ffd07066b91e8d28669a6662eeb20..7c783757b2d4a1d05b138d4c5d97d47d0980c521 100644 (file)
--- 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 ed852ade88a4160999f1be2e526669670d94dfd5..36422c1d427b447c8eba24f821250aa9ed5a0317 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2839,
 /**/
     2838,
 /**/