diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-23 20:12:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-23 20:12:46 +0200 |
| commit | 294d9bf966bbbcb0b49affb9b15534d5b9c93801 (patch) | |
| tree | b82afd1ee3d37e9b638a57779b99866c89612530 | |
| parent | e09244ee3567d658c293fb1ae0d47a1a8be870ac (diff) | |
| download | vim-git-8.1.1369.tar.gz | |
patch 8.1.1369: get E484 when using system() during GUI startupv8.1.1369
Problem: Get E484 when using system() during GUI startup.
Solution: Check "gui.starting". (Ken Takata)
| -rw-r--r-- | src/os_win32.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 54ca4de7d..33d48cf7f 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2762,7 +2762,7 @@ mch_init(void) mch_exit(int r) { #ifdef VIMDLL - if (gui.starting || gui.in_use) + if (gui.in_use || gui.starting) mch_exit_g(r); else mch_exit_c(r); @@ -4500,7 +4500,7 @@ mch_system_c(char *cmd, int options) mch_system(char *cmd, int options) { #ifdef VIMDLL - if (gui.in_use) + if (gui.in_use || gui.starting) return mch_system_g(cmd, options); else return mch_system_c(cmd, options); @@ -4821,7 +4821,7 @@ mch_call_shell( { cmdlen = #ifdef FEAT_GUI_MSWIN - (gui.in_use ? + ((gui.in_use || gui.starting) ? (!s_dont_use_vimrun && p_stmp ? STRLEN(vimrun_path) : STRLEN(p_sh) + STRLEN(p_shcf)) : 0) + @@ -4834,7 +4834,7 @@ mch_call_shell( #if defined(FEAT_GUI_MSWIN) if ( # ifdef VIMDLL - gui.in_use && + (gui.in_use || gui.starting) && # endif need_vimrun_warning) { @@ -4853,7 +4853,7 @@ mch_call_shell( } if ( # ifdef VIMDLL - gui.in_use && + (gui.in_use || gui.starting) && # endif !s_dont_use_vimrun && p_stmp) /* Use vimrun to execute the command. It opens a console @@ -4865,7 +4865,7 @@ mch_call_shell( p_sh, p_shcf, cmd); else # ifdef VIMDLL - if (gui.in_use) + if (gui.in_use || gui.starting) # endif vim_snprintf((char *)newcmd, cmdlen, "%s %s %s %s %s", p_sh, p_shcf, p_sh, p_shcf, cmd); @@ -4889,7 +4889,7 @@ mch_call_shell( /* Print the return value, unless "vimrun" was used. */ if (x != 0 && !(options & SHELL_SILENT) && !emsg_silent #if defined(FEAT_GUI_MSWIN) - && (gui.in_use ? + && ((gui.in_use || gui.starting) ? ((options & SHELL_DOOUT) || s_dont_use_vimrun || !p_stmp) : 1) #endif ) diff --git a/src/version.c b/src/version.c index 6286a7a38..224fde278 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1369, +/**/ 1368, /**/ 1367, |