summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-31 20:53:56 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-31 20:53:56 +0200
commit0e6bfb9b2eb108d96a49ac4f8dc638c2eefeda2b (patch)
tree489c80d9760a8e874c6d4f2db5fb2be72513a78f
parent70576f70f789d6161068fbe126f29ad976e029e9 (diff)
patch 8.1.1782: MS-Windows: system() has temp file error with 'noshelltemp'v8.1.1782
Problem: MS-Windows: system() has temp file error with 'noshelltemp'. Solution: Check s_dont_use_vimrun. (Ken Takata, closes #4754)
-rw-r--r--src/os_win32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 102adb62c1..5bff89ad3a 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4882,7 +4882,7 @@ mch_call_shell(
# ifdef VIMDLL
(gui.in_use || gui.starting) &&
# endif
- STRCMP(p_shcf, "/c") == 0)
+ s_dont_use_vimrun && STRCMP(p_shcf, "/c") == 0)
// workaround for the case that "vimrun" does not exist
vim_snprintf((char *)newcmd, cmdlen, "%s %s %s %s %s",
p_sh, p_shcf, p_sh, p_shcf, cmd);
diff --git a/src/version.c b/src/version.c
index 855c0fe2ce..03cccfb06a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1782,
+/**/
1781,
/**/
1780,