Mercurial > vim
changeset 9552:49512aba8e32 v7.4.2054
commit https://github.com/vim/vim/commit/b2b050ab16565c117f0e7e411ffef3700d99203b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 16 21:52:46 2016 +0200
patch 7.4.2054
Problem: Wrong part of #ifdef removed.
Solution: Use the right part. (Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Jul 2016 22:00:05 +0200 |
| parents | 232b8642ec32 |
| children | 62fdda1fd0c0 |
| files | src/os_unix.c src/version.c |
| diffstat | 2 files changed, 3 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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();