Mercurial > vim
changeset 16734:e3feaa3e5f10 v8.1.1369
patch 8.1.1369: get E484 when using system() during GUI startup
commit https://github.com/vim/vim/commit/294d9bf966bbbcb0b49affb9b15534d5b9c93801
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 23 20:12:46 2019 +0200
patch 8.1.1369: get E484 when using system() during GUI startup
Problem: Get E484 when using system() during GUI startup.
Solution: Check "gui.starting". (Ken Takata)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 23 May 2019 20:15:05 +0200 |
parents | 8cd7f9941a04 |
children | 143771cdb9d2 |
files | src/os_win32.c src/version.c |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 )