aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.0437: MS-Windows installer contains old stuff

Browse Source 
Problem:    MS-Windows installer contains old stuff.
Solution:   Rely on Windows NT. (Ken Takata, closes #5832)
This commit is contained in:
Bram Moolenaar
2020-03-23 22:17:11 +01:00
parent db99f9f29a
commit 0df541963d
2 changed files with 33 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/dosinst.c
View File

@@ -847,8 +847,7 @@ install_bat_choice(int idx)
/* /*
* Don't use double quotes for the "set" argument, also when it * Don't use double quotes for the "set" argument, also when it
* contains a space. The quotes would be included in the value * contains a space. The quotes would be included in the value.
* for MSDOS and NT.
* The order of preference is: * The order of preference is:
* 1. $VIMRUNTIME/vim.exe (user preference) * 1. $VIMRUNTIME/vim.exe (user preference)
* 2. $VIM/vim81/vim.exe (hard coded version) * 2. $VIM/vim81/vim.exe (hard coded version)
@@ -861,91 +860,51 @@ install_bat_choice(int idx)
fprintf(fd, "\n"); fprintf(fd, "\n");
// Give an error message when the executable could not be found. // Give an error message when the executable could not be found.
fprintf(fd, "if exist \"%%VIM_EXE_DIR%%\\%s\" goto havevim\n", fprintf(fd, "if not exist \"%%VIM_EXE_DIR%%\\%s\" (\n", exename);
exename);
fprintf(fd, " echo \"%%VIM_EXE_DIR%%\\%s\" not found\n", exename); fprintf(fd, " echo \"%%VIM_EXE_DIR%%\\%s\" not found\n", exename);
fprintf(fd, "goto eof\n"); fprintf(fd, " goto :eof\n");
fprintf(fd, ")\n");
fprintf(fd, "\n"); fprintf(fd, "\n");
fprintf(fd, ":havevim\n");
fprintf(fd, "rem collect the arguments in VIMARGS for Win95\n");
fprintf(fd, "set VIMARGS=\n");
if (*exename == 'g') if (*exename == 'g')
{
fprintf(fd, "rem check --nofork argument\n");
fprintf(fd, "set VIMNOFORK=\n"); fprintf(fd, "set VIMNOFORK=\n");
fprintf(fd, ":loopstart\n"); fprintf(fd, ":loopstart\n");
fprintf(fd, "if .%%1==. goto loopend\n"); fprintf(fd, "if .%%1==. goto loopend\n");
if (*exename == 'g') fprintf(fd, "if .%%1==.--nofork (\n");
{
fprintf(fd, "if NOT .%%1==.--nofork goto noforklongarg\n");
fprintf(fd, " set VIMNOFORK=1\n"); fprintf(fd, " set VIMNOFORK=1\n");
fprintf(fd, ":noforklongarg\n"); fprintf(fd, ") else if .%%1==.-f (\n");
fprintf(fd, "if NOT .%%1==.-f goto noforkarg\n");
fprintf(fd, " set VIMNOFORK=1\n"); fprintf(fd, " set VIMNOFORK=1\n");
fprintf(fd, ":noforkarg\n"); fprintf(fd, ")\n");
}
fprintf(fd, "set VIMARGS=%%VIMARGS%% %%1\n");
fprintf(fd, "shift\n"); fprintf(fd, "shift\n");
fprintf(fd, "goto loopstart\n"); fprintf(fd, "goto loopstart\n");
fprintf(fd, ":loopend\n"); fprintf(fd, ":loopend\n");
fprintf(fd, "\n"); fprintf(fd, "\n");
fprintf(fd, "if .%%OS%%==.Windows_NT goto ntaction\n");
fprintf(fd, "\n");
// For gvim.exe use "start" to avoid that the console window stays
// open.
if (*exename == 'g')
{
fprintf(fd, "if .%%VIMNOFORK%%==.1 goto nofork\n");
fprintf(fd, "start ");
} }
// Always use quotes, $VIM or $VIMRUNTIME might have a space.
fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%VIMARGS%%\n",
exename, vimarg);
fprintf(fd, "goto eof\n");
fprintf(fd, "\n");
if (*exename == 'g') if (*exename == 'g')
{ {
fprintf(fd, ":nofork\n");
fprintf(fd, "start /w ");
// Always use quotes, $VIM or $VIMRUNTIME might have a space.
fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%VIMARGS%%\n",
exename, vimarg);
fprintf(fd, "goto eof\n");
fprintf(fd, "\n");
}
fprintf(fd, ":ntaction\n");
fprintf(fd, "rem for WinNT we can use %%*\n");
// For gvim.exe use "start /b" to avoid that the console window // For gvim.exe use "start /b" to avoid that the console window
// stays open. // stays open.
if (*exename == 'g') fprintf(fd, "if .%%VIMNOFORK%%==.1 (\n");
{
fprintf(fd, "if .%%VIMNOFORK%%==.1 goto noforknt\n");
fprintf(fd, "start \"dummy\" /b ");
}
// Always use quotes, $VIM or $VIMRUNTIME might have a space.
fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%*\n", exename, vimarg);
fprintf(fd, "goto eof\n");
fprintf(fd, "\n");
if (*exename == 'g')
{
fprintf(fd, ":noforknt\n");
fprintf(fd, " start \"dummy\" /b /wait "); fprintf(fd, " start \"dummy\" /b /wait ");
// Always use quotes, $VIM or $VIMRUNTIME might have a space. // Always use quotes, $VIM or $VIMRUNTIME might have a space.
fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%*\n", fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%*\n",
exename, vimarg); exename, vimarg);
fprintf(fd, ") else (\n");
fprintf(fd, " start \"dummy\" /b ");
// Always use quotes, $VIM or $VIMRUNTIME might have a space.
fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%*\n",
exename, vimarg);
fprintf(fd, ")\n");
}
else
{
// Always use quotes, $VIM or $VIMRUNTIME might have a space.
fprintf(fd, "\"%%VIM_EXE_DIR%%\\%s\" %s %%*\n",
exename, vimarg);
} }
fprintf(fd, "\n:eof\n");
fprintf(fd, "set VIMARGS=\n");
if (*exename == 'g')
fprintf(fd, "set VIMNOFORK=\n");
fclose(fd); fclose(fd);
printf("%s has been %s\n", batpath, printf("%s has been %s\n", batpath,

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
437,
/**/ /**/
436, 436,
/**/ /**/