From b2b050ab16565c117f0e7e411ffef3700d99203b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 16 Jul 2016 21:52:46 +0200 Subject: patch 7.4.2054 Problem: Wrong part of #ifdef removed. Solution: Use the right part. (Hirohito Higashi) --- src/os_unix.c | 22 +--------------------- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/os_unix.c b/src/os_unix.c index df39cd3fba..9e5331821e 100644 --- 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 570dd45252..4b4a6e6fdf 100644 --- 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, /**/ -- cgit v1.2.3