To: vim_dev@googlegroups.com Subject: Patch 7.4.2054 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2054 (after 7.4.2048) Problem: Wrong part of #ifdef removed. Solution: Use the right part. (Hirohito Higashi) Files: src/os_unix.c *** ../vim-7.4.2053/src/os_unix.c 2016-07-16 14:46:51.135240543 +0200 --- src/os_unix.c 2016-07-16 21:32:52.725776483 +0200 *************** *** 4070,4096 **** #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! */ ! } ! } out_flush(); --- 4070,4076 ---- #endif int tmode = cur_tmode; #ifdef USE_SYSTEM /* use system() to start the shell: simple but slow */ ! char_u *newcmd; /* only needed for unix */ out_flush(); *** ../vim-7.4.2053/src/version.c 2016-07-16 20:43:10.483784247 +0200 --- src/version.c 2016-07-16 21:28:47.804181136 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 2054, /**/ -- I have to exercise early in the morning before my brain figures out what I'm doing. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///