To:
[email protected]
Subject: Patch 6.0ax.014
Fcc: outbox
From: Bram Moolenaar <
[email protected]>
------------
Patch 6.0ax.014
Problem: Win32: On Windows 98 ":make -f file" doesn't work when 'shell' is
"command.com" and 'makeprg' is "nmake". The environment isn't
passed on to "nmake".
Solution: Also use vimrun.exe when redirecting the output of a command.
Files: src/os_win32.c
*** ../vim60ax.13/src/os_win32.c Mon Sep 17 16:41:59 2001
--- src/os_win32.c Fri Sep 21 11:46:49 2001
***************
*** 2982,2988 ****
else
{
#if defined(FEAT_GUI_W32)
! if (!(options & SHELL_DOOUT) && need_vimrun_warning)
{
MessageBox(NULL,
_("VIMRUN.EXE not found in your $PATH.\n"
--- 2982,2988 ----
else
{
#if defined(FEAT_GUI_W32)
! if (need_vimrun_warning)
{
MessageBox(NULL,
_("VIMRUN.EXE not found in your $PATH.\n"
***************
*** 2992,3002 ****
MB_ICONWARNING);
need_vimrun_warning = FALSE;
}
! if (!(options & SHELL_DOOUT) && !s_dont_use_vimrun)
/* Use vimrun to execute the command. It opens a console
* window, which can be closed without killing Vim. */
sprintf((char *)newcmd, "%s%s%s %s %s",
! vimrun_path, msg_silent != 0 ? "-s " : "",
p_sh, p_shcf, cmd);
else
#endif
--- 2992,3004 ----
MB_ICONWARNING);
need_vimrun_warning = FALSE;
}
! if (!s_dont_use_vimrun)
/* Use vimrun to execute the command. It opens a console
* window, which can be closed without killing Vim. */
sprintf((char *)newcmd, "%s%s%s %s %s",
! vimrun_path,
! (msg_silent != 0 || (options & SHELL_DOOUT))
! ? "-s " : "",
p_sh, p_shcf, cmd);
else
#endif
*** ../vim60ax.13/src/version.c Mon Sep 24 15:30:27 2001
--- src/version.c Mon Sep 24 14:12:13 2001
***************
*** 608,609 ****
--- 608,611 ----
{ /* Add new patch number below this line */
+ /**/
+ 14,
/**/
--
FIRST SOLDIER: So they wouldn't be able to bring a coconut back anyway.
SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together?
FIRST SOLDIER: No, they'd have to have it on a line.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar --
[email protected] --
http://www.moolenaar.net \\\
((( Creator of Vim --
http://vim.sf.net --
ftp://ftp.vim.org/pub/vim )))
\\\ Help me helping AIDS orphans in Uganda -
http://iccf-holland.org ///
