patch 7.4.2054

Problem:    Wrong part of #ifdef removed.
Solution:   Use the right part. (Hirohito Higashi)

diff --git a/src/os_unix.c b/src/os_unix.c
index df39cd3fba86b0c3c8345799968fe3deb7aa6454..9e5331821e8b3d204674fc564a2b376af8f52680 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4070,27 +4070,7 @@ mch_call_shell(
 #endif
     int                tmode = cur_tmode;
 #ifdef USE_SYSTEM      /* use system() to start the shell: simple but slow */
-    int            x;
-    /*
-     * Set the preferred shell in the EMXSHELL environment variable (but
-     * only if it is different from what is already in the environment).
-     * Emx then takes care of whether to use "/c" or "-c" in an
-     * intelligent way. Simply pass the whole thing to emx's system() call.
-     * Emx also starts an interactive shell if system() is passed an empty
-     * string.
-     */
-    char_u *p, *old;
-
-    if (((old = (char_u *)getenv("EMXSHELL")) == NULL) || STRCMP(old, p_sh))
-    {
-       /* should check HAVE_SETENV, but I know we don't have it. */
-       p = alloc(10 + strlen(p_sh));
-       if (p)
-       {
-           sprintf((char *)p, "EMXSHELL=%s", p_sh);
-           putenv((char *)p);  /* don't free the pointer! */
-       }
-    }
+    char_u     *newcmd;        /* only needed for unix */
 
     out_flush();
 

diff --git a/src/version.c b/src/version.c
index 570dd45252d4dbcab9e9114cd5023ec5e9981cf8..4b4a6e6fdf823f56bfb59553f5f4363e69d9b200 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2054,
 /**/
     2053,
 /**/